Dean Herbert
|
115ebd4773
|
Merge branch 'master' into modselect
|
2017-03-09 17:31:25 +09:00 |
|
Dean Herbert
|
da751804b6
|
Reduce error count.
|
2017-03-09 14:24:16 +09:00 |
|
Dean Herbert
|
bff1179624
|
Merge branch 'master' into replay
# Conflicts:
# osu.Game/Modes/Mod.cs
|
2017-03-07 14:32:14 +09:00 |
|
Huo Yaoyuan
|
27edc9971e
|
Update deselect logic.
Change to DeselectTypes to avoid enumerating children for multi times.
|
2017-03-07 01:15:21 +08:00 |
|
Huo Yaoyuan
|
eda7e1b26f
|
Fix and update mode changing handling.
|
2017-03-07 01:01:42 +08:00 |
|
Huo Yaoyuan
|
836484ba51
|
Add abstract ModType for ModSection.
|
2017-03-07 00:32:22 +08:00 |
|
Huo Yaoyuan
|
318ab68af1
|
Use Bindable<IEnumerable<Mod>> to fit other changes.
|
2017-03-07 00:17:06 +08:00 |
|
Huo Yaoyuan
|
f6f20cafd3
|
Merge remote-tracking branch 'peppy/less-mods-enum' into modselect
|
2017-03-06 17:35:15 +08:00 |
|
Dean Herbert
|
45f500920c
|
Don't use Mods enum for handling incompatible mods.
|
2017-03-06 18:29:17 +09:00 |
|
Huo Yaoyuan
|
a34e6453bf
|
Simplify SelectedMods.
|
2017-03-06 15:39:27 +08:00 |
|
Dean Herbert
|
2de25c23b4
|
Make Mods IEnumerable.
|
2017-03-06 15:20:55 +09:00 |
|
Thomas Müller
|
a14bdf8624
|
Use Color4Extensions from Framework and remove redundant Name
|
2017-03-04 19:42:37 +01:00 |
|
Dean Herbert
|
e12d89529c
|
Merge remote-tracking branch 'upstream/master' into update-flow
|
2017-03-04 23:28:39 +09:00 |
|
Thomas Müller
|
a2317e5a1e
|
Update usage of FillDirection
|
2017-03-04 11:00:17 +01:00 |
|
DrabWeb
|
5a83687a27
|
Small cleanups
|
2017-03-03 18:02:31 -04:00 |
|
Dean Herbert
|
71534b3e13
|
Fix incorrect triangle density on first display.
|
2017-03-03 18:09:16 +09:00 |
|
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
|
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
|
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
|
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
|
bac0431102
|
Fixed build failing
|
2017-02-22 12:28:34 -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 |
|