1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-16 21:02:55 +08:00
Commit Graph

3468 Commits

Author SHA1 Message Date
Salman Ahmed
744e651a37
Merge branch 'master' into applicable-to-hud 2019-07-02 05:24:56 +03:00
Salman Ahmed
72e5cbb07f Add checkbox for hiding health bar 2019-07-02 01:45:09 +03:00
Dean Herbert
e6c1b059bc Disable dimming main content 2019-07-01 18:49:36 +09:00
Dean Herbert
5d94c67c76 Merge remote-tracking branch 'upstream/master' into selector-hiding 2019-07-01 18:49:18 +09:00
Dean Herbert
3902da9135 Merge remote-tracking branch 'upstream/master' into abstract-menu 2019-06-28 18:13:44 +09:00
Dean Herbert
6d0cc1f770 Remove GC debug setting 2019-06-28 15:59:19 +09:00
smoogipoo
23df1a5d42 Merge remote-tracking branch 'HollyHacker/master' into abstract-menu 2019-06-28 13:42:56 +09:00
Dean Herbert
4952fb3716
Merge branch 'master' into fix-toolbar-bar 2019-06-27 19:58:13 +09:00
Dan Balasescu
2ee4fde5f0
Merge branch 'master' into fix-settings-subpanel-dim 2019-06-27 18:30:36 +09:00
smoogipoo
f6f547a91b Fix ruleset selector line not moving on first display 2019-06-27 18:25:38 +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
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
768d6c2fb3 ModelInfo -> Model 2019-06-27 00:29:09 +09:00
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
David Zhao
4510c868f4 Remove selector toggling logic for now 2019-06-26 19:39:47 +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
David Zhao
e92c1ca009 Fix styling, private tabClosed, remove type check 2019-06-26 19:25:54 +09:00
smoogipoo
6ce86e6083 General refactoring 2019-06-26 17:52:25 +09:00
David Zhao
a1a0a9ee6b
Merge branch 'master' into selector-hiding 2019-06-26 17:45:05 +09:00
Dean Herbert
2707a7179e Fix MusiController holding references to beatmaps while inactive 2019-06-26 13:18:03 +09:00
David Zhao
6c8cc9728f fix channel selector not being closed 2019-06-26 12:00:58 +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
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
naoey
9d88295ece
Merge remote-tracking branch 'upstream/master' into generic-download-model-manager 2019-06-25 18:27:16 +05:30
Andrei Zavatski
bae0258d8d Merge remote-tracking branch 'refs/remotes/ppy/master' into toolbar-rulesets-refactor 2019-06-25 14:16:05 +03:00
Dan Balasescu
47974ca854
Merge branch 'master' into beatmap-overlay-load 2019-06-25 19:05:17 +09:00
Dean Herbert
ba2f22be47 Improve loading state of BeatmapSet header 2019-06-25 14:47:29 +09:00
smoogipoo
fb94cd43a4 Remove unnecessary local item storage in SettingsDropdown 2019-06-25 12:00:05 +09:00
Dean Herbert
cc1e67dc6c
Merge branch 'master' into fix-avatar-display-update-2 2019-06-25 10:18:46 +09:00