785b970125
Add special interface for LegacyHold.
2017-03-14 18:49:22 +09:00
a1833fd6b0
Whoops, naming.
2017-03-14 18:49:01 +09:00
4c7f0fcb73
Fix unit tests.
2017-03-14 18:46:34 +09:00
ad9583a179
Merge branch 'beatmap_parsing' of https://github.com/smoogipooo/osu into beatmap_parsing
2017-03-14 18:06:50 +09:00
1f43370886
Fix failing unit test, move legacy hitobjects to Objects/Legacy/.
2017-03-14 18:06:32 +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
2b3b3b7255
Fix license headers (sorry I have to do this as post-processing for now cos VS 2017...).
2017-03-14 17:07:38 +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
90ad2e9731
Remove unused interface.
2017-03-14 15:50:36 +09:00
e42c790df2
Refactorings.
2017-03-14 15:45:27 +09:00
e8d5cff790
Fix license headers.
2017-03-14 14:53:17 +09:00
072eea82ea
Fix up combo colours + a few nullrefs.
2017-03-14 14:50:12 +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
879a78156d
Merge branch 'master' into mod_application
2017-03-14 12:38:55 +09:00
6ebd88060a
Simplify foreach.
2017-03-14 12:38:30 +09:00
bc5912eab5
Applyable -> Applicable.
2017-03-14 12:32:31 +09:00
1eacafc7b4
Merge branch 'master' into general-fixes
2017-03-14 12:02:24 +09:00
4fa037c0b2
Update framework.
2017-03-14 12:01:58 +09:00
6bd9e3cac1
+Score ranks
2017-03-13 18:34:43 -03:00
2756d5f09f
Merge branch 'master' into mod_application
2017-03-13 23:00:11 +09:00
dbc8d513f9
Merge https://github.com/ppy/osu into leaderboards
2017-03-13 09:36:16 -03:00
842f938439
General fixes.
2017-03-13 21:05:34 +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
35ddca78f5
Remove old, unused hit object converters (will be re-implemented through IBeatmapConverter).
2017-03-13 14:50:55 +09:00
7d129ebd6d
Attempt to fix things.
2017-03-12 22:38:50 +09:00
447cc17de8
Merge branch 'beatmap_conversion' into mod_application
...
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-12 22:20:52 +09:00
5be1839710
Remove unused method.
2017-03-12 22:19:35 +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
