1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-12 06:07:28 +08:00
Commit Graph

43233 Commits

Author SHA1 Message Date
Bartłomiej Dach
cf69c356ae
Merge pull request #14205 from smoogipoo/fix-legacy-slider-alpha
Fix incorrect legacy skin slider body alpha
2021-08-10 20:18:45 +02:00
Bartłomiej Dach
89c9fb4320
Merge branch 'master' into fix-legacy-slider-alpha 2021-08-10 19:59:33 +02:00
Bartłomiej Dach
9b01b4b5cb
Merge pull request #14207 from peppy/update-framework-resources
Update framework and resources
2021-08-10 17:01:12 +02:00
Dean Herbert
58db6b758d Update resources 2021-08-10 18:47:39 +09:00
Dean Herbert
60302e3daa Update framework 2021-08-10 18:46:20 +09:00
Dean Herbert
a503274e1d Pass through MultiplayerRoomUsers instead of ints to avoid re-retrieval 2021-08-10 18:39:20 +09:00
Dan Balasescu
b8748a86c5
Merge pull request #14204 from peppy/fix-null-ref-online-tracking-component
Fix potential null reference in online status resolution in multiplayer match
2021-08-10 18:36:13 +09:00
Dan Balasescu
a8df5360fd
Merge pull request #14145 from ekrctb/fix-dho-state-overwrite
Fix DHO state overwritten at `LoadComplete` if it is already changed
2021-08-10 18:30:05 +09:00
Dan Balasescu
33d4d635f2
Merge branch 'master' into fix-dho-state-overwrite 2021-08-10 17:55:18 +09:00
Dan Balasescu
79c2eedbd3
Merge pull request #14197 from peppy/add-playlist-item-download-progress
Add simple download progress display to download buttons on playlist items
2021-08-10 17:55:04 +09:00
Dean Herbert
53d03745e0 Remove unused test scene 2021-08-10 17:48:47 +09:00
Dan Balasescu
9cda5235a0
Merge branch 'master' into fix-dho-state-overwrite 2021-08-10 17:40:36 +09:00
smoogipoo
f86ef54e93 Fix incorrect legacy slider body alpha 2021-08-10 17:38:51 +09:00
Dean Herbert
b121d95400 Avoid potential null reference exception in OnlinePlayBeatmapAvailabilityTracker 2021-08-10 17:37:24 +09:00
Dean Herbert
d9b5f235d8 Add xmldoc explaining thread safety limitations of IModelManager "events" 2021-08-10 17:36:59 +09:00
Dan Balasescu
91c3396b24
Merge branch 'master' into add-playlist-item-download-progress 2021-08-10 17:25:27 +09:00
smoogipoo
e0e0d5deb0 Remove unused using 2021-08-10 17:25:10 +09:00
Dan Balasescu
06b65ce522
Merge pull request #14200 from peppy/fix-unexpected-ruleset-change
Fix ruleset unexpectedly changing when creating a room
2021-08-10 17:11:50 +09:00
Gagah Pangeran Rosfatiputra
595763ae34
add test case for supporter and non supporter 2021-08-10 14:58:11 +07:00
Gagah Pangeran Rosfatiputra
93408c636b
hide supporter promo section for supporter 2021-08-10 14:56:54 +07:00
Gagah Pangeran Rosfatiputra
3fb2ca4f4a
add border bottom 2021-08-10 14:55:57 +07:00
Dean Herbert
2b9168157d Fix CurrentMatchPlayingItem not being reset on leaving a multiplayer room 2021-08-10 16:53:03 +09:00
ekrctb
c63dfa21e1 Always initialize DHO transforms on LoadComplete
With the previous commit, the transform application is skipped when the state is already changed. But it turns out the previous commit breaks slider animation in the standard editor. This is probably due to the transforms are applied before nested hit objects are added.
2021-08-10 16:34:38 +09:00
Dean Herbert
5ea7909eea Fix incorrectly failing test 2021-08-10 16:23:53 +09:00
Gagah Pangeran Rosfatiputra
f7a02219b8
fix font size description 2021-08-10 14:23:15 +07:00
Gagah Pangeran Rosfatiputra
b3fbf52571
add pippi and heart texture 2021-08-10 14:07:20 +07:00
Gagah Pangeran Rosfatiputra
49de8ce1df
fix up some layouting 2021-08-10 13:53:06 +07:00
Gagah Pangeran Rosfatiputra
7c8df57109
add description text 2021-08-10 13:21:23 +07:00
Dean Herbert
3aa72163f2 Add simple download progress display to download buttons on playlist items 2021-08-10 15:14:43 +09:00
Gagah Pangeran Rosfatiputra
a2b4f05ebe
add border radius and shadow 2021-08-10 12:11:21 +07:00
Gagah Pangeran Rosfatiputra
bdf6c2a5ed
add changelog supporter promo test scene 2021-08-10 12:00:26 +07:00
Gagah Pangeran Rosfatiputra
0b41731d0b
initial changelog supporter promo section 2021-08-10 11:43:11 +07:00
Dean Herbert
498daef998
Merge branch 'master' into multiplayer-team-vs-leaderboard 2021-08-10 13:09:15 +09:00
Dan Balasescu
6da977f99a
Merge pull request #14178 from peppy/simplify-player-users-test-usage
Simplify method of marking players as playing in test scenes
2021-08-10 12:49:38 +09:00
Dan Balasescu
478a7c15be
Merge pull request #14172 from TheOmyNomy/fix-legacy-slider-body-colour-interpolation
Fix legacy slider body colour interpolation
2021-08-10 11:16:42 +09:00
TheOmyNomy
c5b490c441 Use non linear colour interpolation for legacy health display 2021-08-10 11:29:31 +10:00
TheOmyNomy
76e5a40b8e Remove unnecessary "in" keyword 2021-08-09 20:53:02 +10:00
Dean Herbert
58714dbe71 Fix ordering of teams to match colours 2021-08-09 19:48:53 +09:00
Dean Herbert
490f9e1848 Fix overlap in spectator view 2021-08-09 19:45:16 +09:00
Dean Herbert
fe7c1d0181 Merge branch 'simplify-player-users-test-usage' into multiplayer-team-vs-leaderboard 2021-08-09 19:24:35 +09:00
Dean Herbert
ea6e441dec Simplify method of marking players as playing in test scenes 2021-08-09 19:21:22 +09:00
Dean Herbert
551929cf5a Simplify method of marking players as playing in test scenes 2021-08-09 19:18:13 +09:00
Dean Herbert
5f3d087101 Also add team score display to multiplayer spectator screen 2021-08-09 19:17:51 +09:00
Dean Herbert
121648b593 Add gameplay-specific team score display which can expand and contract 2021-08-09 19:17:51 +09:00
TheOmyNomy
24accdcab0 Add LegacyUtils class with non linear colour interpolation method 2021-08-09 18:56:47 +10:00
TheOmyNomy
3686c657d2
Merge branch 'master' into fix-legacy-slider-body-colour-interpolation 2021-08-09 18:48:03 +10:00
Dean Herbert
359b6ec174
Merge pull request #14176 from peppy/update-framework
Update framework
2021-08-09 17:34:30 +09:00
Dean Herbert
ebbf6467e8 Support more than two teams 2021-08-09 17:23:02 +09:00
Dean Herbert
cdc173e867 Add tracking of team totals to leaderboard implementation 2021-08-09 17:08:32 +09:00
Dean Herbert
77c9aadd05 Add team colour support to multiplaye gameplay leaderboard panels 2021-08-09 17:06:25 +09:00