1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 03:22:55 +08:00
Commit Graph

27455 Commits

Author SHA1 Message Date
Dean Herbert
b27bb4aeae Merge branch 'master' into results-middle-content 2020-03-17 21:37:23 +09:00
Dean Herbert
cb3069461c
Merge pull request #8309 from smoogipoo/results-top-content
Implement the top score panel contents
2020-03-17 21:35:59 +09:00
Dean Herbert
75695938e2
Merge branch 'master' into results-top-content 2020-03-17 20:42:02 +09:00
Dean Herbert
18a98c8e73
Merge pull request #8308 from smoogipoo/results-scorepanel
Implement the results screen score panel
2020-03-17 20:41:46 +09:00
Dean Herbert
3b9c64b76f
Merge branch 'master' into results-scorepanel 2020-03-17 20:06:11 +09:00
Dean Herbert
af092966e4
Merge pull request #8302 from peppy/start-match-on-gameplay
Automatically mark the currently selected match as started on entering gameplay screen
2020-03-17 20:04:56 +09:00
Dean Herbert
7213b987b8
Merge pull request #8306 from peppy/update-framework
Update framework
2020-03-17 20:04:27 +09:00
Dean Herbert
01fd52e9d8
Merge branch 'master' into update-framework 2020-03-17 19:23:42 +09:00
Dean Herbert
8396fcfd35
Merge pull request #8304 from smoogipoo/results-circle
Implement a circle that displays the user's accuracy
2020-03-17 18:59:40 +09:00
Dean Herbert
7a6a7c28c1
Merge pull request #8305 from smoogipoo/fix-score-population
Fix replay scores not being populated via player
2020-03-17 18:59:20 +09:00
Dean Herbert
370ff70dd4 Fix incorrect host name specification 2020-03-17 18:32:30 +09:00
Dan Balasescu
c6e4bf35de
Merge branch 'master' into start-match-on-gameplay 2020-03-17 18:21:55 +09:00
Dan Balasescu
38dcf01caa
Merge pull request #8301 from peppy/fix-header-text-scaling
Fix header-text scaling on intro/winner screens
2020-03-17 18:21:44 +09:00
Dean Herbert
df119eb95a Adjust animations 2020-03-17 18:04:38 +09:00
Dean Herbert
f06c170d63 Display SS badge earlier (when entering virtual ss area) 2020-03-17 18:04:15 +09:00
smoogipoo
6f569d1485 Fix colour conflicts for expert-plus 2020-03-17 18:01:46 +09:00
smoogipoo
3628814e4e Merge branch 'fix-score-population' into results-screen 2020-03-17 17:48:39 +09:00
smoogipoo
86a336d585 Add back retry overlay 2020-03-17 17:45:25 +09:00
smoogipoo
1c4296f5e7 Implement the new results screen 2020-03-17 17:43:16 +09:00
smoogipoo
afed01d781 Merge branch 'results-middle-content' into results-screen 2020-03-17 17:35:40 +09:00
smoogipoo
946746f5f5 Merge branch 'results-top-content' into results-screen 2020-03-17 17:35:34 +09:00
smoogipoo
6f801e1695 Add xmldoc 2020-03-17 17:35:14 +09:00
smoogipoo
2ee480f1d8 Add xmldocs / cleanup 2020-03-17 17:34:16 +09:00
smoogipoo
1521f25c96 Implement middle panel contents 2020-03-17 17:25:24 +09:00
smoogipoo
3792d3645f Merge branch 'add-back-black-font' into results-middle-content 2020-03-17 17:18:41 +09:00
Dean Herbert
630757e080
Merge pull request #8307 from smoogipoo/add-back-black-font
Add black font weighting
2020-03-17 17:18:35 +09:00
smoogipoo
e56d0f2eea Add black font weighting 2020-03-17 17:16:10 +09:00
smoogipoo
19106daf8b Merge branch 'results-circle' into results-middle-content 2020-03-17 17:09:15 +09:00
smoogipoo
7cc1a6040f Implement top panel contents 2020-03-17 17:01:38 +09:00
smoogipoo
05789e6fe4 Implement the score panel 2020-03-17 16:59:34 +09:00
Dean Herbert
d322c8c2d7 Update framework 2020-03-17 16:47:23 +09:00
smoogipoo
daa5e63d0d Fix replay scores not being populated via player 2020-03-17 16:42:55 +09:00
smoogipoo
dca2e1d816 Implement the accuracy circle 2020-03-17 16:37:56 +09:00
smoogipoo
e586249db7 Expose GetRankName from DrawableRank 2020-03-17 16:25:51 +09:00
smoogipoo
d77b0acd90 Move rank colour to OsuColour 2020-03-17 16:25:41 +09:00
smoogipoo
9e7c388202 Expose Spacing and UseFullGlyphHeight 2020-03-17 16:24:49 +09:00
Dean Herbert
99f28efc96 Automatically mark the currently selected match as stsrated on entering gameplay screen 2020-03-17 13:16:52 +09:00
Dean Herbert
8895d52d29 Fix header-text scaling on intro/winner screens 2020-03-17 13:16:18 +09:00
Dean Herbert
5e3668b2ea
Merge pull request #8260 from smoogipoo/add-workingbeatmap-timeout
Add beatmap loading timeout to prevent runaway loading scenarios
2020-03-17 11:17:35 +09:00
Dean Herbert
07fbca8e91
Merge pull request #8300 from Joehuu/limit-font-weight-to-bold
Limit Torus font weight to bold
2020-03-17 10:32:55 +09:00
Joehu
f7ea20a926 Limit font weight to bold 2020-03-16 16:32:25 -07:00
TheWildTree
4153f8d49d Fix edge case making test fail
Forgot that if a PM channel was the last tab, it hid itself upon selecting due to changing its width, which made the last-visible-selected assert fail. Made this particular test only use non-PM channels.
2020-03-16 21:31:22 +01:00
TheWildTree
0f40671e69 Mix normal channel tabs with PM ones 2020-03-16 19:44:03 +01:00
TheWildTree
50c2e65e3c Improve TestSceneChatOverlay 2020-03-16 19:10:42 +01:00
Dean Herbert
10eccbcf3b
Merge pull request #8291 from ItsMestro/patch-1
Use new logo name for showcase screen
2020-03-16 21:51:02 +09:00
Marcus "Mestro" Nordgren
24fe7538fd
Use new logo name for showcase screen 2020-03-16 13:09:15 +01:00
Dan Balasescu
7be5ef4737
Merge pull request #8132 from EVAST9919/user-cards-update
Update user panel design
2020-03-16 14:53:57 +09:00
Dan Balasescu
0245bab7c6
Merge branch 'master' into user-cards-update 2020-03-16 14:27:21 +09:00
smoogipoo
58fc947be3 Privatise some setters 2020-03-16 14:06:42 +09:00
Dan Balasescu
e835f88c0c
Merge pull request #8255 from peppy/fix-carousel-scroll-while-import
Fix carousel scrolling being inoperable during beatmap import
2020-03-16 12:50:45 +09:00