|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
d9a4a677fd
|
Added Descriptions to Rulesets + PlayModes list
|
2017-03-09 21:37:03 +01: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 |
|
|
|
d7497330b2
|
Reduce warning/suggestion count to zero.
|
2017-03-09 15:52:40 +09:00 |
|
|
|
da751804b6
|
Reduce error count.
|
2017-03-09 14:24:16 +09:00 |
|
|
|
3eece390cb
|
Abstract constructors -> protected.
|
2017-03-09 14:01:08 +09:00 |
|
|
|
dc5ac6e88f
|
Add missing access modifiers.
|
2017-03-09 13:55:29 +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 |
|
|
|
ffd79bee06
|
Remove inherited mods in incompatible list and add between Auto and NoFail.
|
2017-03-07 16:27:55 +08: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 |
|
|
|
bff1179624
|
Merge branch 'master' into replay
# Conflicts:
# osu.Game/Modes/Mod.cs
|
2017-03-07 14:32:14 +09:00 |
|
|
|
5cbcf7a20a
|
Fix error-level inspections.
|
2017-03-07 14:31:54 +09:00 |
|
|
|
ecdbcb20cf
|
Fix error-level inspections.
|
2017-03-07 13:52:47 +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 |
|
|
|
3e4cd0dc7c
|
Merge remote-tracking branch 'upstream/master' into less-mods-enum
# Conflicts:
# osu.Game.Modes.Mania/ManiaMod.cs
# osu.Game.Modes.Osu/OsuMod.cs
# osu.Game/Modes/Mod.cs
|
2017-03-07 13:42:50 +09:00 |
|
|
|
0cad5d7d41
|
Fix most warnings.
|
2017-03-07 13:05:57 +09:00 |
|
|
|
12c316aba4
|
Fix int truncation.
|
2017-03-07 11:29:55 +09:00 |
|
|
|
39ff68a812
|
Add missing IncompatibleMods.
|
2017-03-07 09:16:47 +09:00 |
|
|
|
f6f20cafd3
|
Merge remote-tracking branch 'peppy/less-mods-enum' into modselect
|
2017-03-06 17:35:15 +08:00 |
|
