4935 Commits

Author SHA1 Message Date
Mister_Nebula
961c302562 Merge branch 'nh-stuff' of https://github.com/misternebula/quantum-space-buddies into nh-stuff 2022-11-11 14:33:58 +00:00
Mister_Nebula
ce08715f5e actually make line numbers work smh 2022-11-11 14:33:49 +00:00
JohnCorby
7668b587c2 fix shader replacer 2022-11-10 18:56:58 -08:00
JohnCorby
546da61a7e do error here 2022-11-10 15:16:53 -08:00
JohnCorby
6d85487857 gorp 2022-11-09 22:11:00 -08:00
JohnCorby
414a0aa2d2 Merge branch 'dev' into nh-stuff 2022-11-09 14:38:52 -08:00
JohnCorby
3d8679b33d use instance id in DumpWorldObjects file names 2022-11-09 14:37:00 -08:00
JohnCorby
2dbc57bb14 do DeterministicManager things on world objects added instead of ready 2022-11-09 14:35:33 -08:00
JohnCorby
2912c27f05 Revert "Wait for NH to make system before building world objects"
This reverts commit 7a492231
2022-11-09 12:43:22 -08:00
JohnCorby
fac4abd39b just run next frame here too 2022-11-09 12:02:22 -08:00
JohnCorby
98def9885a Revert "fix hash issue"
This reverts commit c8ccccf9c88c01e5966958338081737f13265baa.
2022-11-09 12:01:54 -08:00
Mister_Nebula
c8ccccf9c8 fix hash issue 2022-11-09 14:15:12 +00:00
Mister_Nebula
87a1cd2fcf Merge branch 'dev' into nh-stuff 2022-11-08 22:10:27 +00:00
Mister_Nebula
9e0dbe55bb gorp 2022-11-08 18:56:14 +00:00
Mister_Nebula
cb4a3d49be fix inputs sticking (TEST) 2022-11-08 15:15:45 +00:00
JohnCorby
4820025a4e oops set the config in the message 2022-11-07 12:31:45 -08:00
JohnCorby
a4f66782db dont send message if not in multiplayer 2022-11-07 12:30:17 -08:00
JohnCorby
d394ee3f46 we dont need a default value since itll be set in configure 2022-11-07 12:28:54 -08:00
JohnCorby
fe4d14c267 Merge remote-tracking branch 'origin/playernames-setting' into playernames-setting
# Conflicts:
#	QSB/QSBCore.cs
2022-11-07 12:27:08 -08:00
JohnCorby
108561adb7 remove variable from QSBCore, only allow setting as host (or when not in multiplayer), fix the message 2022-11-07 12:25:54 -08:00
Mister_Nebula
a2600b53f8 default values for properties 2022-11-07 20:16:35 +00:00
Mister_Nebula
9c4c80eb36 setting for player names 2022-11-07 20:14:03 +00:00
JohnCorby
165ae8fdaf just prevent pausing instead of all input 2022-11-06 16:40:31 -08:00
Nick
7a49223152 Wait for NH to make system before building world objects 2022-11-02 00:59:48 -04:00
Nick
d74b766366 Just use the base game white hole 2022-11-02 00:00:56 -04:00
Nick
f58bd7ad7c This was NRE-ing 2022-11-02 00:00:30 -04:00
Nick
ca0e594338 Merge branch 'dev' into nh-stuff 2022-11-01 23:32:00 -04:00
JohnCorby
0e7f5c3301 fix thruster variable syncer trying to get the local player before local player exists 2022-10-31 17:08:57 -07:00
JohnCorby
5374e0722d nvm the nvm bruh 2022-10-29 15:49:54 -07:00
JohnCorby
585ee0a89e okay that didnt work 2022-10-29 15:38:01 -07:00
JohnCorby
eb8b473546 add comment 2022-10-29 14:45:52 -07:00
JohnCorby
14e59cd7ce make it not include DontDestroyOnLoad things 2022-10-29 14:43:57 -07:00
JohnCorby
06f9b5fb81 Merge branch 'dev' into nh-stuff 2022-10-29 14:28:48 -07:00
JohnCorby
1c6b853c5b oops remove this too 2022-10-26 15:32:06 -07:00
JohnCorby
1182ce25aa Merge remote-tracking branch 'origin/dev' into dev 2022-10-26 15:13:06 -07:00
JohnCorby
36fb9ab300 do less build things 2022-10-26 15:04:37 -07:00
Mister_Nebula
9624ddb272 Update manifest.json 2022-10-24 17:46:37 +01:00
JohnCorby
48144a8214 (UNTESTED) possibly fix meditation goof 2022-10-24 09:37:46 -07:00
JohnCorby
a70f20e196 TEMPORARY: disable time sync 2022-10-19 23:54:35 -07:00
JohnCorby
b9e4b9ee58 Merge branch 'dev' into nh-stuff 2022-10-19 23:54:02 -07:00
JohnCorby
1aae7b41dc more marker visibility things 2022-10-16 18:42:52 -07:00
JohnCorby
963b526490 Merge branch 'dev' into nh-stuff 2022-10-14 16:39:16 -07:00
JohnCorby
7c1c346067 remove culture info thing (i am putting this in vanillafix) 2022-10-11 16:51:00 -07:00
JohnCorby
66976ff28f Merge branch 'dev' into nh-stuff 2022-10-11 01:06:57 -07:00
JohnCorby
67c3b50729 do this much better 2022-10-11 01:06:18 -07:00
JohnCorby
a3a05ab43c Merge branch 'dev' into nh-stuff 2022-10-11 01:03:13 -07:00
JohnCorby
00113259c7 format 2022-10-11 01:03:07 -07:00
JohnCorby
13a050edef Merge branch 'dev' into nh-stuff 2022-10-11 01:01:46 -07:00
JohnCorby
ffeb5e7a37 dont trigger mind stuff if a remote player is projecting 2022-10-11 01:01:25 -07:00
JohnCorby
28f57da0d6 Merge branch 'dev' into nh-stuff 2022-10-10 23:05:17 -07:00