1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 15:33:05 +08:00
Commit Graph

11220 Commits

Author SHA1 Message Date
Dan Balasescu
41036ab79e
Merge pull request #2215 from peppy/fix-combo-colours
Fix beatmap combo colours not being applied
2018-03-16 15:19:43 +09:00
Dan Balasescu
cdc61d5f0d
Merge branch 'master' into fix-combo-colours 2018-03-16 14:59:45 +09:00
Dan Balasescu
e406cf2207
Merge pull request #2170 from peppy/cursor-trail
Make gameplay cursor vs skip button feel nice again
2018-03-16 14:57:00 +09:00
smoogipoo
b27b6c7eb7 Merge branch 'master' into cursor-trail 2018-03-16 14:43:27 +09:00
smoogipoo
7ded1635fa Update submodules 2018-03-16 14:43:14 +09:00
Dan Balasescu
b39c04e122
Merge pull request #2078 from UselessToucan/DoNotMoveToPlayerWhileDragging
Improve mouse-based load inhibition at player loading screen
2018-03-16 14:31:19 +09:00
Dean Herbert
cdf435aedd
Merge branch 'master' into DoNotMoveToPlayerWhileDragging 2018-03-15 11:14:30 +09:00
Dean Herbert
8d433cb4bf
Merge branch 'master' into cursor-trail 2018-03-15 11:14:21 +09:00
Dean Herbert
edd053fcd2
Merge pull request #2195 from smoogipoo/editor-hitobject-movement
Implement an interface for moving hitobjects in the editor
2018-03-14 15:55:15 +09:00
Dean Herbert
a0691168cb Merge remote-tracking branch 'upstream/master' into editor-hitobject-movement 2018-03-14 15:35:24 +09:00
Dean Herbert
81f82d98a1 Rework a lot of naming and structure 2018-03-14 15:18:21 +09:00
Dean Herbert
d42cd5c8f0
Merge branch 'master' into fix-combo-colours 2018-03-14 12:45:48 +09:00
Dean Herbert
4a3145f08b
Merge pull request #2169 from smoogipoo/fix-mania-conversion
Make osu!mania conversions more in-line with osu!stable
2018-03-14 12:35:13 +09:00
Dean Herbert
908d38279b
Merge branch 'master' into fix-mania-conversion 2018-03-14 12:27:32 +09:00
Dean Herbert
ea649f9650 Avoid scheduling during non-current screen 2018-03-14 12:09:19 +09:00
Dean Herbert
ef8d595914 Apply formatting changes 2018-03-14 11:44:19 +09:00
Dean Herbert
c3a3d76b88 Merge remote-tracking branch 'upstream/master' into DoNotMoveToPlayerWhileDragging 2018-03-14 11:43:33 +09:00
Dean Herbert
13f64a1d12
Merge branch 'master' into cursor-trail 2018-03-14 11:42:40 +09:00
smoogipoo
9e09d434dd Fix argument null exception in ManiaBeatmapConverter 2018-03-14 11:27:14 +09:00
Dean Herbert
1d7be2ad0b Fix incorrect variable name 2018-03-14 10:14:42 +09:00
Dean Herbert
d2a0ca6faa Merge remote-tracking branch 'upstream/master' into fix-combo-colours 2018-03-14 10:13:48 +09:00
Dean Herbert
586ac9c3f1
Merge pull request #2214 from VPeruS/fix-username-login
Fixed exit from game saves username instead of email
2018-03-14 10:08:11 +09:00
Dean Herbert
c55d70ec13
Merge branch 'master' into fix-combo-colours 2018-03-13 19:19:45 +09:00
Dean Herbert
16eab2eebf Fix combo colours not working until now 2018-03-13 19:19:08 +09:00
Dean Herbert
e43de68ad3 Move colour parsing to LegacyDecoder 2018-03-13 19:13:50 +09:00
vperus
ba44813c00 Fixed exit from game save username instead of email. Resolve #2156 2018-03-13 12:10:47 +02:00
Dean Herbert
c332233a65
Merge pull request #2206 from smoogipoo/base-editor-testcase
Create a base TestCaseEditor for rulesets to derive
2018-03-13 16:44:12 +09:00
Dean Herbert
d6fa7d69d7 Add missing fonts section 2018-03-13 16:13:07 +09:00
smoogipoo
e97349fd63 Derive ScreenTestCase + use LoadComponentAsync 2018-03-13 16:00:56 +09:00
smoogipoo
0c705b0397 Rename to EditorTestCase 2018-03-13 15:57:05 +09:00
Dean Herbert
b93e83e3d2
Merge branch 'master' into base-editor-testcase 2018-03-13 15:53:33 +09:00
Dean Herbert
c0248e1b23
Merge pull request #2205 from smoogipoo/test-beatmap
Move test beatmap from TestCasePlayer into an instantiable class
2018-03-13 15:52:46 +09:00
Dean Herbert
e9cd97c43a
Merge branch 'master' into test-beatmap 2018-03-13 15:42:30 +09:00
smoogipoo
e32eec9259 No more caching 2018-03-13 15:22:46 +09:00
Dean Herbert
afeab481ee
Merge pull request #2209 from peppy/more-skinning
Update framework
2018-03-13 13:12:23 +09:00
Dean Herbert
6ecd2afd24 Update framework 2018-03-13 12:59:49 +09:00
Dan Balasescu
f06f31a269
Merge pull request #2181 from peppy/more-skinning
Add skin support for hit judgements
2018-03-13 12:58:44 +09:00
smoogipoo
706c26c32b Remove extra whitespace 2018-03-13 09:27:33 +09:00
Dean Herbert
107ad8cfff Merge remote-tracking branch 'FreezyLemon/master' into more-skinning 2018-03-12 22:01:59 +09:00
Dean Herbert
3354849cc9 Fix code formatting regression 2018-03-12 22:01:18 +09:00
Dean Herbert
3e313a1f44
Merge pull request #2204 from smoogipoo/fix-slider-circle-overlay
Fix slider circle overlays moving with the endpoints
2018-03-12 19:44:48 +09:00
smoogipoo
d2859d779d Create a base TestCaseEditor for rulests to derive 2018-03-12 19:43:52 +09:00
smoogipoo
13c20438ef Fix build issues 2018-03-12 19:41:51 +09:00
smoogipoo
b91524dbba Give TestWorkingBeatmap's track a valid length 2018-03-12 19:41:15 +09:00
smoogipoo
7406cb290f Split out test beatmap from TestCasePlayer into instantiable class 2018-03-12 19:41:09 +09:00
smoogipoo
8c4bcb4a04 Only accept drag movement on the overlays 2018-03-12 17:33:10 +09:00
smoogipoo
212142429f Derive from IHasPosition 2018-03-12 17:25:34 +09:00
smoogipoo
2d9fcdcbd0 Fix slider circle overlays moving with the endpoints 2018-03-12 17:18:50 +09:00
Dan Balasescu
d88fb7608f
Merge pull request #2124 from Poyo-SSB/mania-difficulty
Implement mania star difficulty calculation
2018-03-12 14:44:06 +09:00
Dean Herbert
8cbcdeb665
Merge branch 'master' into mania-difficulty 2018-03-12 14:07:14 +09:00