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
|
59d1fdb032
|
Simplify ModSection.
|
2017-03-07 00:12:06 +08:00 |
|
Huo Yaoyuan
|
564b3f0706
|
Refactor icon management of ModButton.
|
2017-03-06 19:03:26 +08:00 |
|
Huo Yaoyuan
|
a91d897282
|
Handle left and right mouse button only.
|
2017-03-06 18:02:51 +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
|
12a3b1414f
|
Add sane defaults for abstract Mod class and remove remaining use of enum.
|
2017-03-06 18:29:19 +09:00 |
|
Dean Herbert
|
45f500920c
|
Don't use Mods enum for handling incompatible mods.
|
2017-03-06 18:29:17 +09:00 |
|
Huo Yaoyuan
|
ad75ead665
|
selectedMod -> selectedIndex
|
2017-03-06 17:21:25 +08:00 |
|
Huo Yaoyuan
|
c2cf5242e1
|
Remove one-entry backing fields.
|
2017-03-06 17:14:41 +08:00 |
|
Huo Yaoyuan
|
a34e6453bf
|
Simplify SelectedMods.
|
2017-03-06 15:39:27 +08:00 |
|
Thomas Müller
|
73fef85b12
|
Remove unnecessary usings
|
2017-03-04 19:43:59 +01: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 |
|
Dean Herbert
|
00fdffe9c8
|
Update framework (and fix non-conforming anchors in FillFlowContainers).
|
2017-03-04 23:24:13 +09:00 |
|
Thomas Müller
|
a2317e5a1e
|
Update usage of FillDirection
|
2017-03-04 11:00:17 +01:00 |
|
Thomas Müller
|
c44bf5291c
|
Merge branch 'master' into mod-select-performance
|
2017-03-04 07:35:40 +01:00 |
|
DrabWeb
|
9141d244bf
|
Focus trigger in WaveOverlayContainer
|
2017-03-03 18:05:43 -04:00 |
|
DrabWeb
|
5a83687a27
|
Small cleanups
|
2017-03-03 18:02:31 -04:00 |
|
Thomas Müller
|
aff9e3617d
|
Massively improves fill-rate of mod select screen
This is done by masking away the parts of WaveOverlayContainer that
are behind the content.
|
2017-03-03 20:42:03 +01:00 |
|
Dean Herbert
|
6f3b59268a
|
Merge pull request #385 from DrabWeb/mod-overlay
Mod select
|
2017-03-03 21:09:08 +09:00 |
|
Dean Herbert
|
dc6a728cce
|
Merge branch 'master' into tournament_drawings
|
2017-03-03 20:48:07 +09:00 |
|
Dean Herbert
|
2ac248c7d0
|
Use OsuSpriteText.
|
2017-03-03 20:29:39 +09:00 |
|
Dean Herbert
|
71534b3e13
|
Fix incorrect triangle density on first display.
|
2017-03-03 18:09:16 +09:00 |
|
Seth
|
fde509ab1d
|
Merge branch 'master' into mod-overlay
|
2017-03-03 04:12:42 -04:00 |
|
Seth
|
1891bdf51e
|
Merge branch 'master' into mod-overlay
|
2017-03-03 01:11:15 -04:00 |
|
John Leuenhagen
|
417c7e341a
|
Password textbox now performs login on enter
|
2017-03-02 22:41:14 -05:00 |
|
Dean Herbert
|
3a8246f56d
|
Move PauseOverlay to correct namespace.
|
2017-03-03 10:17:39 +09:00 |
|
Dean Herbert
|
ef8a35f5cc
|
Fix Toolbar's mode changer not working correctly.
|
2017-03-02 22:01:24 +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 |
|
Dean Herbert
|
963117f07d
|
Fix incorrect event order.
|
2017-03-02 17:41:33 +09:00 |
|
Dean Herbert
|
68857b573d
|
More code tidying.
|
2017-03-02 17:14:05 +09:00 |
|
Dean Herbert
|
c4871bbbf3
|
Tidy up code.
The triggered bool is not even necessary because input is no longer handled after the OverlayContainer's state is set to hidden.
|
2017-03-02 17:08:00 +09:00 |
|
Dean Herbert
|
d1cd077e0d
|
Post-merge fixes.
|
2017-03-02 16:54:55 +09:00 |
|
Dean Herbert
|
ff5f0af2d3
|
Merge branch 'master' into popup-dialog
|
2017-03-02 16:42:20 +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
|
befdf68abe
|
Made DialogOverlay use PopupDialog's direct valfixed last dialogs not expiring, DialogOverlay actually hides now, fixed an issue where multiple buttons could be pressed at once
|
2017-03-01 18:41:00 -04:00 |
|
Thomas Müller
|
4d28696479
|
FlowDirection -> FillDirection
|
2017-03-01 20:15:38 +01:00 |
|
Thomas Müller
|
9c853b0465
|
Update framewörk
|
2017-03-01 19:33:01 +01:00 |
|
Thomas Müller
|
d46e68b36b
|
Merge branch 'master' of github.com:ppy/osu into flowcontainer-refactor
# Conflicts:
# osu-framework
# osu.Game/Beatmaps/Drawables/BeatmapGroup.cs
|
2017-03-01 18:05:58 +01:00 |
|
DrabWeb
|
c3a81127f2
|
Updated to work with latest framework
|
2017-02-28 02:25:38 -04:00 |
|
DrabWeb
|
570c95cb98
|
Merge https://github.com/ppy/osu into mod-overlay
|
2017-02-28 02:22:59 -04:00 |
|
DrabWeb
|
ce1798b8bc
|
DialogManager -> DialogOverlay, cleaned up how BeatmapDeletDialog works, added global DialogOverlay
|
2017-02-28 02:09:36 -04:00 |
|
DrabWeb
|
50d172be39
|
Added DialogManager(not wired up for desktop project yet)
|
2017-02-28 00:59:36 -04:00 |
|
DrabWeb
|
bc7fd3bd39
|
Remove uneccesary cast, move enter OK button to one liner
|
2017-02-27 22:38:44 -04:00 |
|
DrabWeb
|
94f34b985b
|
Forgot returns
|
2017-02-27 22:32:30 -04:00 |
|