Commit Graph

15570 Commits

Author SHA1 Message Date
59345c97e4 Remove now unnecessary editor working beatmap 2019-12-12 15:58:31 +09:00
5861eca80d Make DrawableRuleset take a converted beatmap 2019-12-12 15:58:11 +09:00
4c4199269c Use protected constructors 2019-12-12 15:25:37 +09:00
ffb5cdc6ae Hide settings overlay along with other HUD-hidden content 2019-12-12 15:20:42 +09:00
ad2528d4d2 Hide key counter along with other hud elements
Also tidies up HUD hide logic and protects against incorrect hiding.
2019-12-12 15:19:45 +09:00
9961fa7385 Merge branch 'master' into adjustable-rate-mods 2019-12-12 15:10:23 +09:00
76a7e9cde8 Catch file exception in test reset 2019-12-12 14:04:57 +09:00
b6c86d512a Update framework 2019-12-12 13:28:27 +09:00
8168872952 Merge remote-tracking branch 'upstream/master' into filesafety 2019-12-12 13:28:21 +09:00
606bd33aa6 Use beatmap background in editor 2019-12-12 13:04:32 +09:00
a93d57b77e Merge branch 'master' into lighten-playfield-during-breaks 2019-12-12 11:57:21 +09:00
d2ada90434 Merge branch 'master' into single-scoreprocessor 2019-12-12 11:36:45 +09:00
4f6b85e5ea Add test ensuring correct break lightening behaviour 2019-12-12 00:32:39 +03:00
6b048a03a6 Merge branch 'cinema-mod' of https://github.com/aspriddell/osu into cinema-mod 2019-12-11 19:01:28 +00:00
2ca722423b remove uneccesary using statement 2019-12-11 18:58:14 +00:00
4a1c6db3ed Merge branch 'master' into cinema-mod 2019-12-11 18:00:17 +00:00
caa9286a90 update tests, change binding and reduce lines in cinema mod 2019-12-11 17:39:40 +00:00
e6102200a8 Merge remote-tracking branch 'upstream/master' into filesafety 2019-12-12 01:59:57 +09:00
40f918dce6 Remove unused using 2019-12-11 19:49:32 +09:00
c34b6b59ed Remove time ramp and rate adjust mod incompatibility 2019-12-11 19:48:57 +09:00
404d3207ff Refactor ModNightcore/ModDaycore 2019-12-11 19:43:32 +09:00
b77f9504d0 Merge branch 'master' into adjustable-rate-mods 2019-12-11 19:28:59 +09:00
9963d18d17 Add whitespace 2019-12-11 19:13:04 +09:00
e288706802 Merge branch 'master' into rankings-overlay-refactor 2019-12-11 19:09:29 +09:00
166e957104 Merge pull request #6432 from LeNitrous/customized-mods
Add per-mod settings
2019-12-11 19:07:29 +09:00
a106e2a53f Refactor distance snap grid to not require hitobjects (#7138)
Refactor distance snap grid to not require hitobjects
2019-12-11 19:02:29 +09:00
900cbd7af3 Merge branch 'master' into customized-mods 2019-12-11 18:52:00 +09:00
48f1dad4aa Remove abstract ScoreProcessor class 2019-12-11 17:25:06 +09:00
cffeceb229 Remove unnecessary comment. 2019-12-11 16:24:22 +08:00
b86a3dbfab PathStandardise -> ToStandardisedPath 2019-12-11 16:06:56 +08:00
6b3c7c8421 Remove usages of FileSafety class. 2019-12-11 16:05:35 +08:00
83b2e0525e further fixes, not perfect yet 2019-12-11 07:02:51 +00:00
75f9250645 Don't automatically pause when window is inactive if in break time 2019-12-11 15:46:07 +09:00
6c8f325063 Add failing test 2019-12-11 15:46:07 +09:00
9ebad16436 Fix logic regression 2019-12-11 14:37:10 +09:00
77b9989e11 Fix some weird private field names 2019-12-11 14:10:35 +09:00
9eed64997f Merge branch 'customized-mods' into adjustable-rate-mods 2019-12-11 13:26:05 +09:00
5624b9fd3f Fix US english 2019-12-11 13:19:13 +09:00
a37af311d0 Simplify settings update logic 2019-12-11 13:19:02 +09:00
53daa37eaa Fix failing tests 2019-12-10 23:06:13 +03:00
a61f8cc2c3 Merge branch 'master' into cinema-mod 2019-12-10 17:06:53 +00:00
6c1ae3bc8a add tests 2019-12-10 16:59:31 +00:00
38f1a8bc17 Bind UserDimContainer.IsBreakTime from Player 2019-12-10 15:14:47 +03:00
bb078c2afc Lighten user-dim container if on break time 2019-12-10 15:13:44 +03:00
b93bbf81aa Add lighten background during breaks setting 2019-12-10 15:10:35 +03:00
138b83c9ea Merge branch 'master' into customized-mods 2019-12-10 19:13:32 +09:00
f6c0b5c44a Merge branch 'master' into settings-source 2019-12-10 18:49:41 +09:00
efc3b7fc9f Merge branch 'master' into fix-settings-bindable-logic 2019-12-10 18:30:27 +09:00
55c938e5da Fix bindable usage 2019-12-10 18:08:24 +09:00
65f2d1f875 Update framework 2019-12-10 17:49:42 +09:00