Commit Graph

1621 Commits

Author SHA1 Message Date
JohnCorby
4e4bad6885 we do a little reworking 2021-11-12 22:34:50 -08:00
JohnCorby
a2c2688dce Merge branch 'dev' into meteors 2021-11-12 20:35:39 -08:00
_nebula
459379d56b
Merge pull request #344 from misternebula/eye-fixes
Eye fixes
2021-11-12 21:06:31 +00:00
Mister_Nebula
d57db2f340 add eye server/client state support 2021-11-12 21:05:58 +00:00
JohnCorby
868290ac1b even more debug logging 2021-11-12 02:28:59 -08:00
JohnCorby
94e5405314 include flag and pool index when launching meteor 2021-11-12 02:24:43 -08:00
Mister_Nebula
92e255039c add some try catch blocks so we don't get stuck in an init-loop 2021-11-12 10:06:51 +00:00
JohnCorby
0949924f59 Merge branch 'dev' into meteors 2021-11-12 01:56:33 -08:00
JohnCorby
fbc4af5ce7 wtf 2021-11-12 01:55:43 -08:00
JohnCorby
ca9a4009c0 Merge remote-tracking branch 'origin/meteors' into meteors
# Conflicts:
#	QSB/MeteorSync/WorldObjects/QSBMeteor.cs
2021-11-12 01:54:31 -08:00
JohnCorby
c743b9da75 handle null hitObject in patch 2021-11-12 01:52:16 -08:00
_nebula
0264f0d5bc
Merge pull request #342 from misternebula/translator-sync
Sync translator scan beams
2021-11-11 23:23:39 +00:00
Mister_Nebula
ce4abdde2d turn off arrow emissions 2021-11-11 23:09:30 +00:00
Mister_Nebula
660475e4cc add material for translator screen 2021-11-11 20:32:28 +00:00
Mister_Nebula
383c0e2ae0 stop timesync on disconnect 2021-11-11 19:34:25 +00:00
Mister_Nebula
317dd6a22a add scan beams 2021-11-11 19:30:58 +00:00
JohnCorby
8b0d621201 disable collision from triggering impact code on clients 2021-11-11 02:42:57 -08:00
JohnCorby
51402612a1 disable collision from triggering impact code on clients 2021-11-11 02:17:12 -08:00
JohnCorby
5f5e04e29f rework - dont sync transform 2021-11-11 02:09:22 -08:00
JohnCorby
f1d45c9e8c use variable to denote when to impact, instead of enabling/disabling collision 2021-11-11 00:44:52 -08:00
JohnCorby
fdeaf8111a make impacting work 2021-11-10 23:57:04 -08:00
JohnCorby
15af7e1ce3 oops that bug also is on the angler fish lol 2021-11-10 23:30:30 -08:00
JohnCorby
a371c71415 dont process events if world objects arent ready yet lol 2021-11-10 21:59:32 -08:00
JohnCorby
495f814739 easier logging 2021-11-10 21:51:14 -08:00
JohnCorby
292d4ce5f5 more progress 2021-11-10 21:38:28 -08:00
JohnCorby
0c897ad3bd progress 2021-11-10 21:13:49 -08:00
JohnCorby
15eb5fa804 meteor transform sync 2021-11-10 19:02:04 -08:00
Mister_Nebula
0262e4f9c3 fix random mistake 2021-11-10 20:21:54 +00:00
Mister_Nebula
fda64810b8 Merge branch 'dev' into translator-sync 2021-11-10 20:20:28 +00:00
Will Corby
eaa7a735bf
Merge pull request #341 from misternebula/anglerfish
Anglerfish
2021-11-10 02:21:29 -08:00
JohnCorby
b351dd9109 deez nuts 2021-11-10 02:06:29 -08:00
JohnCorby
333f23d797 back to using custom SetVelocity 2021-11-10 02:03:21 -08:00
JohnCorby
57ba9e1d1b funny 2021-11-10 01:42:25 -08:00
JohnCorby
716e20fd7b Merge remote-tracking branch 'origin/anglerfish' into anglerfish 2021-11-10 01:38:50 -08:00
JohnCorby
7f96c20e2e target nothing after consume complete 2021-11-10 01:33:32 -08:00
Mister_Nebula
9f57454ae9 more cleanup 2021-11-10 09:28:05 +00:00
JohnCorby
2aa2a04473 Merge remote-tracking branch 'origin/anglerfish' into anglerfish 2021-11-10 01:20:33 -08:00
JohnCorby
71cba8cca3 new lines between methods 2021-11-10 01:20:16 -08:00
Mister_Nebula
781391651c cleanup anglers 2021-11-10 09:18:57 +00:00
Mister_Nebula
6366002cf4 Merge branch 'dev' into translator-sync 2021-11-10 09:12:14 +00:00
Mister_Nebula
0d3fd15585 add tools and stuffz 2021-11-10 09:12:05 +00:00
JohnCorby
b3f0a6ba30 oh heck, just call ChangeState 2021-11-10 00:48:29 -08:00
JohnCorby
ae4582043b manually trigger state change event for listeners 2021-11-09 22:53:34 -08:00
JohnCorby
27fe4d2786 oops 2021-11-09 22:40:01 -08:00
JohnCorby
cf03b5a884 replace all angler code to only use transform instead of rigidbody 2021-11-09 22:35:54 -08:00
JohnCorby
76eaaf2f9c sync target pos 2021-11-09 20:35:55 -08:00
JohnCorby
02f095c042 use change state for transfer authority instead 2021-11-09 19:09:12 -08:00
JohnCorby
41bbe2808e transfer authority on angler unsuspend 2021-11-09 18:43:06 -08:00
JohnCorby
c0e8bd95e4 angler transform sync 2021-11-09 17:56:45 -08:00
JohnCorby
03314fd4ad - implement UnsectoredRigidbodySync.cs
- fix TODO in SectoredRigidbodySync.cs
2021-11-09 16:26:06 -08:00