JohnCorby e1b7f5ffd4 Merge branch 'dev' into mirror ... # Conflicts: # QSB/ConversationSync/Messages/DialogueConditionMessage.cs # QSB/Player/Messages/EnterLeaveMessage.cs # QSB/QSB.csproj # QSB/SaveSync/Messages/GameStateMessage.cs # QSBTests/MessageTests.cs		2022-01-14 14:14:40 -08:00
..
Messages	Merge branch 'dev' into mirror	2022-01-14 14:14:40 -08:00
Patches
TransformSync	OnAddPlayer and OnRemovePlayer use PlayerInfo instead of PlayerId	2022-01-11 23:12:04 -08:00
EnterLeaveType.cs	mask zone	2022-01-12 21:43:57 -08:00
GamePlatform.cs	cleanup enums	2022-01-11 20:08:38 -08:00
KickReason.cs	refuse connection when past observatory	2021-12-30 16:05:02 +00:00
PlayerEntanglementWatcher.cs	make getting world object from id or unity object an extension method (and rename)	2021-12-25 22:45:25 -08:00
PlayerHUDMarker.cs
PlayerInfo.cs	hide players who launch in shuttle	2022-01-13 16:38:34 +00:00
PlayerMapMarker.cs
PlayerSyncObject.cs	tweak	2022-01-07 15:23:46 -08:00
QSBPlayerManager.cs	OnAddPlayer and OnRemovePlayer use PlayerInfo instead of PlayerId	2022-01-11 23:12:04 -08:00