1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-29 19:47:24 +08:00
Commit Graph

13906 Commits

Author SHA1 Message Date
Andrei Zavatski
6867b3c232 Update resources 2019-09-13 10:56:21 +03:00
Andrei Zavatski
cb98b07e33 Merge master with conflicts resolved 2019-09-13 10:45:01 +03:00
Dean Herbert
ffd205f470 Merge remote-tracking branch 'upstream/master' into pr/EVAST9919/6076 2019-09-13 16:25:30 +09:00
Dean Herbert
78e7be919f Remove unnecessary container 2019-09-13 16:25:25 +09:00
Dean Herbert
c4f9be5913
Merge pull request #6093 from smoogipoo:fix-player-restart
Fix player not correctly restarting after an unpause
2019-09-13 16:09:41 +09:00
Dean Herbert
7818ecd71c Forward ValueChangedEvent instead 2019-09-13 16:03:44 +09:00
Dean Herbert
a05ae2c1b2 Merge remote-tracking branch 'upstream/master' into pr/EVAST9919/6082 2019-09-13 15:53:11 +09:00
smoogipoo
cf2f841b4d Fix player not correctly exiting after an unpause 2019-09-13 15:42:58 +09:00
Dean Herbert
c66e963705 Make constructor private 2019-09-13 15:42:36 +09:00
Dean Herbert
dc8c7a5041 Add null check for safety 2019-09-13 15:27:42 +09:00
Dean Herbert
44947aa9ed Make PopupDialog abstract 2019-09-13 15:27:29 +09:00
Dean Herbert
e2e87d5268
Merge branch 'master' into properly-fix-dialog-double-samples 2019-09-13 14:53:29 +09:00
Andrei Zavatski
5a72083c13 Merge remote-tracking branch 'refs/remotes/ppy/master' into rankings-title 2019-09-13 08:32:06 +03:00
Dean Herbert
43d7615734 Merge remote-tracking branch 'upstream/master' into rankings-scope-selector 2019-09-13 14:07:39 +09:00
Dean Herbert
0e679fb468 Use colour constant rather than opacity helper function 2019-09-13 14:06:19 +09:00
Dean Herbert
b917f29cfe Make GradientLineTabControl abstract 2019-09-13 13:59:06 +09:00
Dean Herbert
3b82c6db49
Merge branch 'master' into leaderboard-mod-icons-spacing 2019-09-13 13:27:18 +09:00
Joehu
2a8fa2f593 Refactor modsContainer on profile scores 2019-09-12 14:01:12 -07:00
Andrei Zavatski
99fc13b4d8 Update usage of the DismissableFlag 2019-09-12 19:34:58 +03:00
Andrei Zavatski
0142fcd07a Merge remote-tracking branch 'refs/remotes/ppy/master' into rankings-title 2019-09-12 19:29:05 +03:00
Andrei Zavatski
b17d097a39 Simplify colour usage in GradientLine 2019-09-12 17:17:57 +03:00
Andrei Zavatski
4dd819c150 Merge remote-tracking branch 'refs/remotes/ppy/master' into rankings-scope-selector 2019-09-12 17:17:32 +03:00
Andrei Zavatski
cafb5105bc Rename HeaderFlag to DismissableFlag 2019-09-12 16:44:15 +03:00
Dean Herbert
2cb084666b
Merge branch 'master' into rankings-scope-selector 2019-09-12 22:37:14 +09:00
Dean Herbert
5f77236c01
Merge branch 'master' into closable-flag 2019-09-12 22:27:34 +09:00
Andrei Zavatski
acdd26422d Implement Spotlights logic 2019-09-12 06:36:17 +03:00
Andrei Zavatski
0c6c8fdcd0 Implement RankingsHeader component 2019-09-12 05:53:18 +03:00
Andrei Zavatski
b657e31f93 Merge dependent changes 2019-09-12 05:26:10 +03:00
Andrei Zavatski
4bfb681db6 CI fixes 2019-09-12 05:16:56 +03:00
Andrei Zavatski
581508b8e7 Implement RankingsRulesetSelector 2019-09-12 05:06:51 +03:00
Andrei Zavatski
c3c2efe35c Add ability to override text in PageTabItem 2019-09-12 05:03:59 +03:00
Joehu
77ac186cf8 Add spacing to mod icons on leaderboards 2019-09-11 16:08:01 -07:00
Joehu
e0bf579b18 Properly fix dialog overlay playing double samples on show/hide 2019-09-11 15:35:47 -07:00
Andrei Zavatski
dbfbd1262f Implement HeaderTitle component for RankingsOverlay 2019-09-11 23:39:22 +03:00
Andrei Zavatski
eee1cad760 Merge remote-tracking branch 'refs/remotes/origin/closable-flag' into rankings-title 2019-09-11 23:01:38 +03:00
Andrei Zavatski
d6132f5e60 Merge remote-tracking branch 'refs/remotes/origin/rankings-scope-selector' into rankings-title 2019-09-11 23:00:47 +03:00
Dean Herbert
55a071e8ba Use BindValueChanged 2019-09-11 19:12:55 +09:00
Dean Herbert
be66c0e912 Fix potential of toggle between load and LoadComplete 2019-09-11 19:06:31 +09:00
Dean Herbert
039b5ec958 Update framework 2019-09-11 18:47:25 +09:00
Andrei Zavatski
41ad44791b Move RankingsScopeSelector to another namespace 2019-09-11 11:58:18 +03:00
Andrei Zavatski
f6de286868 Merge remote-tracking branch 'refs/remotes/ppy/master' into rankings-scope-selector 2019-09-11 11:53:45 +03:00
Andrei Zavatski
660c678cdc Remove unused using directives 2019-09-11 11:40:51 +03:00
Dean Herbert
2c09efa23b Handle changes to OverlayActivationMode 2019-09-11 17:34:28 +09:00
Dean Herbert
825a34ecd3 Early return to avoid other potential fail cases 2019-09-11 17:34:03 +09:00
Andrei Zavatski
1d1da1bc13 Visual improvements 2019-09-11 11:26:09 +03:00
Dean Herbert
f53410a42a Merge remote-tracking branch 'upstream/master' into re-order-events 2019-09-11 16:48:44 +09:00
Andrei Zavatski
95828b07ef Implement HeaderFlag component for rankings overlay 2019-09-11 10:40:58 +03:00
Dean Herbert
6760e239a1 Fix osu! hitcircle font textures being incorrectly sized 2019-09-11 13:39:21 +09:00
Andrei Zavatski
6c2db8e4b0 Merge remote-tracking branch 'refs/remotes/ppy/master' into rankings-scope-selector 2019-09-10 16:33:08 +03:00
Dean Herbert
c27eed0195
Centralise and share bar line generation code between rulesets (#6054)
Centralise and share bar line generation code between rulesets
2019-09-10 19:31:29 +09:00