782 Commits

Author SHA1 Message Date
Noah Pilarski
13025f2e48 Merge branch 'dev' into enum 2022-10-03 18:02:58 -04:00
Noah Pilarski
5dcdd6a882 Merge branch 'dev' into eye-of-the-universe 2022-10-02 13:01:43 -04:00
Noah Pilarski
79b45c002b Turn these into extension methods 2022-10-02 12:57:53 -04:00
Noah Pilarski
c23d403d2b Move texture prefabs to before _isInit
These can get destroyed by ImageUtilities
2022-10-02 12:50:49 -04:00
Nick
720ecede5d Check contains half as much 2022-10-02 12:34:35 -04:00
Noah
f8f0ae92cb
Merge branch 'dev' into eye-of-the-universe 2022-10-02 11:57:42 -04:00
Nick
fb2de48d8f Use bool to check if we should init prefabs (avoids excess null checks) 2022-09-30 22:58:31 -04:00
JohnCorby
7ce78d2ed0 comment 2022-09-30 19:51:59 -07:00
JohnCorby
63f87e4c6d sort arcs by path to hopefully prevent future updates from breaking everything 2022-09-30 19:46:36 -07:00
JohnCorby
db2d1aebcd move group builder down here too 2022-09-30 19:33:06 -07:00
Nick
d1da5c3791 Remove stupid null check, only set active at the end 2022-09-30 22:30:26 -04:00
Noah Pilarski
33323ddea5 Fix tornados because latest patch 2022-09-22 17:13:07 -04:00
Noah Pilarski
9d245aa1e1 Merge branch 'dev' into eye-of-the-universe 2022-09-22 16:36:37 -04:00
Noah Pilarski
d565ac52d1 Use TryParse instead 2022-09-19 02:38:56 -04:00
Noah Pilarski
a799eaf0f6 Merge branch 'dev' into enum 2022-09-19 02:22:15 -04:00
JohnCorby
07ad15afff bruh 2022-09-18 20:56:47 -07:00
Will Corby
329377098c
Log missing decal path (#397) 2022-09-18 20:16:16 -07:00
Noah Pilarski
2d619a58c2 Move this to be after reveals is set 2022-09-18 14:46:24 -04:00
Noah Pilarski
5c3a4943b5 Add flashlight toggle 2022-09-18 11:50:46 -04:00
Noah Pilarski
2260188164 Log missing decal path 2022-09-17 19:33:21 -04:00
Noah Pilarski
3a0cb180d5 Meteor oopsies 2022-09-17 17:52:55 -04:00
JohnCorby
2cee9ebd42 add stretch to scatter 2022-09-17 11:42:45 -07:00
Noah Pilarski
9599003f87 Null check instead 2022-09-17 14:41:04 -04:00
TerrificTrifid
2904af39d1 Detail stretch 2022-09-17 10:55:01 -05:00
Noah Pilarski
01ee3e9ad8 Merge branch 'dev' into eye-of-the-universe 2022-09-17 10:32:42 -04:00
Nick
126547be6f Make everything use Path.Combine instead of concat for Linux 2022-09-15 18:47:26 -04:00
Noah Pilarski
2222a4cd93 Merge branch 'dev' into eye-of-the-universe 2022-09-15 18:37:14 -04:00
Nick
103d3d5bdb Merge branch 'dev' into enum 2022-09-15 01:22:01 -04:00
Nick
5a5ea46b05 Categorized some stuff in components and fixed Trifids star thing maybe 2022-09-15 00:41:05 -04:00
Noah Pilarski
0819658e28 Merge branch 'dev' into enum 2022-09-14 21:22:16 -04:00
Nick
d71b016c8a Explained why the fixer is needed 2022-09-14 20:51:07 -04:00
JohnCorby
cce97acddc angler fixer yay 2022-09-14 17:41:33 -07:00
JohnCorby
436cfa3175 remove unused parameter 2022-09-14 17:04:53 -07:00
JohnCorby
8ec41b58d5 remove the delay (things still work lol) 2022-09-14 16:59:48 -07:00
JohnCorby
5ff9f09684 revert da thingy 2022-09-14 16:34:10 -07:00
JohnCorby
f2771c7b34 use da thing thankies rider 2022-09-13 21:11:12 -07:00
Nick
12586ebb20 Merge branch 'dev' into eye-of-the-universe 2022-09-13 22:09:31 -04:00
Nick
84b86dc379 Merge branch 'dev' into scatter-optimization 2022-09-13 22:01:09 -04:00
Nick
7bcddf4261 Fix collision issue 2022-09-13 21:58:31 -04:00
Nick
e074d2ecb1 Fix bad merge 2022-09-13 20:18:02 -04:00
Nick
b86e5454cc
Merge branch 'dev' into slide-threading 2022-09-13 20:14:37 -04:00
Nick
7c183d7333 Fix up black images 2022-09-13 19:53:58 -04:00
Nick
d3e44d0e69 Add locks to async image loading, count how many have loaded, fix error log 2022-09-13 19:06:50 -04:00
Damián Garro
5aba437596 Fix race conditions with slide textures loading 2022-09-13 19:30:23 -03:00
Noah Pilarski
c8e88707e4 Fix meteors (final) 2022-09-12 22:03:51 -04:00
Noah Pilarski
9d93981350 Fix meteors 2022-09-12 19:24:16 -04:00
Noah Pilarski
dbdff11e2f Fix rafts 2022-09-12 16:00:01 -04:00
Noah Pilarski
1182865753 Almost forgor 2022-09-11 02:35:31 -04:00
Noah Pilarski
6caa2d8991 Get prefabs from solar system and then head back to eye 2022-09-11 01:32:07 -04:00
Noah Pilarski
2fa9f6bf28 Merge branch 'dev' into enum 2022-09-10 16:19:05 -04:00