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
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
ba10c3a8db
Revert "Merge pull request #441 from tacchinotacchi/archive-reader"
...
This reverts commit 6f20473e65c76a495d3d
2017-03-14 11:46:34 +09:00
e1bd168c16
Remaining GameMode -> Screen.
2017-03-14 07:22:46 +08:00
3913a0a9ee
Fix removal of the last one beatmap.
2017-03-14 05:35:58 +08:00
14a22f032f
Fix beatmap panel removal.
2017-03-14 04:35:43 +08:00
db104d04d3
Use AutoGenerateBindingRedirects instead of explicit app.config.
2017-03-14 03:20:33 +08:00
2756d5f09f
Merge branch 'master' into mod_application
2017-03-13 23:00:11 +09:00
c51e97e8cc
Merge pull request #471 from smoogipooo/beatmap_conversion
...
Beatmap conversion
2017-03-13 22:17:22 +09:00
b2981fb729
Merge branch 'master' into mod_application
2017-03-13 22:15:26 +09:00
842f938439
General fixes.
2017-03-13 21:05:34 +09:00
c84a9d56f5
Fix namespace, comply with naming rules
2017-03-13 11:36:21 +01:00
caa6e9c82b
General improvements
2017-03-13 11:29:24 +01: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
971d8eb7c5
Merge remote-tracking branch 'upstream/master' into archive-reader
2017-03-13 10:56:31 +01: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
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
