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
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
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
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
b97b575b27
Merge remote-tracking branch 'origin/master' into editor-waveform
...
# Conflicts:
# osu-framework
2017-10-09 17:20:24 +09:00
19b38983df
Update in-line with framework
2017-10-09 17:18:11 +09:00
bd9f2db477
Trim line
2017-10-08 17:30:21 +09:00
6c5c734ff1
Trim end of line
...
Fix ArgumentOutOfRangeException when parsing http://osu.ppy.sh/osu/1004136
2017-10-08 09:42:09 +09:00
10abaa866b
Put screens below the top and bottom bars of the editor
2017-10-07 01:56:11 +09:00
c0b394811f
Make compose mode the default
...
Hopefully we can keep this at a ScreenSelectionTabControl level, but it may need to be moved to the Editor at some point. I'm leaving that for a future change however, if it's needed.
2017-10-07 01:46:54 +09:00
d432ab7510
Reorder screen tab control items
2017-10-07 01:44:20 +09:00
38ae9d905e
Fix bindable binding to make the editor load a screen by default again
2017-10-07 01:42:45 +09:00
837d1ba12e
Remove rounded corners on the editor menu bar
2017-10-07 01:38:13 +09:00
d3109a5950
Hook up BeatmapPanel "Edit" item
2017-10-07 00:59:14 +09:00
a154ee3a89
Add File -> Exit to editor menu
2017-10-07 00:51:30 +09:00
fc99860f4e
Remove EditorMenuBarItem
2017-10-07 00:51:20 +09:00
19c663da11
Remove scale effect on editor screen switches
2017-10-06 23:41:49 +08:00
55267abe67
Merge branch 'master' into editor-screens
2017-10-06 23:19:16 +08:00
95ac4e9265
Remove useless using
2017-10-06 04:57:46 +03:00
96fcc095eb
Apply suggested shrinking bar changes
2017-10-06 04:49:16 +03:00
