264 Commits

Author SHA1 Message Date
JohnCorby
07caf6129b Merge branch 'dev' into orb-overhaul
# Conflicts:
#	QSB/SectorSync/QSBSectorManager.cs
#	QSB/Syncs/Sectored/BaseSectoredSync.cs
2021-12-18 12:46:38 -08:00
Mister_Nebula
82d5e1ee91 aaa 2021-12-18 10:33:18 +00:00
JohnCorby
83e6d26f44 revert sector sync, since there's a bug in dev 2021-12-17 21:34:43 -08:00
JohnCorby
d3f926439a use setslot instead of setslotted 2021-12-17 16:53:27 -08:00
JohnCorby
4741c976a9 Merge branch 'dev' into orb-overhaul
# Conflicts:
#	QSB/Syncs/SyncBase.cs
2021-12-16 21:30:03 -08:00
JohnCorby
6a54f7bacb apparently the SectorDetector body and the actual body are not the same 2021-12-15 03:17:45 -08:00
JohnCorby
142315b21b bruh 2021-12-15 02:30:43 -08:00
JohnCorby
66bbf16aee okay well it works but its also wacky for some reason??? 2021-12-15 02:25:13 -08:00
JohnCorby
e6f472ff5a lets take a step back for a second 2021-12-15 01:20:51 -08:00
JohnCorby
9c2ddef242 add qsborb 2021-12-14 20:24:02 -08:00
Mister_Nebula
fdf88e0cb3 add sound sync 2021-12-14 22:53:53 +00:00
JohnCorby
533bf00ecb stop letting NomaiOrbTransformSync.Instances have null values 2021-12-13 23:20:13 -08:00
JohnCorby
7b5ab3a2eb the 2021-12-13 22:49:27 -08:00
JohnCorby
8210793f56 more edge case 2021-12-13 22:16:32 -08:00
JohnCorby
b5f12796af make syncbase generic 2021-12-13 13:05:49 -08:00
Mister_Nebula
767d2d0318 Update PlayerEntanglementWatcher.cs 2021-12-12 10:49:21 +00:00
JohnCorby
65042e6a74 Merge branch 'dev' into addplayer 2021-12-12 02:18:42 -08:00
JohnCorby
dd6b9f19e3 remove error that can't happen 2021-12-11 22:53:42 -08:00
JohnCorby
3e8dee7c59 remove warning. it's okay 2021-12-11 22:53:42 -08:00
JohnCorby
7ad0c5ae15 player creation as separate method 2021-12-11 22:53:42 -08:00
JohnCorby
8c4004fc58 use ObjectId instead 2021-12-11 21:57:23 -08:00
JohnCorby
6a81808bc0 Merge branch 'dev' into worldobject-init 2021-12-11 18:15:12 -08:00
JohnCorby
0988dc8f45 Merge branch 'dev' into tornadoes
# Conflicts:
#	QSB/Events/EventNames.cs
2021-12-11 16:16:40 -08:00
Mister_Nebula
1aa99df228 fix ready event lol 2021-12-12 00:00:24 +00:00
JohnCorby
cbc495f9ba use new(), make IWorldObjectTypeSubset derive IWorldObject, add constraints 2021-12-11 15:09:45 -08:00
Mister_Nebula
d9e250d191 help 2021-12-11 20:06:02 +00:00
Mister_Nebula
accef60619 add _waitingForEvent 2021-12-11 11:47:21 +00:00
Mister_Nebula
72938b4c7c removed logs 2021-12-11 11:47:07 +00:00
Mister_Nebula
7c1f9ac3a6 me me stupid 2021-12-11 10:50:17 +00:00
Mister_Nebula
916056c605 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 2021-12-10 22:13:39 +00:00
Mister_Nebula
f502e4ee73 dont update objects from states if player is not ready 2021-12-10 21:12:27 +00:00
Mister_Nebula
e163a2a69f some error catchers 2021-12-10 14:54:51 +00:00
Mister_Nebula
cffe6856a8 Merge branch 'dev' into new-save-sync 2021-12-07 15:47:30 +00:00
Mister_Nebula
4a7cc859fb add dlc install check 2021-12-07 13:35:03 +00:00
JohnCorby
4978ece2ff go back to using transform syncs. it just gets too desynced without it 2021-12-06 03:09:23 -08:00
JohnCorby
1fa41d30fd Merge branch 'dev' into tornadoes 2021-12-06 01:59:24 -08:00
JohnCorby
ccb25dc7f4 move ForIdOverride to QSBEventManager 2021-12-06 01:57:56 -08:00
JohnCorby
b4dde8dc22 Merge branch 'dev' into tornadoes 2021-12-06 01:53:32 -08:00
JohnCorby
8ae21ede3d finally block so ForIdOverride is returned to normal 2021-12-06 01:44:24 -08:00
JohnCorby
4db0df8527 log-o remove-o 2021-12-06 01:44:23 -08:00
JohnCorby
940d01f81b buh 2021-12-06 01:44:04 -08:00
JohnCorby
36547dfe58 fix ForIdOverride 2021-12-06 01:44:04 -08:00
JohnCorby
ed14c30f9e with request resync, server should only send requesting client the info, rather than sending it to everyone 2021-12-06 01:44:03 -08:00
JohnCorby
4b4c142e20 goofs 2021-12-06 01:44:02 -08:00
JohnCorby
fbb88b5775 body resyncing 2021-12-05 21:30:04 -08:00
JohnCorby
543e2d57d5 form state for real 2021-12-05 20:13:05 -08:00
Mister_Nebula
a9fc152ff8 replace RequireWorldObjectsReady with property 2021-12-05 11:03:09 +00:00
Mister_Nebula
88084bb24d add RequireWorldObjectsReady check to all events 2021-12-04 16:39:37 +00:00
_nebula
4b3b8cd4a1
Merge pull request #394 from misternebula/eventnames-nameof
use nameof in EventNames
2021-12-04 16:19:57 +00:00
Mister_Nebula
0bd60ddb68 rename variables, fix QSBOWItem (again) 2021-12-04 09:51:27 +00:00