mirror/quantum-space-buddies
1
0
Fork 0
mirror of https://github.com/misternebula/quantum-space-buddies.git synced 2025-01-26 18:35:34 +00:00
Code Issues Projects Releases Wiki Activity
2,322 Commits 16 Branches 86 Tags
Commit Graph

2322 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
JohnCorby
2fe410082b baba booey 2021-12-12 06:30:50 -08:00
Mister_Nebula
a58f2a8bba Update SocketItemEvent.cs 2021-12-12 14:18:20 +00:00
JohnCorby
2c117f6635 Merge branch 'dev' into message-manager 2021-12-12 03:21:59 -08:00
_nebula
0628af1634
Merge pull request #410 from misternebula/fixes 
Fixes
 2021-12-12 11:21:36 +00:00
JohnCorby
16592d4d57 fixed OccasionalTransformSync NRE 2021-12-12 03:14:00 -08:00
JohnCorby
589750649f ShipDamageController_OnImpact NRE for real 2021-12-12 03:01:41 -08:00
JohnCorby
a272050b8b ShipDamageController_OnImpact NRE 2021-12-12 03:00:20 -08:00
Mister_Nebula
767d2d0318 Update PlayerEntanglementWatcher.cs 2021-12-12 10:49:21 +00:00
Mister_Nebula
58f85d9522 fix NRE in initpausemenus 2021-12-12 10:47:59 +00:00
Mister_Nebula
b1b1e45289 Merge branch 'dev' into fixes 2021-12-12 10:43:29 +00:00
_nebula
a739fa17c5
Merge pull request #411 from misternebula/clear-logs 
reset game save
 2021-12-12 10:42:49 +00:00
Mister_Nebula
8612bbd810 Merge branch 'dev' into clear-logs 2021-12-12 10:42:19 +00:00
Mister_Nebula
5d94fcdb2d reset game save 2021-12-12 10:34:55 +00:00
Will Corby
0f0fbc550e
Merge pull request #407 from misternebula/addplayer 
AddPlayer method
 2021-12-12 02:20:14 -08:00
JohnCorby
65042e6a74 Merge branch 'dev' into addplayer 2021-12-12 02:18:42 -08:00
JohnCorby
229171d87c Merge branch 'dev' into message-manager 2021-12-12 02:18:36 -08:00
Will Corby
40ccdd4ccf
Merge pull request #409 from misternebula/unique-objectid 
WorldObject Refactor + Unique ObjectId
 2021-12-12 02:17:13 -08:00
Mister_Nebula
0bb136a68c stuffz 2021-12-12 10:03:33 +00:00
Mister_Nebula
2935d77ef5 fix ship 2021-12-12 10:02:19 +00:00
JohnCorby
89cc3d202d Merge branch 'dev' into unique-objectid 
# Conflicts:
#	QSB/Menus/MenuManager.cs
 2021-12-12 01:56:57 -08:00
JohnCorby
79c05ecf13 Merge branch 'dev' into message-manager 
# Conflicts:
#	QSB/Menus/MenuManager.cs
 2021-12-12 01:56:40 -08:00
JohnCorby
71dfabc24f Merge branch 'dev' into addplayer 2021-12-12 01:55:44 -08:00
Mister_Nebula
126a4636fc remove unused thingies 2021-12-12 09:50:20 +00:00
Mister_Nebula
2f424bdf06 fix quit button 2021-12-12 09:49:00 +00: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
9f62fff9fd fix transform syncs that depended on ObjectId 2021-12-11 22:29:48 -08:00
JohnCorby
07dc6242dc make GetWorldFromId work 2021-12-11 22:05:31 -08:00
JohnCorby
a83744bb99 better RemoveWorldObjects 2021-12-11 22:00:21 -08:00
JohnCorby
8c4004fc58 use ObjectId instead 2021-12-11 21:57:23 -08:00
JohnCorby
e9b4ebc4d8 remove TypeSubset 2021-12-11 21:57:22 -08:00
JohnCorby
fce0a7d7d8 remove world objects in Rebuild (all at once), and use ObjectId = WorldObjects.Count 2021-12-11 21:57:00 -08:00
JohnCorby
46bc97418f bruh 2021-12-11 21:45:28 -08:00
JohnCorby
4fb68a9283 inline CreateWorldObject 2021-12-11 20:35:54 -08:00
JohnCorby
a2ce35e178 more error checking 2021-12-11 19:02:34 -08:00
JohnCorby
c7d694757c uh 2021-12-11 18:52:05 -08:00
JohnCorby
b538eb3200 PlayerTransformSync.LocalInstance should not be null when we SendEvent. if it is, i would like it to give an error, rather than simply wait 2021-12-11 18:49:18 -08:00
JohnCorby
1ccd277c5c moved checks higher 2021-12-11 18:40:20 -08:00
JohnCorby
00d93f765c bruh 2021-12-11 18:33:02 -08:00
JohnCorby
a925327c0c Merge branch 'dev' into message-manager 
# Conflicts:
#	QSB/Events/QSBEvent.cs
#	QSB/Events/QSBEventManager.cs
#	QSB/Messaging/MessageHandler.cs
#	QSB/Patches/QSBPatchManager.cs
#	QSB/QSBCore.cs
#	QSB/QSBNetworkManager.cs
 2021-12-11 18:31:28 -08:00
JohnCorby
0c833c4f8c bubba 2021-12-11 18:16:00 -08:00
JohnCorby
6a81808bc0 Merge branch 'dev' into worldobject-init 2021-12-11 18:15:12 -08:00
JohnCorby
76171103ab fixed quit button being wrong 2021-12-11 17:36:44 -08:00
Mister_Nebula
a90677bfd5 im stupid 2021-12-12 00:32:56 +00:00
Will Corby
f0b09b9171
Merge pull request #399 from misternebula/tornadoes 
Tornadoes (and more!)
 2021-12-11 16:22:39 -08:00
JohnCorby
632a706cd0 le fix 2021-12-11 16:19:59 -08:00
JohnCorby
0988dc8f45 Merge branch 'dev' into tornadoes 
# Conflicts:
#	QSB/Events/EventNames.cs
 2021-12-11 16:16:40 -08:00
_nebula
1d29320e9e
Merge pull request #398 from misternebula/new-save-sync 
Save sync
 2021-12-12 00:15:31 +00:00
Mister_Nebula
ae2d2d1da3 Merge branch 'dev' into new-save-sync 2021-12-12 00:01:05 +00:00