74db255c78
Move back to using an abstract method to determine if all objects have been judged.
...
Because sliderticks provide judgements even though they are added as nested hitobjects, the count method would not work to determine if all hitobjects have been judged. This needs a little bit more thought put in...
2017-03-12 01:19:51 +09:00
75ed7406e4
Merge remote-tracking branch 'origin/master' into refactor_hitrenderer
...
Conflicts:
osu.Game.Modes.Catch/CatchRuleset.cs
osu.Game.Modes.Mania/ManiaRuleset.cs
osu.Game.Modes.Osu/OsuRuleset.cs
osu.Game.Modes.Taiko/TaikoRuleset.cs
2017-03-11 14:22:59 +09:00
1f9ddd1cab
Merge pull request #461 from smoogipooo/general_hud
...
General hud
2017-03-10 16:21:23 +09:00
529cabb001
Make HudOverlay not dependent on Ruleset.
2017-03-10 16:16:07 +09:00
75a5da62d0
Fix filenames.
2017-03-10 16:11:38 +09:00
2bc36fecc6
Combo should not be longs.
2017-03-10 16:05:05 +09:00
eca980bb95
Remove .orig files (not sure how they got here).
2017-03-10 15:57:14 +09:00
02281d8a2a
Make HitRenderer not have a publicly-settable Beatmap, replace AllObjectsJudged for performance.
2017-03-10 15:19:36 +09:00
d3e14aad1b
Use =>.
2017-03-10 14:55:43 +09:00
58a88cc715
More general refactorings.
2017-03-10 14:42:14 +09:00
5f440d0b53
Merge branch 'combocounter_bindable' into general_hud
...
Conflicts:
osu.Game.Modes.Osu/OsuRuleset.cs
osu.Game/Modes/Ruleset.cs
2017-03-10 14:35:31 +09:00
605326e8f6
More ComboCounter fixups + refactorings.
2017-03-10 14:34:08 +09:00
b56d7f19e0
Remove DrumHit.
2017-03-10 14:23:57 +09:00
8f724bd586
Merge branch 'master' into general_hud
2017-03-10 14:17:34 +09:00
79fffdb7ef
Merge branch 'master' into combocounter_bindable
2017-03-10 14:17:14 +09:00
e5bde712ed
Merge pull request #464 from smoogipooo/remove_float_interpolation
...
Remove float ValueAt method.
2017-03-10 14:16:33 +09:00
2fb5334d09
Why tho?
2017-03-10 14:15:56 +09:00
7a68e46366
Merge remote-tracking branch 'origin/master' into combocounter_bindable
...
Conflicts:
osu.Game.Modes.Osu/OsuRuleset.cs
osu.Game/Modes/Ruleset.cs
2017-03-10 14:15:06 +09:00
5f72265eff
Remove float ValueAt method.
2017-03-10 14:09:55 +09:00
ff3faeaf40
Fix silly spelling mistake.
2017-03-10 14:01:54 +09:00
712739d779
s/SetHP/SetHealth.
2017-03-10 13:58:17 +09:00
f44fa56646
Merge branch 'general_hud' of https://github.com/smoogipooo/osu into general_hud
...
Conflicts:
osu.Game.Modes.Osu/OsuRuleset.cs
2017-03-10 13:42:50 +09:00
2d6e667c7c
Renaming + use IEnumerable.
2017-03-10 13:40:44 +09:00
2813484f2e
Merge branch 'master' into general_hud
2017-03-10 13:25:26 +09:00
e6f4fe9e61
Merge pull request #458 from Lahvuun/master
...
Options sidebar flickering fix.
2017-03-10 13:20:07 +09:00
9e223bd77b
Merge pull request #459 from Jorolf/rulesetAndPlayModeRemake
...
Added Descriptions to Rulesets + PlayModes list
2017-03-10 13:18:43 +09:00
4015b87965
General fixes.
2017-03-10 13:09:50 +09:00
75f004eeb9
Merge branch 'general_hud' of https://github.com/smoogipooo/osu into general_hud
2017-03-10 13:03:26 +09:00
7c1a3067e6
Oops o_o.
2017-03-10 13:03:13 +09:00
444c645da0
General fixes.
2017-03-10 13:02:50 +09:00
4cc032e1d7
Make ComboCounter count a bindable, and properly bind it to the processor.
2017-03-10 12:55:10 +09:00
70d91e16d5
Merge branch 'master' into general_hud
2017-03-10 12:49:37 +09:00
617ceb8001
Rename to StandardComboCounter, add HealthDisplay abstraction.
2017-03-10 12:47:00 +09:00
31f6cbd8cf
Rename ScoreOverlay -> HUDOverlay, move to osu.Game, make it not overridable by rulesets.
2017-03-10 12:14:13 +09:00
69776d436f
Merge pull request #460 from smoogipooo/remove_custom_combocounters
...
Remove custom combo counters.
2017-03-10 11:43:00 +09:00
2b64de9dd8
Fix using statements.
2017-03-10 11:37:53 +09:00
fa9110ce6e
Remove custom combo counters.
2017-03-10 11:04:46 +09:00
9dd835e256
didn't see this was unnecessary after my changes
2017-03-09 21:43:11 +01:00
d9a4a677fd
Added Descriptions to Rulesets + PlayModes list
2017-03-09 21:37:03 +01:00
427a0dd0f5
Options sidebar flickering fix.
2017-03-09 22:29:39 +02:00
a266add670
Merge pull request #450 from huoyaoyuan/modselect
...
Modselect refactor
2017-03-09 18:16:16 +09:00
9007409072
Follow appveyor's code style check.
2017-03-09 16:44:45 +08:00
115ebd4773
Merge branch 'master' into modselect
2017-03-09 17:31:25 +09:00
ca4c524fae
Merge pull request #456 from peppy/general-fixes
...
Update framework.
2017-03-09 17:30:51 +09:00
1b182b1361
Fix typo.
2017-03-09 15:55:40 +08:00
30de7aa59c
Remove duplicate reference to nunit.
2017-03-09 16:15:33 +09:00
dad6060149
Fix warnings not covered by resharper locally.
2017-03-09 16:07:34 +09:00
1b532b0741
Fix second mono regression.
2017-03-09 15:53:16 +09:00
d7497330b2
Reduce warning/suggestion count to zero.
2017-03-09 15:52:40 +09:00
a048e666d7
Fix autoproperty which doesn't work on mono.
2017-03-09 14:26:09 +09:00
