Dan Balasescu
92599aa02b
Merge branch 'master' into user-beatmap-downloading-states-2
2021-02-09 21:06:09 +09:00
Dean Herbert
0a96f4d403
Avoid assigning null to a non-nullable property
2021-02-09 18:56:27 +09:00
Dean Herbert
17475e60b0
Fix missed test scene update
2021-02-09 18:48:50 +09:00
Dean Herbert
3206c7cbae
Merge branch 'master' into overlay-header-refactor
2021-02-09 18:20:07 +09:00
Dean Herbert
b87327841d
Add test covering initial state propagation
2021-02-09 15:46:23 +09:00
Dean Herbert
5fbed05d04
Merge pull request #11551 from smoogipoo/fix-leave-room-race-2
...
Fix client potentially not leaving a room on exiting multiplayer
2021-02-08 19:23:14 +09:00
smoogipoo
6e34e7d750
Merge branch 'master' into user-beatmap-downloading-states-2
2021-02-08 19:08:53 +09:00
Dean Herbert
10142a4471
Disable failing test temporarily pending resolution
2021-02-08 16:59:21 +09:00
Vincent Maggioli
96652e07cd
Merge branch 'master' into zero-spinner-slider
2021-02-05 09:40:55 -05:00
Dean Herbert
f338fa114b
Merge branch 'master' into user-beatmap-downloading-states-2
2021-02-05 18:02:40 +09:00
Dean Herbert
3e750feaa4
Subclass LocalPlayerModSelectOverlay to correctly deselect incompatible mods on free mod selection
2021-02-05 16:42:35 +09:00
Dean Herbert
1368d55152
Add test coverage of precedence of display
2021-02-05 15:58:27 +09:00
Dean Herbert
98c4573240
Add assertions covering new test
2021-02-05 15:52:49 +09:00
Dean Herbert
9e9e382bee
Merge branch 'master' into user-beatmap-downloading-states-2
2021-02-05 15:27:17 +09:00
Dean Herbert
2fc3a97f56
Merge pull request #11516 from frenzibyte/ready-button-clean-up
...
Replace ready button beatmap logic with using `MultiplayerBeatmapTracker` instead
2021-02-05 15:09:25 +09:00
Dean Herbert
9258836f10
Merge pull request #11641 from smoogipoo/freemods
...
Add support for optional per-user mods in multiplayer (aka freemod)
2021-02-05 13:59:30 +09:00
Salman Ahmed
78ea2d50bb
Merge branch 'master' into ready-button-clean-up
2021-02-05 07:23:11 +03:00
smoogipoo
8004c19a80
Remove ModValidationTest
2021-02-05 12:40:42 +09:00
Dan Balasescu
a71d6a4c97
Merge branch 'master' into multiplayer-beatmap-tracker
2021-02-05 12:25:36 +09:00
smoogipoo
a2fdba3e51
Rename to OnlinePlayBeatmapAvailabilityTracker
2021-02-05 12:24:38 +09:00
smoogipoo
cf5233c6ab
Merge branch 'master' into freemods
2021-02-05 00:27:14 +09:00
Dean Herbert
4730cf02d0
Merge pull request #11666 from smoogipoo/freemod-select-overlay
...
Implement the freemod selection overlay
2021-02-05 00:25:43 +09:00
Dan Balasescu
e374aebc5f
Merge branch 'master' into fix-mod-settings-serlisation-signalr50
2021-02-04 22:27:54 +09:00
Dean Herbert
cef16a9f61
Add test coverage of animation / selection flushing
2021-02-04 19:55:15 +09:00
Dean Herbert
15062cc63f
Fix intermittent test failures
2021-02-04 19:29:48 +09:00
Bartłomiej Dach
cb87da2bb8
Merge branch 'master' into freemod-select-overlay
2021-02-03 22:19:35 +01:00
Dean Herbert
b06f4ee124
Merge branch 'master' into solo-mod-select-overlay
2021-02-03 23:44:08 +09:00
Dean Herbert
17072a5dda
Merge pull request #11664 from smoogipoo/modselect-dynamic-isvalid
...
Make it possible to change IsValidMod in mod selection
2021-02-03 23:43:36 +09:00
Dan Balasescu
75801097ea
Merge pull request #11632 from bdach/ongoing-tracker-fix-more
...
Fix ongoing operation tracker double-returning internal lease after screen exit
2021-02-03 23:17:53 +09:00
Dean Herbert
2a52851e68
Merge branch 'master' into modselect-dynamic-isvalid
2021-02-03 22:11:33 +09:00
Dean Herbert
77735ac9dc
Merge pull request #11663 from smoogipoo/modselect-disable-stacking
...
Allow mod buttons to not be stacked
2021-02-03 22:11:02 +09:00
Dean Herbert
b27557f278
Merge pull request #11667 from smoogipoo/fix-mod-icon
...
Fix ModIcon not updating background colour correctly
2021-02-03 22:06:29 +09:00
Dan Balasescu
f24a6178bc
Merge branch 'master' into ongoing-tracker-fix-more
2021-02-03 21:00:45 +09:00
Dean Herbert
c8f1126bd7
Add failing test
2021-02-03 19:44:39 +09:00
smoogipoo
8bb1391515
Fix inspection
2021-02-03 14:53:55 +09:00
Dan Balasescu
2a4488c11b
Merge branch 'master' into freemods
2021-02-03 14:12:39 +09:00
Bartłomiej Dach
fe7f4f7222
Merge branch 'master' into playlists-item-visual-improvements
2021-02-02 21:26:16 +01:00
Salman Ahmed
8e96ffd1e6
Fix "wait for import" until step potentially finishing early
...
If not obvious, the issue with previous code is that it was checking for `IsAvailableLocally`, while the import is happening on a different thread, so that method could return `true` before the importing has finished and `ItemUpdated` event is called.
2021-02-02 16:54:41 +03:00
smoogipoo
6453367a9c
Merge branch 'freemod-select-overlay' into freemods
2021-02-02 21:43:35 +09:00
Dean Herbert
b76116d943
Merge branch 'master' into modselect-disable-stacking
2021-02-02 21:41:33 +09:00
smoogipoo
097ce37e96
Merge branch 'fix-mod-icon' into freemods
2021-02-02 21:37:24 +09:00
smoogipoo
921f008217
Fix ModIcon not updating background colour correctly
2021-02-02 21:35:08 +09:00
smoogipoo
643c0605d8
Implement the freemod selection overlay
2021-02-02 21:14:38 +09:00
smoogipoo
e58ece9e10
Make ModSelectOverlay abstract
2021-02-02 21:06:04 +09:00
smoogipoo
50e92bd0ed
Fix selection not being preserved when IsValidMod changes
2021-02-02 20:50:54 +09:00
smoogipoo
10ceddf3ff
Make IsValidMod adjustable
2021-02-02 20:47:50 +09:00
smoogipoo
6d620264f4
Allow mod buttons to not be stacked
2021-02-02 20:27:41 +09:00
Dean Herbert
ac5662b1aa
Merge branch 'master' into mod-consistency-function
2021-02-02 20:01:42 +09:00
Dean Herbert
4ecbe058f7
Merge pull request #11640 from smoogipoo/add-mod-utils
...
Add ModUtils class for validating mod usages
2021-02-02 20:01:20 +09:00
Dean Herbert
8e70a50af0
Remove unused using statement
2021-02-02 19:22:13 +09:00