1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-22 18:07:24 +08:00
Commit Graph

27314 Commits

Author SHA1 Message Date
Dean Herbert
3f067e3a8d Remove likely unnecessary score null check 2021-08-11 16:59:42 +09:00
Dean Herbert
d1dfb785d8
Merge branch 'master' into context-menu-sounds 2021-08-11 16:21:13 +09:00
Dean Herbert
f8683e2256 Update framework 2021-08-11 16:17:21 +09:00
Gagah Pangeran Rosfatiputra
fb7ed08bab
move text creation to load method 2021-08-11 12:49:22 +07:00
Dean Herbert
ee3b373e8a Correctly handle tied scores 2021-08-11 14:48:37 +09:00
Dean Herbert
cf82bca09c Change logic to only handle the case of exactly two teams 2021-08-11 14:44:13 +09:00
Gagah Pangeran Rosfatiputra
6d763ca3c7
Merge branch 'master' into changelog-supporter 2021-08-11 10:47:51 +07:00
Dean Herbert
a3a9d0579f Adjust checkbox / sliderbar animation speeds to match sound effects better 2021-08-11 12:33:14 +09:00
Dan Balasescu
56b23fc765
Merge branch 'master' into context-menu-sounds 2021-08-11 11:46:10 +09:00
Bartłomiej Dach
4268e4d750
Fix nested menus layering close samples if multiple menu levels are closed 2021-08-10 20:40:53 +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
33d4d635f2
Merge branch 'master' into fix-dho-state-overwrite 2021-08-10 17:55:18 +09:00
Dan Balasescu
9cda5235a0
Merge branch 'master' into fix-dho-state-overwrite 2021-08-10 17:40:36 +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
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
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
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
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
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
Dean Herbert
e1d4eee1d2 Add the ability to set custom overriding colours on GameplayLeaderboardScores 2021-08-09 17:06:21 +09:00
Dean Herbert
1e5d9003d3 Add the ability for tests to alter the room and user states which during testing 2021-08-09 16:58:36 +09:00
Dean Herbert
1f69c61fd8 Update framework 2021-08-09 16:38:21 +09:00
Dean Herbert
0fa1f085df Store MultiplayerRoomUser as part of tracked data 2021-08-09 16:31:18 +09:00
Dean Herbert
fcec714b4f Add safeties to avoid MultiplayerPlayer crashing when beatmap can't be loaded 2021-08-09 16:31:18 +09:00
Dean Herbert
aa4c6b9341 Bring across tournament score display for game usage 2021-08-09 16:30:37 +09:00
Dean Herbert
e08b1223ab Move team colours to OsuColour 2021-08-09 16:30:37 +09:00
Dean Herbert
f4739d0118 Remove MaskingSmoothness to avoid making sheered container blurry 2021-08-09 16:28:43 +09:00
Dean Herbert
0b76460043 Merge branch 'master' into lounge-redesign 2021-08-09 16:28:28 +09:00
Dean Herbert
a12f6b78a4 Split status retrieval into its own method 2021-08-09 16:21:12 +09:00
Dean Herbert
7cb743a734 Move font sizing to base class 2021-08-09 16:17:51 +09:00
Dean Herbert
db270a79ab Update resources 2021-08-08 03:54:20 +09:00
Dean Herbert
404a4234cb Merge branch 'master' into more-missing-sounds 2021-08-08 03:49:17 +09:00
Bartłomiej Dach
ff1730f9f8
Do not play open/close samples for top-level menus 2021-08-07 14:38:54 +02:00
Dean Herbert
2f187cb90f Update framework 2021-08-07 01:17:58 +09:00
Jamie Taylor
52400961f6
Add open/close sounds to context menus 2021-08-06 23:47:02 +09:00
Jamie Taylor
5031b19b42
Add sounds to multiplayer games list 2021-08-06 23:39:42 +09:00
Jamie Taylor
3f06ecdd48
Add open/close sounds to menus 2021-08-06 21:01:34 +09:00
Jamie Taylor
f1ea830828
Re-add on-click feedback to MonthSection and OsuDropdown headers 2021-08-06 20:58:07 +09:00
ekrctb
f262f288fc Fix DHO state is overwritten to Idle on LoadComplete
The state may already be changed before `LoadComplete` is called because DHO is already added to the draw hierarchy.
2021-08-06 19:58:46 +09:00
Dan Balasescu
8f014650df
Merge branch 'master' into toggle-multiplayer-leaderboard-with-hud 2021-08-06 19:36:19 +09:00
Dean Herbert
724edcbecd Toggle the expanded state of the multiplayer leaderboard with the user's HUD
Resolves https://github.com/ppy/osu/discussions/14140.

---

Until now, the multiplayer leaderboard would expand during break time.
Now, it respects the user's HUD visibility status (which can be toggled
using Shift+Tab).
2021-08-06 19:23:44 +09:00
smoogipoo
c680012523 Buffer the entire star rating range to fix overlapping alpha 2021-08-06 19:06:16 +09:00
smoogipoo
19ed24a06f Remove unnecessary duplicate background 2021-08-06 18:59:19 +09:00
Dean Herbert
b401dc0b2e Remove playlist button 2021-08-06 18:58:50 +09:00
Dean Herbert
8dc167ac9a Set default MultiplayerRoomSettings type to something that isn't playlists 2021-08-06 18:56:01 +09:00
smoogipoo
9019e0947a Remove unused using 2021-08-06 18:54:02 +09:00
smoogipoo
798b16fc24 Remove unused params 2021-08-06 18:52:46 +09:00
smoogipoo
bdfdd00afe Adjust spacings and sizings of left-side details 2021-08-06 18:52:01 +09:00
Dean Herbert
6164903fec
Merge branch 'master' into new-difficulty-colours 2021-08-06 18:05:53 +09:00
Dean Herbert
7d670c6d35 Fix gap in fill colour 2021-08-06 18:05:24 +09:00
smoogipoo
74bffeac5e Minor design adustments (paddings/sizing) 2021-08-06 17:03:44 +09:00
smoogipoo
c4a4f2a77a Merge branch 'master' into lounge-redesign 2021-08-06 16:51:01 +09:00
smoogipoo
0ea982c036 Update recent participants list to use participant_count 2021-08-05 22:49:41 +09:00
smoogipoo
fd6d488657 Add thousands separator to rank range pill 2021-08-05 21:40:09 +09:00
smoogipoo
c74e620ce9 Add constant for background colour 2021-08-05 21:39:51 +09:00
smoogipoo
87fd1eaf06 Explain negative padding 2021-08-05 21:19:23 +09:00
smoogipoo
438f0ce702 Increase default number of avatars 2021-08-05 21:18:30 +09:00
smoogipoo
2f2e3d7366 Use higher res background image 2021-08-05 21:01:21 +09:00
smoogipoo
b8ec1cb984 Hide star rating max display for equal difficulties 2021-08-05 21:00:28 +09:00
smoogipoo
bd394d9377 Fix pluralisation 2021-08-05 20:56:23 +09:00
smoogipoo
5521f38cfb Adjust spacing 2021-08-05 20:56:09 +09:00
Andrei Zavatski
e13a82ed63 Fix colour picker antialiasing 2021-08-05 14:07:35 +03:00
smoogipoo
0246e6f850 Merge branch 'master' into lounge-redesign 2021-08-05 19:55:15 +09:00
Dean Herbert
e6cd05ea93 Update framework 2021-08-05 19:06:05 +09:00
Dean Herbert
1476b3b22a Merge branch 'master' into bassmix 2021-08-05 17:33:21 +09:00
Dean Herbert
27ff428491 Revert "Temporary changes to compile with latest framework"
This reverts commit 34c671f712.
2021-08-05 17:33:19 +09:00
Dan Balasescu
0211521a97
Merge branch 'master' into multiplayer-create-with-enter 2021-08-05 17:07:03 +09:00
Dan Balasescu
5811dff853
Merge pull request #14120 from peppy/multiplayer-team-vs-team-selection
Add ability to choose Team Versus match type and view / switch teams
2021-08-05 17:02:14 +09:00
smoogipoo
94aa5fbca7 Fix doubled json property (runtime error) 2021-08-05 16:31:34 +09:00
Dean Herbert
2b973b9831 Redirect beatmap selection to intentionally click the button directly 2021-08-05 14:21:51 +09:00
Dean Herbert
bf720f7e06 Ensure operations are not performed during loading 2021-08-05 14:14:07 +09:00
Dean Herbert
22bd6c7556 Move keyboard progress flow handling to MatchSettingsOverlay 2021-08-05 14:06:58 +09:00
Dean Herbert
fd54487186 Add safety against pushing to non-current screen 2021-08-05 14:06:58 +09:00
Dean Herbert
2ccf7e75b0 Fix new possible nullref inspection due to delegate initialisation in constructor 2021-08-05 13:24:59 +09:00