1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-22 20:47:25 +08:00
Commit Graph

12445 Commits

Author SHA1 Message Date
Dean Herbert
0bad86f6d9 Merge remote-tracking branch 'upstream/master' into async-beatmap-load 2019-06-27 13:58:59 +09:00
Dean Herbert
8b0aaccfe6 Add finaliser to WorkingBeatmap 2019-06-27 13:56:36 +09:00
Dean Herbert
9edd98efdc Move disposal to end of class 2019-06-27 00:29:38 +09:00
Dean Herbert
768d6c2fb3 ModelInfo -> Model 2019-06-27 00:29:09 +09:00
naoey
8efc504817
Post merge fixes 2019-06-26 18:22:37 +05:30
naoey
f3a84de7b5
Merge remote-tracking branch 'upstream/master' into generic-download-tracking-composite 2019-06-26 18:17:53 +05:30
Dean Herbert
c34f6180e6
Merge branch 'master' into generic-download-model-manager 2019-06-26 20:37:56 +09:00
Dean Herbert
da65658bc3 Fix comments 2019-06-26 20:07:01 +09:00
Dean Herbert
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
Dan Balasescu
f06aabad5f
Merge branch 'master' into toolbar-rulesets-refactor 2019-06-26 18:33:45 +09:00
smoogipoo
6ce86e6083 General refactoring 2019-06-26 17:52:25 +09:00
smoogipoo
cb65fc6317 Don't throw exception for non-existent files 2019-06-26 17:23:12 +09:00
smoogipoo
15b140b2ee Shortcut checking for whether directories are files 2019-06-26 17:10:22 +09:00
Dean Herbert
2707a7179e Fix MusiController holding references to beatmaps while inactive 2019-06-26 13:18:03 +09:00
Dean Herbert
1eda4e0dd4 Merge remote-tracking branch 'upstream/master' into generic-download-model-manager 2019-06-26 12:21:04 +09:00
Dean Herbert
9e1cb90dd8 Remove existing argument for ItemAdded event
For all usages, it looks like this was unnecessary.
2019-06-26 11:40:41 +09:00
Dan Balasescu
6063e7a69f
Merge branch 'master' into one-hit-screen 2019-06-26 11:34:54 +09:00
Dean Herbert
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
naoey
c476e46a8e
Remove unnecessary private methods and inline used-once code 2019-06-25 21:16:30 +05:30
Dean Herbert
40cf573368 Fix pause not correctly showing pause screen 2019-06-25 23:15:58 +09:00
Dean Herbert
983cabdb98 Disallow back button on disclaimer screen 2019-06-25 22:27:50 +09:00
naoey
6f5fbd7ea1
Remove unnecessary try-catch block 2019-06-25 18:28:59 +05:30
naoey
9d88295ece
Merge remote-tracking branch 'upstream/master' into generic-download-model-manager 2019-06-25 18:27:16 +05:30
Dean Herbert
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
Dean Herbert
f9dad0f640 Merge remote-tracking branch 'upstream/master' into gamewide-backbutton 2019-06-25 20:23:49 +09:00
Dean Herbert
f51be4c4fe Adjust transitions a tad 2019-06-25 20:23:34 +09:00
Andrei Zavatski
bae0258d8d Merge remote-tracking branch 'refs/remotes/ppy/master' into toolbar-rulesets-refactor 2019-06-25 14:16:05 +03:00
Dean Herbert
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
Dean Herbert
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
Dan Balasescu
7794fab7c9
Merge branch 'master' into reduce-dropdown-chevron-size 2019-06-25 19:58:37 +09:00
Dan Balasescu
0f31d17129
Merge branch 'master' into reduce-background-brightness 2019-06-25 19:45:15 +09:00
Dean Herbert
a3de369c20 Reduce size of dropdown chevron 2019-06-25 19:32:00 +09:00
Dean Herbert
8c02709d74
Merge branch 'master' into fix-dropdown-styling 2019-06-25 19:28:37 +09:00
Dean Herbert
445660d066
Merge pull request #5148 from peppy/update-framework
Update framework
2019-06-25 19:28:17 +09:00
Dan Balasescu
c6965a40dc
Merge branch 'master' into reduce-background-brightness 2019-06-25 19:18:28 +09:00
Dan Balasescu
47974ca854
Merge branch 'master' into beatmap-overlay-load 2019-06-25 19:05:17 +09:00
Dan Balasescu
ffcd3529a6
Merge branch 'master' into cancel-api-callback 2019-06-25 18:43:33 +09:00
smoogipoo
aa81c95f30 Remove unnecessary extra property 2019-06-25 18:38:14 +09:00
Dean Herbert
fe290ead63 Update framework 2019-06-25 18:38:11 +09:00
smoogipoo
5b294ba419 Adjust backbutton animation 2019-06-25 18:33:35 +09:00
smoogipoo
531b107a98 Exit match before exiting multiplayer 2019-06-25 18:33:26 +09:00
smoogipoo
1a26608ba9 Close mod select before exiting song selection 2019-06-25 18:33:21 +09:00
smoogipoo
d9927204f8 Relieve OsuScreen of back button input duties 2019-06-25 18:33:18 +09:00
smoogipoo
f53d2fbe76 Scale backbutton along with screens 2019-06-25 18:33:13 +09:00
smoogipoo
8c96e4c1fa Move back button to OsuGame 2019-06-25 18:33:08 +09:00
Dean Herbert
7bc7df2249 Reduce background brightness at PlayerLoader 2019-06-25 17:22:10 +09:00
Dean Herbert
93b6d5b7e3 Fix keybindings being offset 2019-06-25 17:16:19 +09:00
Dean Herbert
ba2f22be47 Improve loading state of BeatmapSet header 2019-06-25 14:47:29 +09:00
Dean Herbert
90acc9b6ca Avoid calling api request callback after user cancel 2019-06-25 13:52:43 +09:00
smoogipoo
fb94cd43a4 Remove unnecessary local item storage in SettingsDropdown 2019-06-25 12:00:05 +09:00