Commit Graph

11323 Commits

Author SHA1 Message Date
1d01dbd462 Merge remote-tracking branch 'upstream/master' into api-as-component 2018-03-14 13:54:17 +09:00
d42cd5c8f0 Merge branch 'master' into fix-combo-colours 2018-03-14 12:45:48 +09:00
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
908d38279b Merge branch 'master' into fix-mania-conversion 2018-03-14 12:27:32 +09:00
ea649f9650 Avoid scheduling during non-current screen 2018-03-14 12:09:19 +09:00
d122aa80e4 Edit mods description, multiplier, and code 2018-03-13 20:07:03 -07:00
ef8d595914 Apply formatting changes 2018-03-14 11:44:19 +09:00
c3a3d76b88 Merge remote-tracking branch 'upstream/master' into DoNotMoveToPlayerWhileDragging 2018-03-14 11:43:33 +09:00
13f64a1d12 Merge branch 'master' into cursor-trail 2018-03-14 11:42:40 +09:00
e2dc9a975a Merge branch 'master' into editor-wheel-movement 2018-03-14 11:39:02 +09:00
ce2997419a Expose API scheduling internally 2018-03-14 11:37:50 +09:00
07642546bb Make APIAccess a component 2018-03-14 11:29:54 +09:00
9e09d434dd Fix argument null exception in ManiaBeatmapConverter 2018-03-14 11:27:14 +09:00
83cd2fd317 Move token saving logic to APIAccess 2018-03-14 10:15:05 +09:00
afc3646450 Move API configuration hooks out of OsuGameBase
Also makes username more private, and password completely private.
2018-03-14 10:15:05 +09:00
1d7be2ad0b Fix incorrect variable name 2018-03-14 10:14:42 +09:00
d2a0ca6faa Merge remote-tracking branch 'upstream/master' into fix-combo-colours 2018-03-14 10:13:48 +09:00
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
c55d70ec13 Merge branch 'master' into fix-combo-colours 2018-03-13 19:19:45 +09:00
16eab2eebf Fix combo colours not working until now 2018-03-13 19:19:08 +09:00
e43de68ad3 Move colour parsing to LegacyDecoder 2018-03-13 19:13:50 +09:00
ba44813c00 Fixed exit from game save username instead of email. Resolve #2156 2018-03-13 12:10:47 +02:00
299de4b866 Rewrite seeking to better handle timing point boundaries 2018-03-13 16:54:34 +09:00
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
d6fa7d69d7 Add missing fonts section 2018-03-13 16:13:07 +09:00
e97349fd63 Derive ScreenTestCase + use LoadComponentAsync 2018-03-13 16:00:56 +09:00
0c705b0397 Rename to EditorTestCase 2018-03-13 15:57:05 +09:00
b93e83e3d2 Merge branch 'master' into base-editor-testcase 2018-03-13 15:53:33 +09:00
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
e9cd97c43a Merge branch 'master' into test-beatmap 2018-03-13 15:42:30 +09:00
e32eec9259 No more caching 2018-03-13 15:22:46 +09:00
df352c98d6 Change wheel direction to match stable 2018-03-13 14:30:50 +09:00
e580819621 Rename to seekAmount 2018-03-13 14:08:43 +09:00
6c148930b5 Don't skip beats when scrolling in the direction of the closest beat 2018-03-13 14:02:37 +09:00
afeab481ee Merge pull request #2209 from peppy/more-skinning
Update framework
2018-03-13 13:12:23 +09:00
6ecd2afd24 Update framework 2018-03-13 12:59:49 +09:00
f06f31a269 Merge pull request #2181 from peppy/more-skinning
Add skin support for hit judgements
2018-03-13 12:58:44 +09:00
8acba47a2b Implement mouse wheel movement in the editor 2018-03-13 11:23:44 +09:00
706c26c32b Remove extra whitespace 2018-03-13 09:27:33 +09:00
95c84ea7fe remove (now) unnecessary line 2018-03-12 23:00:06 +01:00
ddc1f03a96 deselect autoplay button after ctrl-enter play
before, the mod was removed, but the button was still active
2018-03-12 22:35:45 +01:00
107ad8cfff Merge remote-tracking branch 'FreezyLemon/master' into more-skinning 2018-03-12 22:01:59 +09:00
3354849cc9 Fix code formatting regression 2018-03-12 22:01:18 +09:00
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
d2859d779d Create a base TestCaseEditor for rulests to derive 2018-03-12 19:43:52 +09:00
13c20438ef Fix build issues 2018-03-12 19:41:51 +09:00
b91524dbba Give TestWorkingBeatmap's track a valid length 2018-03-12 19:41:15 +09:00
7406cb290f Split out test beatmap from TestCasePlayer into instantiable class 2018-03-12 19:41:09 +09:00
8c4bcb4a04 Only accept drag movement on the overlays 2018-03-12 17:33:10 +09:00
212142429f Derive from IHasPosition 2018-03-12 17:25:34 +09:00