1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-15 03:47:26 +08:00
Commit Graph

132 Commits

Author SHA1 Message Date
Dean Herbert
e399d6c6d1
Use bindable for PlayMode. 2017-03-02 21:16:58 +09: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
6c680825ed ModSections in Ruleset, fixed toolbar play mode changed not firing 2017-03-01 22:05:52 -04:00
DrabWeb
bb12463ae4 Working on better way to handle mods 2017-03-01 20:57:33 -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
DrabWeb
e1c4abd8c5 Cleaned ModSelectOverlay 2017-02-23 07:36:31 -04:00
Dean Herbert
c683cdbb1d
Derive from FocusedOverlayContainer and remove custom focus logic. 2017-02-23 12:51:32 +09:00
Dean Herbert
8d1498a8db
Fix initial state and shorten disappear animation. 2017-02-23 12:47:20 +09:00
Dean Herbert
b33627a750
Make transitions better. 2017-02-23 12:42:31 +09:00
Dean Herbert
9f367bcc0e
Fix line endings. 2017-02-23 11:16:23 +09:00
DrabWeb
79ff96de0d Typo 2017-02-22 16:38:36 -04:00
DrabWeb
a58a0a4edf Fix transition stutter 2017-02-22 16:37:58 -04:00
DrabWeb
cf5258ceb0 Thanks refactoring 2017-02-22 13:17:06 -04:00
DrabWeb
bf1d13e734 Comply to formatting style 2017-02-22 13:12:39 -04:00
DrabWeb
8cd7ebcb43 readonly -> const 2017-02-22 13:03:19 -04:00
DrabWeb
416772e96f Update to work with latest framework 2017-02-22 12:46:38 -04:00
DrabWeb
bac0431102 Fixed build failing 2017-02-22 12:28:34 -04:00
DrabWeb
cc956bc8ec Newline 2017-02-22 12:23:46 -04:00
DrabWeb
584a514267 Cleanup part 2 2017-02-22 12:22:29 -04:00
DrabWeb
4821f323b8 Cleanup 2017-02-22 12:12:41 -04:00
DrabWeb
337a1004d3 Made mod disabling better 2017-02-22 11:34:22 -04:00
DrabWeb
3f5d155583 Added DeselectAll 2017-02-18 11:40:05 -04:00
DrabWeb
a024353574 Wave animation fine tuning 2017-02-18 11:21:41 -04:00
DrabWeb
d1af050355 Fixed typo, made mod select take focus when visible 2017-02-18 07:50:22 -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
4ccfa380f5 Added high/low multiplier indication 2017-02-16 19:09:18 -04:00
DrabWeb
e0dab3490f Added toggling mods with keys 2017-02-16 19:00:18 -04:00
DrabWeb
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
DrabWeb
0a58fc62db Added mod selection overlay 2017-02-16 16:05:03 -04:00