Commit Graph

341 Commits

Author SHA1 Message Date
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
12a3b1414f Add sane defaults for abstract Mod class and remove remaining use of enum. 2017-03-06 18:29:19 +09:00
45f500920c Don't use Mods enum for handling incompatible mods. 2017-03-06 18:29:17 +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
76ef8c1a6c Add bindable mods and autoplay support. 2017-03-06 14:52:37 +09:00
652d18aada Update second usage of comment. 2017-03-06 14:20:44 +09:00
4118be6388 Remove unnecessary bounds check. 2017-03-06 14:19:22 +09:00
809828f0ba Improve NextFrame. 2017-03-06 14:18:44 +09:00
faf07ab51a Use generics everywhere. 2017-03-06 13:59:11 +09:00
5b4424d4fa CreateAutoplayReplay -> CreateAutoplayScore. 2017-03-06 10:06:14 +09:00
1c5b918f9e Add osu! autoplay generation.
Doesn't work on complex sliders yet.
2017-03-05 17:46:00 +09:00
4e4408cd20 Merge branch 'master' into replay
# Conflicts:
#	osu.Desktop.VisualTests/Tests/TestCasePlayer.cs
2017-03-05 17:45:03 +09:00
269c139d2a Flags(redoing later), glowing text, proper Score and User usage 2017-03-04 22:29:52 -04:00
73fef85b12 Remove unnecessary usings 2017-03-04 19:43:59 +01:00
a14bdf8624 Use Color4Extensions from Framework and remove redundant Name 2017-03-04 19:42:37 +01:00
95e2e2b027 Replay loading via drag-drop huzzah! 2017-03-04 19:02:43 +09:00
adb6f01e39 Create class hierarchy for Score/Replay storage. 2017-03-04 15:32:41 +09: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
ab91333b21 Replace missing perfect icon with cross. 2017-03-02 20:29:48 +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
482be9f451 Remove AvailableMods 2017-03-02 02:04:26 -04:00
367d6d694c Merge https://github.com/ppy/osu into mod-overlay 2017-03-02 01:44:18 -04:00
1eee587c18 CreateModSections -> GetModsFor(PlayMode), fixed deselect not working in ModSelectOverlay, added MultiMod for multiple mods in one mod, fixed issues with SelectedColour in ModSection 2017-03-02 01:07:28 -04:00
6c680825ed ModSections in Ruleset, fixed toolbar play mode changed not firing 2017-03-01 22:05:52 -04:00
bb12463ae4 Working on better way to handle mods 2017-03-01 20:57:33 -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
cc92459ee1 KeyCounter visibility 2017-03-01 13:22:01 +03:00