|
|
bb6b656ec6
|
Fix code review issues
|
2017-10-12 22:27:22 +09:00 |
|
|
|
d234791bdd
|
Merge remote-tracking branch 'upstream/master' into catch-improvements
|
2017-10-12 22:25:47 +09:00 |
|
|
|
c0d64bf409
|
Use Gray instead of FromHex for grays
|
2017-10-12 22:19:29 +09:00 |
|
|
|
37fc69b9f7
|
Set a default zoom level that isn't the whole track
|
2017-10-12 22:19:02 +09:00 |
|
|
|
37b88d834e
|
Adjust padding slightly
|
2017-10-12 22:10:37 +09:00 |
|
|
|
d98f1a2bb7
|
Merge remote-tracking branch 'upstream/master' into editor-waveform-timeline
|
2017-10-12 21:48:08 +09:00 |
|
|
|
182bb71eb0
|
Merge branch 'master' into editor-waveform
|
2017-10-12 20:49:48 +09:00 |
|
|
|
70c55b23f4
|
Remove references to CodeAnalysisRulesets
Having these produce warnings under certain compile environments.
|
2017-10-12 20:37:20 +09:00 |
|
|
|
a22fe901a3
|
Merge branch 'master' into remove-ratio-adjust
|
2017-10-12 19:26:03 +09:00 |
|
|
|
8a5e25ce4b
|
Simplify waveform construction
|
2017-10-12 19:19:42 +09:00 |
|
|
|
4d78a0492c
|
Make creatorUsername a property so it is correctly deserialised
|
2017-10-12 19:15:59 +09:00 |
|
|
|
753383a740
|
Merge branch 'master' into remove-ratio-adjust
|
2017-10-12 18:48:32 +09:00 |
|
|
|
ab62390336
|
Make TimelineButtons combined take up the full height of the timeline
|
2017-10-12 18:32:39 +09:00 |
|
|
|
a6901c0a27
|
Change TimelineButton icon colour to white when hovered
|
2017-10-12 18:17:36 +09:00 |
|
|
|
a5817e6e75
|
Add a way to change the IconButton icon colour
|
2017-10-12 18:17:23 +09:00 |
|
|
|
f08f7a4ecb
|
Merge remote-tracking branch 'smoogipoo/editor-waveform' into editor-waveform-timeline
|
2017-10-12 17:52:40 +09:00 |
|
|
|
5ccfc1918e
|
Hook up more bindables for hitobjects/hitsounds
|
2017-10-12 17:51:01 +09:00 |
|
|
|
db672becbc
|
Implement waveform checkbox
|
2017-10-12 17:50:51 +09:00 |
|
|
|
3c35a7a6ae
|
graph -> waveform
|
2017-10-12 17:37:40 +09:00 |
|
|
|
18c67dd936
|
Merge branch 'master' into editor-waveform
|
2017-10-12 17:32:42 +09:00 |
|
|
|
4586877239
|
Implement magnification buttons
|
2017-10-12 17:31:21 +09:00 |
|
|
|
622659336d
|
Merge + update framework
|
2017-10-12 17:02:39 +09:00 |
|
|
|
00f7007036
|
Merge remote-tracking branch 'upstream/master' into fix-medal-overlay
|
2017-10-12 16:56:40 +09:00 |
|
|
|
78f2037d84
|
Remove now obsolete RatioAdjust
|
2017-10-12 09:42:06 +02:00 |
|
|
|
de8f9325a3
|
Implement TimelineButton and use for the magnification buttons
|
2017-10-12 16:10:33 +09:00 |
|
|
|
2844764e3c
|
Hit Objects/Hit Sounds -> Hitobjects/Hitsounds
|
2017-10-12 15:37:45 +09:00 |
|
|
|
e12fa49436
|
Integrate timeline into Compose
|
2017-10-12 15:37:00 +09:00 |
|
|
|
6fbf52c3eb
|
Remove unused usings
|
2017-10-12 15:32:18 +09:00 |
|
|
|
df6409308a
|
Merge remote-tracking branch 'origin/master' into editor-waveform-timeline
# Conflicts:
# osu-framework
|
2017-10-12 15:32:11 +09:00 |
|
|
|
1a88ffe862
|
Merge remote-tracking branch 'upstream/master' into catch-improvements
|
2017-10-11 19:10:18 +09:00 |
|
|
|
cf7f3411fc
|
Ignore filename case in BeatmapManager. Fixes #1295.
|
2017-10-11 15:01:02 +08:00 |
|
|
|
71fc5c4da2
|
Merge branch 'master' into fix-storyboard-exception
|
2017-10-11 12:26:34 +09:00 |
|
|
|
6de100d446
|
Merge branch 'master' into iconbutton-refactor
|
2017-10-11 12:05:38 +09:00 |
|
|
|
03fbf47bc2
|
Add juicy streams
|
2017-10-10 20:22:42 +09:00 |
|
|
|
b8d2a04fe1
|
Only split beatmap lines twice
|
2017-10-10 19:24:24 +09:00 |
|
|
|
ad344eb719
|
Use IsNullOrWhiteSpace instead of trimming
|
2017-10-10 19:21:38 +09:00 |
|
|
|
8cea875f5f
|
Remove unused using
|
2017-10-10 18:35:30 +09:00 |
|
|
|
c2f3c0e6df
|
Add TestCaseIconButton to demonstrate IconButton usages
|
2017-10-10 18:32:09 +09:00 |
|
|
|
071b1b049c
|
Fix properties not being set leading to colours not being set
|
2017-10-10 18:31:56 +09:00 |
|
|
|
44141a38b8
|
Make it possible to change colours before load()
|
2017-10-10 18:04:41 +09:00 |
|
|
|
bbd1a7059e
|
xmldoc + hook up IconColour
|
2017-10-10 17:25:39 +09:00 |
|
|
|
d7fb59ee0e
|
Expose colours of IconButton
|
2017-10-10 17:20:23 +09:00 |
|
|
|
9cb9151811
|
Move origin + anchor outside of ctor
|
2017-10-10 16:00:11 +09:00 |
|
|
|
1cf8c0284a
|
Re-namespace a few classes
|
2017-10-10 15:22:39 +09:00 |
|
|
|
166194e6b6
|
Further logic simplification
|
2017-10-10 15:09:26 +09:00 |
|
|
|
074a1db4a1
|
Implement scrolling and better zoom
|
2017-10-10 12:45:27 +09:00 |
|
|
|
d5892cf54e
|
Add a bool to specify whether judgements should be visible for certain DrawableHitObjects
|
2017-10-09 20:17:05 +09:00 |
|
|
|
29c2a29798
|
Fix trimming too early in OsuLegacyDecoder crashing storyboards
|
2017-10-09 18:47:12 +09:00 |
|
|
|
cb58a1371e
|
Merge branch 'editor-waveform' into editor-waveform-timeline
# Conflicts:
# osu.Game/osu.Game.csproj
|
2017-10-09 18:10:52 +09:00 |
|
|
|
222d0c8694
|
Fix visual regressions in MedalOverlay
|
2017-10-09 17:52:48 +09:00 |
|
