1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-09 09:37:42 +08:00
Commit Graph

42895 Commits

Author SHA1 Message Date
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
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
Dean Herbert
e1d4eee1d2 Add the ability to set custom overriding colours on GameplayLeaderboardScores 2021-08-09 17:06:21 +09:00
Dean Herbert
ab522e1569 Add test coverage of team display on leaderboard 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
54ffb8dc4e Add basic multiplayer gameplay test coverage 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
aa6abb3e33
Merge pull request #14175 from Joehuu/replace-appveyor-badge
Update build status badge to github actions
2021-08-09 15:31:09 +09:00
Joseph Madamba
a552b659d3 Update build status badge to github actions 2021-08-08 19:36:27 -07:00
Dean Herbert
c8a0b6058f
Merge pull request #14147 from nekodex/more-missing-sounds
Misc hover/select sound usage updates
2021-08-08 04:14:04 +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
a9c99f149a
Merge pull request #14149 from peppy/update-framework
Update framework
2021-08-07 02:04:08 +09:00
Dean Herbert
2f187cb90f Update framework 2021-08-07 01:17:58 +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
Dan Balasescu
4620ba8787
Merge pull request #14144 from peppy/toggle-multiplayer-leaderboard-with-hud
Toggle the expanded state of the multiplayer leaderboard with the user's HUD
2021-08-06 20:13:55 +09:00
Dan Balasescu
8f014650df
Merge branch 'master' into toggle-multiplayer-leaderboard-with-hud 2021-08-06 19:36:19 +09:00
Dan Balasescu
468557b3a9
Merge pull request #14142 from peppy/playlists-mode-hide
Remove playlists type select button from multiplayer
2021-08-06 19:36:06 +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
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
Dean Herbert
cd0e9cc08b
Merge pull request #14119 from frenzibyte/new-difficulty-colours
Update star rating difficulty colours and add spectrum support
2021-08-06 18:26:56 +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
Dan Balasescu
acbdae3c4c
Merge pull request #14133 from EVAST9919/svs-fix
Fix colour picker antialiasing
2021-08-05 20:34:03 +09:00
Andrei Zavatski
e13a82ed63 Fix colour picker antialiasing 2021-08-05 14:07:35 +03:00
Dean Herbert
53be31bcd1
Merge pull request #14047 from smoogipoo/bassmix
Adjust with the framework-side AudioMixer changes
2021-08-05 19:39:41 +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
f0d11ebd89
Merge pull request #14117 from peppy/multiplayer-create-with-enter
Add the ability to create multiplayer games using only the keyboard
2021-08-05 17:27:04 +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