Commit Graph

12476 Commits

Author SHA1 Message Date
cc9a7839c9 Fix layout regression 2019-06-27 12:04:01 +09:00
d6da21b0f0 Tidy up fetch methods
Anonymise some test data further
2019-06-27 12:00:31 +09:00
375a6f406d Merge remote-tracking branch 'upstream/master' into not-available-to-download 2019-06-27 11:44:41 +09:00
322d92d3e0 Rename class to BeatmapAvailability 2019-06-27 11:40:22 +09:00
9ada4d68b1 Make fields protected and expose them in tests 2019-06-26 22:42:34 +03:00
9edd98efdc Move disposal to end of class 2019-06-27 00:29:38 +09:00
768d6c2fb3 ModelInfo -> Model 2019-06-27 00:29:09 +09:00
8efc504817 Post merge fixes 2019-06-26 18:22:37 +05:30
f3a84de7b5 Merge remote-tracking branch 'upstream/master' into generic-download-tracking-composite 2019-06-26 18:17:53 +05:30
c34f6180e6 Merge branch 'master' into generic-download-model-manager 2019-06-26 20:37:56 +09:00
da65658bc3 Fix comments 2019-06-26 20:07:01 +09:00
6812eccdd1 Fix MusicController holding references to beatmaps while inacti… (#5158)
Fix MusicController holding references to beatmaps while inactive
2019-06-26 19:30:16 +09:00
f06aabad5f Merge branch 'master' into toolbar-rulesets-refactor 2019-06-26 18:33:45 +09:00
6ce86e6083 General refactoring 2019-06-26 17:52:25 +09:00
cb65fc6317 Don't throw exception for non-existent files 2019-06-26 17:23:12 +09:00
15b140b2ee Shortcut checking for whether directories are files 2019-06-26 17:10:22 +09:00
2707a7179e Fix MusiController holding references to beatmaps while inactive 2019-06-26 13:18:03 +09:00
1eda4e0dd4 Merge remote-tracking branch 'upstream/master' into generic-download-model-manager 2019-06-26 12:21:04 +09:00
9e1cb90dd8 Remove existing argument for ItemAdded event
For all usages, it looks like this was unnecessary.
2019-06-26 11:40:41 +09:00
6063e7a69f Merge branch 'master' into one-hit-screen 2019-06-26 11:34:54 +09:00
eaf6f6891d Rename to DownloadButtonsContainer 2019-06-26 05:22:08 +03:00
f4e765cf99 Merge branch 'master' into not-available-to-download 2019-06-26 05:13:58 +03:00
446fbce81c Add base class for startup screens
Avoids missing adding changes to screens like Disclaimer, which may not be shown in debug builds.
2019-06-26 01:36:17 +09:00
c476e46a8e Remove unnecessary private methods and inline used-once code 2019-06-25 21:16:30 +05:30
40cf573368 Fix pause not correctly showing pause screen 2019-06-25 23:15:58 +09:00
983cabdb98 Disallow back button on disclaimer screen 2019-06-25 22:27:50 +09:00
6f5fbd7ea1 Remove unnecessary try-catch block 2019-06-25 18:28:59 +05:30
9d88295ece Merge remote-tracking branch 'upstream/master' into generic-download-model-manager 2019-06-25 18:27:16 +05:30
7d5554c2ac Re-use the back button game-wide (#5149)
Re-use the back button game-wide

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-06-25 20:50:28 +09:00
f9dad0f640 Merge remote-tracking branch 'upstream/master' into gamewide-backbutton 2019-06-25 20:23:49 +09:00
f51be4c4fe Adjust transitions a tad 2019-06-25 20:23:34 +09:00
bae0258d8d Merge remote-tracking branch 'refs/remotes/ppy/master' into toolbar-rulesets-refactor 2019-06-25 14:16:05 +03:00
75b78d5e27 Reduce size of dropdown chevron (#5150)
Reduce size of dropdown chevron

Co-authored-by: Dan Balasescu <1329837+smoogipoo@users.noreply.github.com>
2019-06-25 20:05:52 +09:00
28cfccbd64 Use OsuScrollContainer for osu menus (#5094)
Use OsuScrollContainer for osu menus

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-06-25 20:05:09 +09:00
7794fab7c9 Merge branch 'master' into reduce-dropdown-chevron-size 2019-06-25 19:58:37 +09:00
0f31d17129 Merge branch 'master' into reduce-background-brightness 2019-06-25 19:45:15 +09:00
a3de369c20 Reduce size of dropdown chevron 2019-06-25 19:32:00 +09:00
8c02709d74 Merge branch 'master' into fix-dropdown-styling 2019-06-25 19:28:37 +09:00
445660d066 Merge pull request #5148 from peppy/update-framework
Update framework
2019-06-25 19:28:17 +09:00
c6965a40dc Merge branch 'master' into reduce-background-brightness 2019-06-25 19:18:28 +09:00
47974ca854 Merge branch 'master' into beatmap-overlay-load 2019-06-25 19:05:17 +09:00
ffcd3529a6 Merge branch 'master' into cancel-api-callback 2019-06-25 18:43:33 +09:00
aa81c95f30 Remove unnecessary extra property 2019-06-25 18:38:14 +09:00
fe290ead63 Update framework 2019-06-25 18:38:11 +09:00
5b294ba419 Adjust backbutton animation 2019-06-25 18:33:35 +09:00
531b107a98 Exit match before exiting multiplayer 2019-06-25 18:33:26 +09:00
1a26608ba9 Close mod select before exiting song selection 2019-06-25 18:33:21 +09:00
d9927204f8 Relieve OsuScreen of back button input duties 2019-06-25 18:33:18 +09:00
f53d2fbe76 Scale backbutton along with screens 2019-06-25 18:33:13 +09:00
8c96e4c1fa Move back button to OsuGame 2019-06-25 18:33:08 +09:00