Dan Balasescu
60e988aac3
Merge branch 'master' into multiplayer-kick-support
2021-08-12 11:46:56 +09:00
smoogipoo
543482111b
Remove outdated todo
2021-08-12 10:40:14 +09:00
smoogipoo
c160e50f4f
Merge branch 'master' into multiplayer-team-vs-leaderboard
2021-08-12 10:27:31 +09:00
Dan Balasescu
369794501b
Merge branch 'master' into update-framework
2021-08-11 18:11:36 +09:00
Dean Herbert
d6352637d6
Also add tooltip and context menu item
2021-08-11 17:45:34 +09:00
Dean Herbert
bb51ebd0ef
Don't show button on self
2021-08-11 17:42:46 +09:00
Dean Herbert
7aab8c32ec
Add kick button and hook up logic
2021-08-11 17:31:54 +09:00
Dean Herbert
e8ad0fba75
Add required server methods for kicking users
2021-08-11 17:20:41 +09:00
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
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
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
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
3aa72163f2
Add simple download progress display to download buttons on playlist items
2021-08-10 15:14:43 +09: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
