Commit Graph

2780 Commits

Author SHA1 Message Date
9aaac4ab0c Merge branch 'new-option-search' of github.com:Jorolf/osu into new-option-search 2017-05-08 18:30:33 +02:00
86f0173c6b fix license header 2017-05-08 18:30:00 +02:00
3abf1b2a0b Merge branch 'master' into new-option-search 2017-05-08 17:25:47 +02:00
9f1f926634 Add non-null assurance. 2017-05-08 12:45:55 +09:00
a38e95c607 Merge branch 'master' into master 2017-05-08 11:59:01 +09:00
48368779ab Avoid polluting Player with HUD-specific code. 2017-05-08 11:48:40 +09:00
10910cfcef Make field readonly. 2017-05-08 11:47:06 +09:00
2f4fad9d41 Refactor colour selection. 2017-05-08 11:33:22 +09:00
df4a737c9b Merge remote-tracking branch 'ppy/master' into hud-mod-display 2017-05-08 10:56:34 +09:00
5131371c93 Merge branch 'master' into new-option-search 2017-05-08 10:49:49 +09:00
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
3c4faae554 add search box and the ability to search 2017-05-07 20:35:57 +02:00
ef02f80881 Merge branch 'option-item-refactor' of git://github.com/peppy/osu into new-option-search 2017-05-06 17:55:28 +02: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
5aecc3d761 Made cursortrail work with multiple positions 2017-05-05 17:44:51 +02:00
4b385ded26 Tidy up ModIcon. 2017-05-05 13:22:10 +09:00
44f06e5423 Add hover expand support. 2017-05-05 13:17:36 +09:00
9c4f813da1 Remove unnecessary hide/show logic.
Also change the way the overlay appears when actually playing.
2017-05-05 13:14:44 +09:00
b547dd6893 CI Fixes. 2017-05-05 13:06:54 +09:00
c9ba1ac4f6 Adjust namespaces.
Also adds transition, uses IHasCurrentValue, combines Mod TestCases and more.
2017-05-05 13:00:05 +09:00
6298b3effd Refactor ModSection and ModIcon to avoid null mods. 2017-05-05 12:16:41 +09:00
95f6c999bd Adjust scale and CI fixes 2017-05-04 17:59:01 +03:00
66c858030a Merge remote-tracking branch 'refs/remotes/ppy/master' into mods_refactor 2017-05-04 17:35:41 +03:00
98b3b82c07 Apply CI fixes. 2017-05-04 23:32:27 +09:00
475eb6fe5f Cleanup 2017-05-04 17:29:52 +03:00
153951d3dd Add OptionItem class
Allow for centalised logic for all option UI controls.
2017-05-04 23:07:48 +09:00
57c4232416 Added testcase 2017-05-04 11:58:37 +03:00
efa60ee287 Merge branch 'master' into mania-stage 2017-05-04 16:58:16 +09:00
063b606a12 Fix readonly warning 2017-05-03 18:48:17 +02:00
008ff9d2f9 InputResample CursorTrail 2017-05-03 18:33:42 +02:00
6063231e40 float value fix 2017-05-03 16:58:10 +03:00
26985dbc62 Merge remote-tracking branch 'refs/remotes/ppy/master' into mods_refactor 2017-05-03 16:22:40 +03: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
5f2f1d2763 CI fixes 2017-05-03 14:01:43 +03:00
9e35eb8d97 Fixes 2017-05-03 13:53:45 +03:00
06e014708a Defer virtual method to load(). 2017-05-03 15:57:15 +09:00
e7a8619f01 ModIcon refactor 2017-05-03 09:48:10 +03:00
898d9495ff line fix 2017-05-03 08:27:47 +03:00
f49cc124ed Merge remote-tracking branch 'refs/remotes/ppy/master' into mods_refactor 2017-05-03 08:26:54 +03:00
6ea3629c9a Adjust the size 2017-05-03 08:23:52 +03:00
8825277656 Merge branch 'master' into custom-drawings-flags 2017-05-03 09:36:51 +09:00
2e30a69b67 removed using 2017-05-02 23:04:36 +03:00
a955f9cbfd Simplify hiding logic 2017-05-02 22:59:36 +03:00
37c3133981 Fixes 2017-05-02 22:46:18 +03:00
7e1efcc20b Added ModsContainer 2017-05-02 22:34:07 +03:00
00a8dbbacf Added ModType for each mode 2017-05-02 21:36:55 +03:00