Dean Herbert
c55ae5049f
Merge branch 'master' into import-test-fix
2017-10-11 13:11:55 +09:00
Dean Herbert
6542079385
Merge pull request #1342 from smoogipoo/fix-storyboard-exception
...
Fix trimming too early in OsuLegacyDecoder crashing storyboards
2017-10-11 13:04:41 +09:00
Dean Herbert
b6cfc49b06
Improve resilience of beatmap import test
...
Fixes this happening https://ci.appveyor.com/project/peppy/osu/build/master-4694/tests
2017-10-11 12:41:43 +09:00
Dean Herbert
71fc5c4da2
Merge branch 'master' into fix-storyboard-exception
2017-10-11 12:26:34 +09:00
Dean Herbert
4c8fe5f678
Merge pull request #1348 from smoogipoo/iconbutton-refactor
...
Refactor + improve IconButton
2017-10-11 12:14:59 +09:00
Dean Herbert
6de100d446
Merge branch 'master' into iconbutton-refactor
2017-10-11 12:05:38 +09:00
Dean Herbert
bb2b5fa86d
Merge pull request #1329 from huoyaoyuan/spm-counter
...
Implement SPM counter on osu! spinners
2017-10-11 11:39:36 +09:00
Dean Herbert
2b309be3c2
Merge remote-tracking branch 'upstream/master' into spm-counter
2017-10-11 11:23:09 +09:00
Dean Herbert
e76961a932
Remove unnecessary bool
2017-10-11 11:23:02 +09:00
Dean Herbert
1fc16693d6
Formatting
2017-10-11 11:20:44 +09:00
Dan Balasescu
78c160af87
Merge pull request #1343 from peppy/hidden-judgements
...
Add a bool to specify whether judgements should be visible for certain DrawableHitObjects
2017-10-10 19:25:29 +09:00
smoogipoo
b8d2a04fe1
Only split beatmap lines twice
2017-10-10 19:24:24 +09:00
smoogipoo
ad344eb719
Use IsNullOrWhiteSpace instead of trimming
2017-10-10 19:21:38 +09:00
smoogipoo
8cea875f5f
Remove unused using
2017-10-10 18:35:30 +09:00
smoogipoo
c2f3c0e6df
Add TestCaseIconButton to demonstrate IconButton usages
2017-10-10 18:32:09 +09:00
smoogipoo
071b1b049c
Fix properties not being set leading to colours not being set
2017-10-10 18:31:56 +09:00
smoogipoo
44141a38b8
Make it possible to change colours before load()
2017-10-10 18:04:41 +09:00
Dan Balasescu
d8b7f4efa7
Merge branch 'master' into hidden-judgements
2017-10-10 17:59:34 +09:00
Dan Balasescu
cd870b5acd
Merge pull request #1347 from peppy/fix-tests-namespace
...
Move mania tests to correct namespace
2017-10-10 17:58:36 +09:00
smoogipoo
bbd1a7059e
xmldoc + hook up IconColour
2017-10-10 17:25:39 +09:00
smoogipoo
d7fb59ee0e
Expose colours of IconButton
2017-10-10 17:20:23 +09:00
Dean Herbert
b306eaca6e
Move mania tests to correct namespace
2017-10-10 16:50:46 +09:00
smoogipoo
9cb9151811
Move origin + anchor outside of ctor
2017-10-10 16:00:11 +09:00
Dean Herbert
d5892cf54e
Add a bool to specify whether judgements should be visible for certain DrawableHitObjects
2017-10-09 20:17:05 +09:00
Huo Yaoyuan
994959fd77
Merge branch 'master' into spm-counter
2017-10-09 19:05:30 +08:00
smoogipoo
29c2a29798
Fix trimming too early in OsuLegacyDecoder crashing storyboards
2017-10-09 18:47:12 +09:00
Dan Balasescu
b1a2da58bc
Merge pull request #1339 from sunghwan2789/decoder-improve
...
Trim end of line
2017-10-08 19:07:04 +09:00
Bang Sunghwan
bd9f2db477
Trim line
2017-10-08 17:30:21 +09:00
Bang Sunghwan
6c5c734ff1
Trim end of line
...
Fix ArgumentOutOfRangeException when parsing http://osu.ppy.sh/osu/1004136
2017-10-08 09:42:09 +09:00
Huo Yaoyuan
09093013a7
Move spm calculation into counter.
2017-10-07 15:58:53 +08:00
Huo Yaoyuan
a876ab9b90
Move spm counter to a seperated control.
2017-10-07 15:31:42 +08:00
Dean Herbert
3b6596b609
Merge branch 'master' into spm-counter
2017-10-07 01:10:57 +08:00
Dean Herbert
c22e1520a0
Merge pull request #1337 from smoogipoo/editor-screens
...
Initial implementation of editor screens
2017-10-07 01:09:04 +08:00
smoogipoo
10abaa866b
Put screens below the top and bottom bars of the editor
2017-10-07 01:56:11 +09:00
smoogipoo
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
smoogipoo
d432ab7510
Reorder screen tab control items
2017-10-07 01:44:20 +09:00
smoogipoo
38ae9d905e
Fix bindable binding to make the editor load a screen by default again
2017-10-07 01:42:45 +09:00
smoogipoo
837d1ba12e
Remove rounded corners on the editor menu bar
2017-10-07 01:38:13 +09:00
smoogipoo
d3109a5950
Hook up BeatmapPanel "Edit" item
2017-10-07 00:59:14 +09:00
smoogipoo
a154ee3a89
Add File -> Exit to editor menu
2017-10-07 00:51:30 +09:00
smoogipoo
fc99860f4e
Remove EditorMenuBarItem
2017-10-07 00:51:20 +09:00
Dean Herbert
19c663da11
Remove scale effect on editor screen switches
2017-10-06 23:41:49 +08:00
Dean Herbert
3557737a18
Update framework
2017-10-06 23:20:56 +08:00
Dean Herbert
55267abe67
Merge branch 'master' into editor-screens
2017-10-06 23:19:16 +08:00
Huo Yaoyuan
404c4917dc
Use single queue for spinning record.
2017-10-06 20:42:24 +08:00
Dean Herbert
54a98a74bc
Merge branch 'master' into spm-counter
2017-10-06 16:03:02 +08:00
Dean Herbert
79fcfda10a
Merge pull request #1279 from EVAST9919/break_overlay_take_three
...
Initial implementation of the Break Overlay
2017-10-06 13:09:31 +08:00
EVAST9919
95ac4e9265
Remove useless using
2017-10-06 04:57:46 +03:00
EVAST9919
96fcc095eb
Apply suggested shrinking bar changes
2017-10-06 04:49:16 +03:00
Huo Yaoyuan
29f9c8143d
Use RotationAbsolute to calculate spm.
2017-10-05 20:08:45 +08:00
