1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-24 15:27:36 +08:00
Commit Graph

31050 Commits

Author SHA1 Message Date
smoogipoo
3c3756e42d Merge branch 'master' into expand-number-piece-on-old-skins 2020-08-07 16:36:58 +09:00
smoogipoo
bce3f3952f Split out variable declaration 2020-08-07 16:36:40 +09:00
Dean Herbert
bb6e05404b
Merge pull request #9794 from peppy/update-framework
Update framework
2020-08-06 22:27:48 +09:00
Dean Herbert
c84452cfbf Update usages 2020-08-06 21:53:20 +09:00
Dean Herbert
f994bf2888 Update framework 2020-08-06 21:34:48 +09:00
Dean Herbert
c68fb92d00
Merge pull request #9791 from Joehuu/toolbar-keybinding-tooltips 2020-08-06 19:12:58 +09:00
Dean Herbert
9685df0eca Only update key binding on next usage to avoid large blocking calls 2020-08-06 18:24:20 +09:00
Joehu
f9c369b23c Fix toolbar music button tooltip overflowing off-screen 2020-08-06 01:20:03 -07:00
Joehu
d574cac702 Add keybinding to toolbar button's tooltip 2020-08-06 01:18:45 -07:00
Joehu
7bcb68ffac Handle overlay toggling with toolbar buttons instead 2020-08-06 01:17:24 -07:00
Joehu
ad959ce523 Make toolbar button abstract 2020-08-06 01:06:51 -07:00
Dan Balasescu
bba23dc928
Merge pull request #9780 from peppy/add-toolbar-tooltips
Add missing toolbar tooltips for right-hand icons
2020-08-06 13:45:01 +09:00
Dan Balasescu
6f5fbbe141
Merge pull request #9779 from peppy/fix-super-short-spinners
Fix very short spinners being impossible to complete
2020-08-06 13:43:42 +09:00
Dean Herbert
3b15a50f0d Fix unnecessary + character 2020-08-06 12:34:42 +09:00
Dean Herbert
d5324be07d Fix malformed testcase 2020-08-06 12:33:40 +09:00
Dean Herbert
e3f314349a
Don't use title case
Co-authored-by: Joseph Madamba <madamba.joehu@outlook.com>
2020-08-06 12:27:30 +09:00
Salman Ahmed
9465e7abe1 Rename sprites container to "circleSprites" 2020-08-05 23:45:00 +03:00
Salman Ahmed
43161697f8 Fix wrong english 2020-08-05 23:42:05 +03:00
Salman Ahmed
1ab6110c05 Apply fade out to the number piece with quarter the pieces duration 2020-08-05 20:07:26 +03:00
Salman Ahmed
84f6b7608c Remove misleading ExpandNumberPiece lookup 2020-08-05 20:05:53 +03:00
Dean Herbert
c0cfd136dd
Merge pull request #9759 from EVAST9919/news-fix
Fix NewsOverlay running request on startup
2020-08-05 20:24:17 +09:00
Dean Herbert
bf1bb32674 Add missing toolbar tooltips for right-hand icons 2020-08-05 19:09:55 +09:00
Dean Herbert
3916d98e52 Add comment for clarity 2020-08-05 18:50:37 +09:00
Dean Herbert
8644d04a84 Merge branch 'master' into news-fix 2020-08-05 18:50:35 +09:00
Dean Herbert
bb73489ae5 Fix very short spinners being impossible to complete 2020-08-05 18:46:58 +09:00
Dean Herbert
93f8dddb20
Merge pull request #9778 from smoogipoo/spinner-behind-circles
Always place spinners behind hitcircles/sliders
2020-08-05 18:16:10 +09:00
smoogipoo
24bc9b33b1 Always place spinners behind hitcircles/sliders 2020-08-05 15:40:45 +09:00
Salman Ahmed
2771c95bec Merge remote-tracking branch 'upstream/master' into expand-number-piece-on-old-skins 2020-08-04 22:17:54 +03:00
Dan Balasescu
b582e9caa4
Merge pull request #9773 from peppy/update-framework
Update framework
2020-08-04 21:46:32 +09:00
Dean Herbert
d7e82efb67 Fix tests 2020-08-04 21:16:59 +09:00
Dean Herbert
22b52d63c7 Update framework 2020-08-04 20:51:59 +09:00
Dan Balasescu
ccc20a9341
Merge pull request #9765 from peppy/fix-match-forcing-playback
Fix multiplayer match select forcing playback even when user paused
2020-08-04 12:27:05 +09:00
Dean Herbert
4d6f60edaf Fix multiplayer match select forcing playback even when user paused 2020-08-03 22:43:50 +09:00
Dan Balasescu
8a9036938f
Merge pull request #9761 from peppy/fix-android-version-hash
Add fallback hash generation to fix android startup crash
2020-08-03 19:20:28 +09:00
Dan Balasescu
6d266b5a93
Merge pull request #9712 from frenzibyte/merge-global-to-legacy
Merge GlobalSkinConfiguration settings into the LegacySetting enum
2020-08-03 19:16:35 +09:00
Dean Herbert
f812767c95 Add fallback hash generation to fix android startup crash 2020-08-03 18:49:06 +09:00
Dan Balasescu
ea156d47e3
Merge pull request #9745 from EVAST9919/dashboard-beatmap-panel
Implement DashboardBeatmapListing component for use in Social Overlay
2020-08-03 16:22:49 +09:00
Andrei Zavatski
af320e4a61 Fix NewsOverlay running request on startup 2020-08-03 10:03:42 +03:00
Dan Balasescu
b448ca3efe
Merge branch 'master' into merge-global-to-legacy 2020-08-03 16:00:52 +09:00
Andrei Zavatski
630322ff85 Adjust font weights in line with web 2020-08-03 09:55:06 +03:00
Andrei Zavatski
057d6f03e5 Merge remote-tracking branch 'refs/remotes/ppy/master' into dashboard-beatmap-panel 2020-08-03 09:54:47 +03:00
Dan Balasescu
138afea431
Merge pull request #9459 from EVAST9919/news
News overlay implementaton
2020-08-03 15:51:27 +09:00
Dean Herbert
4189e918a3
Merge branch 'master' into news 2020-08-03 14:16:45 +09:00
Dean Herbert
eafe12aa02
Merge pull request #9747 from frenzibyte/dropdown-height-constraints 2020-08-03 13:42:26 +09:00
Dean Herbert
bde144fc63
Merge branch 'master' into dropdown-height-constraints 2020-08-03 12:51:54 +09:00
Andrei Zavatski
dc559093cd Rename namespace from Dashboard to Home 2020-08-02 21:47:09 +03:00
Andrei Zavatski
bddc61756a Rework padding 2020-08-02 21:44:34 +03:00
Andrei Zavatski
7d83cdbf1c Make title in DrawableBeatmapList a property 2020-08-02 21:35:24 +03:00
Andrei Zavatski
ca57c70961 Naming adjustments 2020-08-02 21:33:14 +03:00
Andrei Zavatski
2131164a60 Merge remote-tracking branch 'refs/remotes/ppy/master' into dashboard-beatmap-panel 2020-08-02 21:29:01 +03:00