|
|
9b92e99ce9
|
Merge branch 'master' into increase-ci-strictness
|
2017-03-06 21:44:39 +01:00 |
|
|
|
6e9c4a4251
|
Merge branch 'master' into options-footer
|
2017-03-06 20:01:51 +01:00 |
|
|
|
27edc9971e
|
Update deselect logic.
Change to DeselectTypes to avoid enumerating children for multi times.
|
2017-03-07 01:15:21 +08:00 |
|
|
|
eda7e1b26f
|
Fix and update mode changing handling.
|
2017-03-07 01:01:42 +08:00 |
|
|
|
5cd859ecf1
|
Fix missed color during loading.
|
2017-03-07 00:46:36 +08:00 |
|
|
|
836484ba51
|
Add abstract ModType for ModSection.
|
2017-03-07 00:32:22 +08:00 |
|
|
|
318ab68af1
|
Use Bindable<IEnumerable<Mod>> to fit other changes.
|
2017-03-07 00:17:06 +08:00 |
|
|
|
59d1fdb032
|
Simplify ModSection.
|
2017-03-07 00:12:06 +08:00 |
|
|
|
dcc7386609
|
Add option toggle for debug cached setting.
|
2017-03-06 22:07:46 +09:00 |
|
|
|
564b3f0706
|
Refactor icon management of ModButton.
|
2017-03-06 19:03:26 +08:00 |
|
|
|
a91d897282
|
Handle left and right mouse button only.
|
2017-03-06 18:02:51 +08: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 |
|
|
|
ad75ead665
|
selectedMod -> selectedIndex
|
2017-03-06 17:21:25 +08:00 |
|
|
|
c2cf5242e1
|
Remove one-entry backing fields.
|
2017-03-06 17:14:41 +08:00 |
|
|
|
463c887879
|
Fix WaveOverlayContainer staying visible when hidden.
|
2017-03-06 17:32:13 +09:00 |
|
|
|
b5aff9df5f
|
Add options footer.
|
2017-03-06 17:30:46 +09:00 |
|
|
|
e356758a7d
|
Don't expicitly set origin of TextAwesome.
|
2017-03-06 17:06:48 +09:00 |
|
|
|
a34e6453bf
|
Simplify SelectedMods.
|
2017-03-06 15:39:27 +08:00 |
|
|
|
2de25c23b4
|
Make Mods IEnumerable.
|
2017-03-06 15:20:55 +09:00 |
|
|
|
4e4408cd20
|
Merge branch 'master' into replay
# Conflicts:
# osu.Desktop.VisualTests/Tests/TestCasePlayer.cs
|
2017-03-05 17:45:03 +09:00 |
|
|
|
9cde20ffc7
|
Merge https://github.com/ppy/osu into leaderboards
|
2017-03-04 22:33:05 -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 |
|
|
|
e12d89529c
|
Merge remote-tracking branch 'upstream/master' into update-flow
|
2017-03-04 23:28:39 +09:00 |
|
|
|
00fdffe9c8
|
Update framework (and fix non-conforming anchors in FillFlowContainers).
|
2017-03-04 23:24:13 +09:00 |
|
|
|
a8deb4ff50
|
Fix WaveOverlayContainer always being visible.
|
2017-03-04 19:02:13 +09:00 |
|
|
|
a2317e5a1e
|
Update usage of FillDirection
|
2017-03-04 11:00:17 +01:00 |
|
|
|
a112b354f0
|
Basic implementation of score UI
|
2017-03-04 03:37:34 -04:00 |
|
|
|
c44bf5291c
|
Merge branch 'master' into mod-select-performance
|
2017-03-04 07:35:40 +01:00 |
|
|
|
9141d244bf
|
Focus trigger in WaveOverlayContainer
|
2017-03-03 18:05:43 -04:00 |
|
|
|
5a83687a27
|
Small cleanups
|
2017-03-03 18:02:31 -04:00 |
|
|
|
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 |
|
|
|
6f3b59268a
|
Merge pull request #385 from DrabWeb/mod-overlay
Mod select
|
2017-03-03 21:09:08 +09:00 |
|
|
|
dc6a728cce
|
Merge branch 'master' into tournament_drawings
|
2017-03-03 20:48:07 +09:00 |
|
|
|
2ac248c7d0
|
Use OsuSpriteText.
|
2017-03-03 20:29:39 +09:00 |
|
|
|
71534b3e13
|
Fix incorrect triangle density on first display.
|
2017-03-03 18:09:16 +09:00 |
|
|
|
fde509ab1d
|
Merge branch 'master' into mod-overlay
|
2017-03-03 04:12:42 -04:00 |
|
|
|
1891bdf51e
|
Merge branch 'master' into mod-overlay
|
2017-03-03 01:11:15 -04:00 |
|
|
|
417c7e341a
|
Password textbox now performs login on enter
|
2017-03-02 22:41:14 -05:00 |
|
|
|
3a8246f56d
|
Move PauseOverlay to correct namespace.
|
2017-03-03 10:17:39 +09:00 |
|
|
|
ef8a35f5cc
|
Fix Toolbar's mode changer not working correctly.
|
2017-03-02 22:01:24 +09:00 |
|
|
|
e399d6c6d1
|
Use bindable for PlayMode.
|
2017-03-02 21:16:58 +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 |
|
|
|
963117f07d
|
Fix incorrect event order.
|
2017-03-02 17:41:33 +09:00 |
|
|
|
68857b573d
|
More code tidying.
|
2017-03-02 17:14:05 +09:00 |
|
|
|
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 |
|
|
|
d1cd077e0d
|
Post-merge fixes.
|
2017-03-02 16:54:55 +09:00 |
|
|
|
ff5f0af2d3
|
Merge branch 'master' into popup-dialog
|
2017-03-02 16:42:20 +09:00 |
|
