Commit Graph

274 Commits

Author SHA1 Message Date
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
570c95cb98 Merge https://github.com/ppy/osu into mod-overlay 2017-02-28 02:22:59 -04:00
7c602a2af3 Update framework. 2017-02-27 15:55:57 +09:00
1585ae842a Update framework 2017-02-26 11:22:58 +09:00
a5dfa7ab06 Remove unnecessary using statements 2017-02-23 21:38:10 +01:00
64b0f85b89 Documented Mod class 2017-02-23 07:59:27 -04:00
a67bfacb19 Made requested changes 2017-02-23 07:57:58 -04:00
99f1f88c75 Merge https://github.com/ppy/osu into mod-overlay 2017-02-22 12:35:55 -04:00
4821f323b8 Cleanup 2017-02-22 12:12:41 -04:00
337a1004d3 Made mod disabling better 2017-02-22 11:34:22 -04:00
417f146386 Add difficulty calculation
Adds base classes for difficulty calculations, hooks them up with
carousel container, and adds a port of the osu difficulty calculator.
2017-02-19 17:41:51 +01:00
d1af050355 Fixed typo, made mod select take focus when visible 2017-02-18 07:50:22 -04:00
d82b67ee9b Made Mod abstract, added KeyMod as a base for mania key count modes 2017-02-18 07:44:46 -04:00
006fb5502d ModSelect -> ModSelectOverlay, + WaveOverlayContainer, + ModButton selected colours, made song select OnExit not handle closing mod select 2017-02-18 07:28:22 -04:00
32ce8cf723 Audio class renames in line with framework changes. 2017-02-18 17:35:04 +09:00
9fc3726925 ModSelector -> ModSelect, added mod descriptions, added per-mode mod selection, changed animations and made the wave mask properly 2017-02-16 18:32:27 -04:00
0a58fc62db Added mod selection overlay 2017-02-16 16:05:03 -04:00
ca6946c7a2 Update Health display design. 2017-02-16 22:44:21 +09:00