1218 Commits

Author SHA1 Message Date
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
Nick
6d2dbf72d5 Revert "Revert "Disable starlights when out of range" (#385)"
This reverts commit a1b1bd9a4052a0ad212cf3570d79c6d37e197d08, reversing
changes made to acb235d4788ed6d993a6b23f918e2ae94cce0493.
2022-09-15 00:25:07 -04:00
Will Corby
6dfe59e962
Revert "Disable starlights when out of range" 2022-09-14 21:15:55 -07:00
Will Corby
acb235d478
Disable starlights when out of range (#345)
Fixes transparent stuff
2022-09-14 21:15:41 -07: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
9b20e61a00 Add eye state activation for reference frame 2022-09-11 20:35:01 -04:00
Noah Pilarski
e4e3e87892 Set ringworld fade renderers to empty array 2022-09-11 04:27:56 -04:00
Noah Pilarski
abed1b2439 Set airlock to open to an empty array 2022-09-11 03:51:38 -04:00
Noah Pilarski
ea1ff34e1c Set black hole audio stuff 2022-09-11 03:23:06 -04:00
Noah Pilarski
b8c28e3734 Me when 2022-09-11 03:08:11 -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
11a30e7204 Set default intensity at eye to 0.2 2022-09-10 19:06:31 -04:00
Noah Pilarski
65f6a68f78 Don't keep world position 2022-09-10 18:04:50 -04:00
Noah Pilarski
2fa9f6bf28 Merge branch 'dev' into enum 2022-09-10 16:19:05 -04:00
Noah Pilarski
e688939e8c Merge branch 'dev' into eye-of-the-universe 2022-09-10 15:13:36 -04:00
Noah Pilarski
5ab727384b Allow more than one ring 2022-09-10 12:11:44 -04:00
Noah Pilarski
5252ce18d5 Merge branch 'dev' into eye-of-the-universe 2022-09-09 20:42:56 -04:00
Damián Garro
867c180ae9 Rename variables 2022-09-09 18:55:21 -03:00
Damián Garro
79b842cc24 Swap comments 2022-09-09 18:53:28 -03:00
Damián Garro
e450a2b459 Fix dialog text not trimmed in translation table key 2022-09-09 18:48:31 -03:00
Nick
1ec59c6538
Set shuttle landing radius (#363) 2022-09-09 12:47:39 -04:00
Noah Pilarski
1f224b3e72 Set shuttle landing radius 2022-09-08 22:48:28 -04:00
Noah Pilarski
fafdb1c48b Allow ship log details to be added to vanilla planets 2022-09-08 21:13:35 -04:00
Noah Pilarski
3337b5e2e7 Merge branch 'dev' into eye-of-the-universe 2022-09-08 12:51:28 -04:00
JohnCorby
b016652ad1 Revert "dont use file scoped namespace"
This reverts commit 44b181a3879b817543e0ac9565c04fd4939d19fb.
2022-09-07 18:06:20 -07:00
JohnCorby
44b181a387 dont use file scoped namespace 2022-09-07 18:01:54 -07:00
JohnCorby
5dcaac14f5 rename 2022-09-07 17:56:41 -07:00
JohnCorby
da211eff75 scatter builder keep loaded 2022-09-07 17:33:38 -07:00
JohnCorby
7a67a1f980 improve warnings 2022-09-07 17:30:22 -07:00
JohnCorby
bf6745d351 groups on details 2022-09-07 17:21:42 -07:00