Commit Graph

2211 Commits

Author SHA1 Message Date
JohnCorby
6139d33f7d oops 2021-12-24 20:38:48 -08:00
JohnCorby
297310b31f merge fix 2021-12-24 20:37:42 -08:00
JohnCorby
17bf1d622d Merge branch 'dev' into message-conversion
# Conflicts:
#	QSB/EyeOfTheUniverse/InstrumentSync/Patches/QuantumInstrumentPatches.cs
#	QSB/QuantumSync/Messages/EyeProxyMoonStateChangeMessage.cs
#	QSB/QuantumSync/Patches/QuantumPatches.cs
2021-12-24 20:35:57 -08:00
JohnCorby
111601fdb5 *RepairedMessage 2021-12-24 20:07:50 -08:00
JohnCorby
9987802c8e jellyfish and tornado 2021-12-24 16:47:10 -08:00
Mister_Nebula
41972f232e fix gathering instruments 2021-12-24 15:27:36 +00:00
Mister_Nebula
96fd427bfb add eye proxy moon stuffz 2021-12-24 15:25:13 +00:00
JohnCorby
22400aeb0c EnterRemoteDialogueMessage 2021-12-23 23:00:20 -08:00
JohnCorby
961a905d14 gather instrument 2021-12-23 22:51:53 -08:00
JohnCorby
aac8d93947 zoom out 2021-12-23 22:49:02 -08:00
JohnCorby
af82e29e4c elevator 2021-12-23 22:47:36 -08:00
JohnCorby
347f8d1945 ship fly and suit 2021-12-23 22:41:11 -08:00
JohnCorby
ba0353fa56 flashlight and signalscope 2021-12-23 18:55:22 -08:00
JohnCorby
d202894453 EquipProbeLauncherMessage 2021-12-23 17:32:12 -08:00
JohnCorby
12b5ec28fe PlayerTranslatorMessage 2021-12-23 17:24:05 -08:00
JohnCorby
9136e32c36 EnterExitRoastingMessage 2021-12-23 17:21:11 -08:00
JohnCorby
74a4775511 OPTIMIZE IMPORTS 2021-12-23 17:07:29 -08:00
JohnCorby
a0e4b1506e Merge branch 'dev' into message-conversion 2021-12-23 16:54:42 -08:00
JohnCorby
2e8a2d0f2a update docs again 2021-12-23 16:53:22 -08:00
JohnCorby
507af7a1fa rename ALL Events folders to Messages so i dont have to do it later 2021-12-23 16:26:31 -08:00
JohnCorby
e15bae9840 DialogueConditionMessage 2021-12-23 16:20:17 -08:00
JohnCorby
5a27757626 indicate when ObjectId and WorldObject are set 2021-12-23 16:08:02 -08:00
JohnCorby
2232e889ab angler change state 2021-12-23 15:57:41 -08:00
JohnCorby
e88ef0cc9c change that back to protected 2021-12-23 15:46:18 -08:00
JohnCorby
d8fd179800 more rename 2021-12-23 15:44:32 -08:00
JohnCorby
9717099867 oops again 2021-12-23 15:44:04 -08:00
Mister_Nebula
c8daf252f2 fix chert instrument 2021-12-23 22:58:16 +00:00
JohnCorby
4806c14ab5 eh 2021-12-23 14:28:17 -08:00
JohnCorby
f9dfd1409f make ctor private 2021-12-23 14:27:41 -08:00
JohnCorby
e90a00f06b rename more folders 2021-12-23 13:57:33 -08:00
JohnCorby
9cbc65dae8 oops 2021-12-23 13:50:05 -08:00
JohnCorby
0122b73a80 and rename folder 2021-12-23 13:49:47 -08:00
JohnCorby
b3776d2b7b enter leave event 2021-12-23 13:49:04 -08:00
JohnCorby
7e442ce69d launch codes 2021-12-23 13:29:14 -08:00
JohnCorby
d3f6747c30 actually call the static constructor of messages 2021-12-23 13:06:18 -08:00
JohnCorby
a0655b67eb check if local player exists before sending 2021-12-23 12:38:14 -08:00
JohnCorby
ee0de74c69 EyeStateMessage 2021-12-23 12:33:30 -08:00
JohnCorby
793ee5a9fc Merge branch 'dev' into message-conversion
# Conflicts:
#	QSB/ClientServerStateSync/ServerStateManager.cs
#	QSB/DeathSync/Events/PlayerDeathEvent.cs
2021-12-23 12:17:37 -08:00
_nebula
c5788a6d53
Merge pull request #437 from misternebula/disconnect-at-end-of-game
Disconnect at end of game, stop players from progressing past Galaxy Map without all players preset
2021-12-23 20:04:09 +00:00
Mister_Nebula
5521e10918 Delete GalaxyMap.txt 2021-12-23 19:56:21 +00:00
Mister_Nebula
b03e8df175 Update AuthorityManager.cs 2021-12-23 19:54:22 +00:00
Mister_Nebula
9af4e64bf8 Update AuthorityManager.cs 2021-12-23 19:54:06 +00:00
Mister_Nebula
facfaf1557 remove auth stuff 2021-12-23 19:53:43 +00:00
Mister_Nebula
0015495ea1 Merge branch 'dev' into disconnect-at-end-of-game 2021-12-23 19:00:44 +00:00
Mister_Nebula
ae219fef01 cleanup 2021-12-23 19:00:26 +00:00
Mister_Nebula
ec3eb1e002 stuff idk man im tired 2021-12-23 11:37:37 +00:00
_nebula
c21f8ea830
Merge pull request #436 from misternebula/fix-supernova-bug
Fix Supernova bug with eye
2021-12-23 10:58:42 +00:00
JohnCorby
b59668490a change Events namespace to Messages 2021-12-23 02:17:56 -08:00
JohnCorby
513741112a orbs 2021-12-23 01:51:22 -08:00
JohnCorby
41d85aa077 meteor patches - remove code duplication 2021-12-23 01:29:11 -08:00