14a6129675
Merge branch 'master' into roompanel
2017-03-13 16:41:14 +09:00
5be1839710
Remove unused method.
2017-03-12 22:19:35 +09:00
3480dca0ad
Remove PlayMode enum requirement. Clean things up a lot.
2017-03-12 14:32:50 +09:00
b0ea282a06
Fix map would always be converted to itself when actually converting to a different game mode.
2017-03-12 02:26:10 +09:00
f484792546
Merge branch 'refactor_hitrenderer' into beatmap_conversion
...
Conflicts:
osu.Game/Modes/UI/HitRenderer.cs
2017-03-12 01:27:28 +09:00
1c7a9e3a07
General fixups.
2017-03-12 01:26:07 +09:00
59b62b8fd4
Merge remote-tracking branch 'origin/master' into refactor_hitrenderer
2017-03-12 01:20:11 +09:00
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
77a4a896c9
Cleanups.
2017-03-12 01:08:34 +09:00
592e05a2c8
Better beatmap conversion model.
2017-03-12 00:34:21 +09:00
e126a5600a
Fix using.
2017-03-11 14:28:06 +09:00
42b19cd3b3
Re-add files.
2017-03-11 14:27:18 +09:00
b63a1c549e
Remove files temporarily.
2017-03-11 14:26:58 +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
3276316ac8
Merge remote-tracking branch 'origin/master' into counter_bindables
...
Conflicts:
osu.Game/Modes/UI/HudOverlay.cs
2017-03-11 14:19:25 +09:00
eef18eea42
General fixes.
2017-03-11 14:17:07 +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
aed89b7c0f
Merge branch 'general_hud' into counter_bindables
...
Conflicts:
osu.Desktop.VisualTests/Tests/TestCaseScoreCounter.cs
osu.Game/Modes/UI/HUDOverlay.cs
2017-03-10 14:44:29 +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
0fa2776975
Merge branch 'master' into counter_bindables
2017-03-10 14:21:33 +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
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
122792eb93
Remove unused methods.
2017-03-10 13:49:56 +09:00
cd1717c42f
More bindables!
2017-03-10 13:49:51 +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
4015b87965
General fixes.
2017-03-10 13:09:50 +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
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
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
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
1b182b1361
Fix typo.
2017-03-09 15:55:40 +08:00
dad6060149
Fix warnings not covered by resharper locally.
2017-03-09 16:07:34 +09:00
