Dan Balasescu
03c778df75
Merge branch 'master' into update-framework
2020-01-09 19:02:26 +09:00
smoogipoo
91735ff367
Update MathUtils namespace usages
2020-01-09 13:43:44 +09:00
Bartłomiej Dach
f0fe3bc804
Pass bindable to BeatmapMetadataDisplay
...
It was reported that mods selected in song select would show up during
loading of replays which were recorded under a different set of mods.
This was caused by BeatmapMetadataDisplay accepting a plain read-only
value of the Mods bindable in PlayerLoader.load(), therefore making the
mod value assignment in ReplayPlayerLoader.OnEntering() have no effect
on that component.
To resolve this issue, make BeatmapMetadataDisplay accept the
higher-level bindable, bind to it locally and pass it down the hierarchy
to ModDisplay.
2020-01-08 20:10:43 +01:00
Bartłomiej Dach
a3f7d3c445
Add failing test
...
Add test case demonstrating the lack of update of the metadata display's
mods upon setting the Mods property in PlayerLoader.
2020-01-08 19:55:35 +01:00
Dean Herbert
ca862124a5
Fix replay import from main menu causing a hard crash
2019-12-27 19:36:48 +09:00
Dean Herbert
b330aec03e
Drain starting at the first hitobject, not gameplay start
2019-12-27 16:16:30 +09:00
Dean Herbert
cac011edc1
Merge branch 'master' into hp-drain
2019-12-26 23:51:12 +09:00
Dean Herbert
033bb15500
Fix early-escape not continuing to results screen ( #7362 )
...
Fix early-escape not continuing to results screen
2019-12-26 23:50:21 +09:00
Dean Herbert
a041f32072
Use cleaner solution via cancellation of older schedule
2019-12-26 19:05:32 +09:00
smoogipoo
8903f286ef
Fix escape not continuing to results screen
2019-12-26 18:27:48 +09:00
smoogipoo
522847987b
Implement break/gameplay start times
2019-12-26 15:00:58 +09:00
smoogipoo
b348abcd07
Only drain health in non-break times
2019-12-26 14:59:49 +09:00
smoogipoo
977fb3d1bf
Make processors and break overlay frame-stable
2019-12-26 14:59:49 +09:00
smoogipoo
a4b1c79e18
Initial implementation of HP drain
2019-12-26 14:59:49 +09:00
smoogipoo
90cb9d9162
Simplify scoreprocesor/healthprocessor implementations
2019-12-26 14:59:49 +09:00
smoogipoo
7414a6aadd
Merge remote-tracking branch 'huoyaoyuan/master' into health-processor
...
# Conflicts:
# osu.Game.Rulesets.Catch/CatchRuleset.cs
# osu.Game.Rulesets.Mania/ManiaRuleset.cs
# osu.Game.Rulesets.Taiko/TaikoRuleset.cs
2019-12-26 14:56:54 +09:00
smoogipoo
c7936e40d5
Protect against potential nullref
2019-12-23 19:13:36 +09:00
Salman Ahmed
7d090d6cd9
Fix key overlay appearing regardless of the setting
2019-12-19 17:52:58 +03:00
smoogipoo
76f2fb378f
Separate score and health parts of ScoreProcessor
2019-12-19 20:03:14 +09:00
Dean Herbert
e0ce87adca
Move CreateScoreProcessor() to Ruleset ( #7244 )
...
Move CreateScoreProcessor() to Ruleset
2019-12-17 22:15:42 +09:00
Dan Balasescu
fd2785bab3
Merge branch 'master' into fxcop
2019-12-17 20:14:45 +09:00
smoogipoo
49bf8d27d1
Move CreateScoreProcessor() to Ruleset
2019-12-17 20:08:13 +09:00
Huo Yaoyuan
d5994ed484
CA2208: create exceptions correctly.
2019-12-17 13:00:10 +08:00
Huo Yaoyuan
ecfc6dfa3d
CA1825: use Array.Empty.
2019-12-17 12:59:48 +08:00
Dean Herbert
b5db927d93
Merge branch 'master' into cinema-mod
2019-12-17 12:56:06 +09:00
smoogipoo
6cf318c34b
Merge remote-tracking branch 'refs/remotes/origin/master' into improve-hud-hiding
2019-12-16 18:41:21 +09:00
smoogipoo
a276643a4b
Reorder health display and score elements
2019-12-16 18:41:14 +09:00
smoogipoo
83f77d9c35
Make the layout faster
2019-12-16 18:41:02 +09:00
Dean Herbert
59538bfd32
Merge branch 'global-available-mods' into adjustable-rate-mods
2019-12-13 21:57:27 +09:00
Dean Herbert
7559012fb7
Merge remote-tracking branch 'upstream/master' into lighten-playfield-during-breaks
2019-12-12 19:55:09 +09:00
Dean Herbert
d15f49f60f
Also hide the break overlay
2019-12-12 16:13:02 +09:00
Dean Herbert
37a94988a3
Merge branch 'improve-hud-hiding' into cinema-mod
2019-12-12 16:12:19 +09:00
Dean Herbert
94f3dbb2f6
Adjust transitions slightly
2019-12-12 16:09:50 +09:00
Dean Herbert
3ccfee64f6
Add HUDOverlay tests
2019-12-12 16:09:42 +09:00
smoogipoo
5861eca80d
Make DrawableRuleset take a converted beatmap
2019-12-12 15:58:11 +09:00
Dean Herbert
ffb5cdc6ae
Hide settings overlay along with other HUD-hidden content
2019-12-12 15:20:42 +09:00
Dean Herbert
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
Dean Herbert
9961fa7385
Merge branch 'master' into adjustable-rate-mods
2019-12-12 15:10:23 +09:00
Dean Herbert
a93d57b77e
Merge branch 'master' into lighten-playfield-during-breaks
2019-12-12 11:57:21 +09:00
Dean Herbert
d2ada90434
Merge branch 'master' into single-scoreprocessor
2019-12-12 11:36:45 +09:00
Albie
4a1c6db3ed
Merge branch 'master' into cinema-mod
2019-12-11 18:00:17 +00:00
Dan Balasescu
b77f9504d0
Merge branch 'master' into adjustable-rate-mods
2019-12-11 19:28:59 +09:00
smoogipoo
48f1dad4aa
Remove abstract ScoreProcessor class
2019-12-11 17:25:06 +09:00
Dean Herbert
75f9250645
Don't automatically pause when window is inactive if in break time
2019-12-11 15:46:07 +09:00
Dean Herbert
9ebad16436
Fix logic regression
2019-12-11 14:37:10 +09:00
Dean Herbert
77b9989e11
Fix some weird private field names
2019-12-11 14:10:35 +09:00
Salman Ahmed
53daa37eaa
Fix failing tests
2019-12-10 23:06:13 +03:00
Albie
a61f8cc2c3
Merge branch 'master' into cinema-mod
2019-12-10 17:06:53 +00:00
Salman Ahmed
38f1a8bc17
Bind UserDimContainer.IsBreakTime from Player
2019-12-10 15:14:47 +03:00
Dean Herbert
7fd52c21f5
Update mods and user adjust to use adjustments
2019-12-09 19:41:31 +09:00
