1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-14 01:07:42 +08:00
Commit Graph

12510 Commits

Author SHA1 Message Date
Dan Balasescu
2ee4fde5f0
Merge branch 'master' into fix-settings-subpanel-dim 2019-06-27 18:30:36 +09:00
Dean Herbert
98ba38d421
Merge branch 'master' into user_profile_modes 2019-06-27 15:34:21 +09:00
Dean Herbert
d6c28dc6d7 Simplify and fix state management 2019-06-27 15:31:47 +09:00
Dean Herbert
25499f74a7 Remove redundant font set 2019-06-27 15:31:36 +09:00
smoogipoo
b397652af4 Remove ability to set arbitrary accent colours 2019-06-27 15:02:26 +09:00
smoogipoo
7f5587d894 RulesetTabItem -> ProfileRulesetTabItem 2019-06-27 14:54:31 +09:00
smoogipoo
803198ff20 Gamemode -> Ruleset 2019-06-27 14:53:18 +09:00
smoogipoo
9e2e393ab7 DownloadAllowed -> DownloadEnabled 2019-06-27 13:38:21 +09:00
smoogipoo
c1277b5db2 Test the download button directly for safety 2019-06-27 13:35:14 +09:00
Dean Herbert
f3aab143aa Fix settings subpanels dimming main content 2019-06-27 13:16:16 +09:00
Dean Herbert
3294464bc6 Fix typo in variable 2019-06-27 12:47:05 +09:00
Dean Herbert
a5ccfeb18e Remove unnecessary fill flow 2019-06-27 12:34:22 +09:00
Dean Herbert
be901294f7 Simplify text layout 2019-06-27 12:33:14 +09:00
Dean Herbert
cd6f452bfa Remove weird download button exposure 2019-06-27 12:22:38 +09:00
Dean Herbert
c49b8b1883 Remove accidental change 2019-06-27 12:19:49 +09:00
Dean Herbert
a4929f19e5 Adjust background colour of non-loaded beatmap set cover to play better with black foreground elements 2019-06-27 12:17:28 +09:00
Dean Herbert
32c3bee71b Avoid public exposure 2019-06-27 12:11:04 +09:00
Dean Herbert
cc9a7839c9 Fix layout regression 2019-06-27 12:04:01 +09:00
Dean Herbert
d6da21b0f0 Tidy up fetch methods
Anonymise some test data further
2019-06-27 12:00:31 +09:00
Dean Herbert
375a6f406d Merge remote-tracking branch 'upstream/master' into not-available-to-download 2019-06-27 11:44:41 +09:00
Dean Herbert
322d92d3e0 Rename class to BeatmapAvailability 2019-06-27 11:40:22 +09:00
iiSaLMaN
9ada4d68b1 Make fields protected and expose them in tests 2019-06-26 22:42:34 +03:00
Andrei Zavatski
2e49b4ffcd Update the component with an abstract RulesetSelector class 2019-06-26 18:56:40 +03:00
Andrei Zavatski
e9f3a1ba63 Merge remote-tracking branch 'refs/remotes/ppy/master' into user_profile_modes 2019-06-26 18:31:36 +03: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
Salman Ahmed
eaf6f6891d
Rename to DownloadButtonsContainer 2019-06-26 05:22:08 +03:00
Salman Ahmed
f4e765cf99
Merge branch 'master' into not-available-to-download 2019-06-26 05:13:58 +03: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