ab8a5afdb9
AlwaysReceiveInput and InternalContains.
2017-03-16 17:38:36 +09:00
418189effd
Adjust/improve a few comments.
2017-03-15 21:58:00 +09:00
4de3dde44d
Fix post-merge error.
2017-03-15 21:40:19 +09:00
42da0f1a72
Merge remote-tracking branch 'origin/master' into generic_judgements_2
...
Conflicts:
osu.Desktop.VisualTests/Tests/TestCaseHitObjects.cs
osu.Game.Modes.Catch/UI/CatchHitRenderer.cs
osu.Game.Modes.Mania/UI/ManiaHitRenderer.cs
osu.Game.Modes.Mania/osu.Game.Modes.Mania.csproj
osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs
osu.Game.Modes.Osu/Objects/Drawables/DrawableSpinner.cs
osu.Game.Modes.Osu/UI/OsuHitRenderer.cs
osu.Game.Modes.Taiko/UI/TaikoHitRenderer.cs
osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
osu.Game/Modes/Objects/Drawables/DrawableHitObject.cs
osu.Game/Modes/UI/HitRenderer.cs
osu.Game/osu.Game.csproj
2017-03-15 21:36:43 +09:00
3a8d1d3619
Add license headers.
2017-03-15 21:32:47 +09:00
a9bc253b8c
General refactoring (no more casts :D).
2017-03-15 19:18:23 +09:00
36e8618370
Make DrawableHitObjects have generic JudgementInfos.
2017-03-15 18:55:38 +09:00
bf66b84ff8
Move a few classes/enums into separate files.
2017-03-15 16:07:40 +09:00
069a7a24ce
Fix defaults not being set (keep in mind this will be changed in a later pullrequest).
2017-03-14 19:04:40 +09:00
5c2bf02c9d
Merge branch 'master' into beatmap_parsing
2017-03-14 17:50:00 +09:00
d6ccc66b23
Attempt to fix nullref warning.
2017-03-14 17:46:35 +09:00
7141bc86d3
Rework beatmap post-processing into HitRenderer.
2017-03-14 17:01:21 +09:00
14b22445fa
Merge remote-tracking branch 'upstream/master' into general-fixes
...
# Conflicts:
# osu.Game/Modes/UI/HitRenderer.cs
2017-03-14 16:15:26 +09:00
1f68731a09
Split PlayerInputManager into two classes, allowing more precise handling of input (for KeyCounter).
2017-03-14 16:00:35 +09:00
854212a7aa
Merge branch 'master' into beatmap_parsing
...
Conflicts:
osu.Desktop.VisualTests/app.config
osu.Game.Modes.Catch/CatchRuleset.cs
osu.Game.Modes.Mania/ManiaRuleset.cs
osu.Game.Modes.Mania/app.config
osu.Game.Modes.Osu/OsuRuleset.cs
osu.Game.Modes.Osu/app.config
osu.Game.Modes.Taiko/TaikoRuleset.cs
osu.Game/Modes/Ruleset.cs
osu.Game/app.config
osu.Game/osu.Game.csproj
2017-03-14 13:39:19 +09:00
bbd81dbc47
Add license headers.
2017-03-14 13:02:42 +09:00
99c23d8715
I don't like this renaming.
2017-03-14 12:54:09 +09:00
db8cbba8d5
Okay resharper u da boss.
2017-03-14 12:52:12 +09:00
6ebd88060a
Simplify foreach.
2017-03-14 12:38:30 +09:00
bc5912eab5
Applyable -> Applicable.
2017-03-14 12:32:31 +09:00
f50e0bbf3c
Rework/rewrite beatmap parsing to parse to base hit objects, which mode-specific beatmap converters can then use.
2017-03-13 19:15:25 +09:00
7d129ebd6d
Attempt to fix things.
2017-03-12 22:38:50 +09:00
c0e29652a6
Initial attempt at making mods apply better.
2017-03-12 22:13:43 +09:00
64aab090d5
Instantiate HitRenderer with WorkingBeatmap.
2017-03-12 18:03:13 +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
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
