Commit Graph

2742 Commits

Author SHA1 Message Date
11c2e66cee Merge branch 'master' into option-item-refactor 2017-05-08 10:13:21 +09:00
fbf05f12fc Use controlWithCurrent as per comment. 2017-05-08 10:11:45 +09:00
36dff94802 removed check if ModSelectOverlay is open 2017-05-05 18:16:48 -07:00
d129bd0c1f Fix ModSelectOverlay accepting escape when it shouldn't
Because PlaySongSelect is suspending when selecting a song, we don't actually hide ModSelectOverlay.
2017-05-05 17:03:24 -07:00
98b3b82c07 Apply CI fixes. 2017-05-04 23:32:27 +09:00
153951d3dd Add OptionItem class
Allow for centalised logic for all option UI controls.
2017-05-04 23:07:48 +09:00
efa60ee287 Merge branch 'master' into mania-stage 2017-05-04 16:58:16 +09:00
19f6d58723 Merge remote-tracking branch 'upstream/master' into options-implementation 2017-05-03 21:54:27 +09:00
330dd458bd Trim whitespace. 2017-05-03 20:49:52 +09:00
489f586887 Add FPS display toggling.
Kinda temporary but better than nothing.
2017-05-03 20:34:53 +09:00
06e014708a Defer virtual method to load(). 2017-05-03 15:57:15 +09:00
8825277656 Merge branch 'master' into custom-drawings-flags 2017-05-03 09:36:51 +09:00
a036b059e8 Use provided parameters to avoid a second lookup. 2017-05-02 21:40:06 +09:00
691742b828 Remove most options which have not yet been implemented. 2017-05-02 19:40:30 +09:00
f9de733128 Formatting. 2017-05-02 18:53:33 +09:00
d4045ee2c0 We only have one release stream, so let's unlock it. 2017-05-02 18:40:30 +09:00
57c2dd1f49 Fix options dropdown labels never being displayed. 2017-05-02 18:35:23 +09:00
8e88d86639 Fix naming confusion. 2017-05-02 18:00:37 +09:00
f1f7a26dbd Fix incorrect inheritance. 2017-05-02 17:58:59 +09:00
a993790a66 Ensure all searchable terms are non-null non-empty. 2017-05-02 17:54:07 +09:00
1b0f353af3 Add support for framework-level mouse confining. 2017-05-02 17:45:42 +09:00
bef15fe637 Improve organisation of some options and config code. 2017-05-02 17:45:22 +09:00
9ca8295149 Oops. 2017-05-02 17:09:16 +09:00
116e92a542 Remove silly platform specific logic. 2017-05-02 17:00:30 +09:00
40d2fee1dc Split up adding of local store from the ctor. 2017-05-02 16:55:04 +09:00
e2620e2840 Make Team not inherit Country. 2017-05-02 16:54:43 +09:00
46ae8bc86b Use value because we need to. 2017-05-02 16:49:27 +09:00
f1d0b77d10 Base the music controller transform direction on relative indices in playlist. 2017-05-02 16:40:29 +09:00
ee0a5409bb CI fixes. 2017-05-02 16:33:48 +09:00
beb98c14b6 Fix layout not being invalidated when re-filtering playlist display. 2017-05-02 16:26:11 +09:00
91e000fd44 Back to sanity. 2017-05-02 14:21:22 +09:00
f17046abaf Add ability to load Drawings flags from osu/Drawings/Flags. 2017-05-02 13:28:35 +09:00
e856abe59a Let's not use Country for drawings-specific stuff... 2017-05-02 13:02:14 +09:00
6074cb5979 Make playlist filtering work.
Also standardises searchable terms in beatmap metadata.
2017-05-02 10:45:55 +09:00
8caba36230 Merge branch 'master' into general-fixes 2017-05-02 09:50:35 +09:00
6ce0245c2b Typo 2017-05-01 19:34:08 -05:00
1b52445f86 Fix crash when selecting non-existent IDs from database 2017-05-01 19:31:46 -05:00
737ad78056 Set a sane default transform direction. 2017-05-01 20:10:19 +09:00
2437c416b1 Use less usings. 2017-05-01 19:56:01 +09:00
2e0eda6b15 Merge branch 'master' into playlist 2017-05-01 19:44:57 +09:00
3943e4ae95 Fix comma. 2017-05-01 19:32:31 +09:00
c59589eba7 Only retrieve colour once. 2017-05-01 19:32:00 +09:00
0f4ef16910 Remove custom word splitting logic, add localisation support. 2017-05-01 17:14:59 +09:00
d00d4cce35 Merge branch 'master' into autoreplay-refactor-squashed 2017-05-01 16:53:46 +09:00
2cfb83436d Add placeholder logic for filtering. 2017-05-01 15:27:41 +09:00
a1f341a64f Fix textbox focus issues (and inability to use escape). 2017-05-01 15:23:01 +09:00
c1d0aea217 Refactoring part 5. 2017-05-01 15:09:14 +09:00
580cf93147 Refactoring part 4. 2017-05-01 15:03:11 +09:00
f2b0602f90 Double check if the selectedpanel is not the provided as argument 2017-05-01 00:13:00 -05:00
97a7f16ab7 Refactoring part 3. 2017-05-01 13:41:22 +09:00