Commit Graph

17 Commits

Author SHA1 Message Date
Dean Herbert ecdbcb20cf
Fix error-level inspections. 2017-03-07 13:52:47 +09:00
Dean Herbert 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
Dean Herbert 0cad5d7d41
Fix most warnings. 2017-03-07 13:05:57 +09:00
Dean Herbert 12a3b1414f
Add sane defaults for abstract Mod class and remove remaining use of enum. 2017-03-06 18:29:19 +09:00
Thomas Müller a2317e5a1e Update usage of FillDirection 2017-03-04 11:00:17 +01:00
Dean Herbert 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
DrabWeb 37ed1b3d09 Moved key press select mods to ModSection 2017-03-02 01:24:32 -04:00
DrabWeb 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
DrabWeb c3a81127f2 Updated to work with latest framework 2017-02-28 02:25:38 -04:00
DrabWeb a67bfacb19 Made requested changes 2017-02-23 07:57:58 -04:00
Dean Herbert 9f367bcc0e
Fix line endings. 2017-02-23 11:16:23 +09:00
DrabWeb 416772e96f Update to work with latest framework 2017-02-22 12:46:38 -04:00
DrabWeb 584a514267 Cleanup part 2 2017-02-22 12:22:29 -04:00
DrabWeb a024353574 Wave animation fine tuning 2017-02-18 11:21:41 -04:00
DrabWeb 006fb5502d ModSelect -> ModSelectOverlay, + WaveOverlayContainer, + ModButton selected colours, made song select OnExit not handle closing mod select 2017-02-18 07:28:22 -04:00
DrabWeb e0dab3490f Added toggling mods with keys 2017-02-16 19:00:18 -04:00
DrabWeb 0a58fc62db Added mod selection overlay 2017-02-16 16:05:03 -04:00