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
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
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
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
2d6e667c7c
Renaming + use IEnumerable.
2017-03-10 13:40:44 +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
115ebd4773
Merge branch 'master' into modselect
2017-03-09 17:31:25 +09:00
1b532b0741
Fix second mono regression.
2017-03-09 15:53:16 +09:00
da751804b6
Reduce error count.
2017-03-09 14:24:16 +09:00
0c4c1689b6
Merge branch 'master' into modselect
2017-03-09 12:51:40 +09:00
5a42035f88
Update license headers.
2017-03-08 15:50:52 +09:00
123c8f3489
Add comment.
2017-03-08 11:54:52 +09:00
02cab41d34
Move InputManager to a higher and more implicit level.
...
Also makes KeyCounterCollection work with replays.
2017-03-07 19:30:48 +09:00
b56d6c767b
Merge branch 'master' into modselect
2017-03-07 16:10:53 +08:00
1fb846e61d
Make playfield scaling optional.
2017-03-07 15:49:04 +09:00
5cbcf7a20a
Fix error-level inspections.
2017-03-07 14:31:54 +09:00
4430255ec4
Merge remote-tracking branch 'upstream/master' into replay
...
# Conflicts:
# osu.Desktop.VisualTests/Tests/TestCasePlayer.cs
# osu.Desktop/OsuGameDesktop.cs
# osu.Game.Modes.Osu/Objects/Drawables/DrawableHitCircle.cs
# osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs
# osu.Game/Database/BeatmapDatabase.cs
# osu.Game/Graphics/Cursor/OsuCursorContainer.cs
# osu.Game/IPC/BeatmapImporter.cs
# osu.Game/Modes/Mod.cs
# osu.Game/Modes/Objects/Drawables/DrawableHitObject.cs
# osu.Game/Modes/UI/Playfield.cs
# osu.Game/Screens/Play/Player.cs
# osu.Game/Screens/Play/PlayerInputManager.cs
2017-03-07 13:50:08 +09:00
0cad5d7d41
Fix most warnings.
2017-03-07 13:05:57 +09:00
c2cf5242e1
Remove one-entry backing fields.
2017-03-06 17:14:41 +08:00
610de4a34c
Only show replay cursor when replay input is present.
2017-03-06 15:24:00 +09:00
faf07ab51a
Use generics everywhere.
2017-03-06 13:59:11 +09:00
4e4408cd20
Merge branch 'master' into replay
...
# Conflicts:
# osu.Desktop.VisualTests/Tests/TestCasePlayer.cs
2017-03-05 17:45:03 +09:00
a14bdf8624
Use Color4Extensions from Framework and remove redundant Name
2017-03-04 19:42:37 +01:00
9e1383fa48
Merge remote-tracking branch 'upstream/master' into replay
...
# Conflicts:
# osu.Game.Modes.Catch/CatchRuleset.cs
# osu.Game.Modes.Mania/ManiaRuleset.cs
# osu.Game.Modes.Taiko/TaikoRuleset.cs
# osu.Game/Screens/Play/Player.cs
2017-03-04 13:17:01 +09:00
471b9daa93
Merge branch 'master' into mod-overlay
...
# Conflicts:
# osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj
# osu.Game/Screens/Select/PlaySongSelect.cs
# osu.Game/osu.Game.csproj
2017-03-02 20:27:04 +09:00
4163569e57
Fix some license headers.
2017-03-02 18:45:20 +09:00
367d6d694c
Merge https://github.com/ppy/osu into mod-overlay
2017-03-02 01:44:18 -04:00
58ae9e888d
Basic partial replay support.
2017-03-01 22:04:20 +09:00
a6504e8f22
Triggering fix
2017-03-01 13:36:53 +03:00
