110,897 Commits over 3,897 Days - 1.19cph!
▅▋▉▉▅ ▅▄▉█ ▄▊▉▊▅█_▉▄▄▋▆█▆▆▇_▅▌▄█▌▄▅▊▅▉▆
- ▊█▌▇▊▆▉ ▄▇▊▍▋▍▊▋▍ ▊█ ▊▌▆▄▄▄▄ (▆▆▌▉ ▆▋ ▇▋▉ ▌▄▅▅▄▌▅)
- ▄▇▊▌ ▇▅▋▇▇▍▆▄▆▉ ▊▇▌▆ █▄▋ ▉▄ ▌▉▄█▋▊▌█▇▋
added early return when trying to load a sculpture data-set with a non-matching size
marked marchingcubemanager to not be destroyed on load (fixes ice disappearing when after disconnecting from a server)
Fix catapult boulder exploding instantly in some cases
Consolidate some code, cleanup.
Setup upgrade menus.
Removed unused audio components on the catapult
Never cull battering ram wheels
assigning new ice material to block
removed old dev dpvold prefab (unused)
jungle building skin - prefabs for each block, prefab assignment in building grade script, building grade added
Add ice shader GUI, many colour tints, fix normals, and smoothness, and improve parallax effect
Merge from shred_helicopters
Fixed tread animator changes affecting bradley
Fixed magnet crane modifying the on disk materials when moving, resulting in changed tread materials when checking in
Minor performance improvements in how we update the tread material, fixed visual tread speed being double calculated resulting in material animating twice as fast
Merge from cinematic_gestures
Can now pick up minicopter, scrap transport helicopter and attack helicopter with the magnet crane in junkyard as long as they are turned off
These helicopters can be fed into the shredder for scrap, scrap is multiplied by the current health of the helicopter (eg. 50% hp = half the scrap listed below)
Attack Helicopter - 500 scrap
Scrap Transport helicopter = 300 scrap
Minicopter - 200 scrap
Allow junkpiles to despawn if any loot is taken from them / any barrels are destroyed instead of requiring everything to be looted before it can despawn
- don't despawn if only the scientist is killed
- don't apply to diving sites
Protobuf, codegen, manifest
Merge from ice_sculptures
Merge from scrap_exchange_dynamic_pricing
BaseSculpture protobuf id 186 > 182
Codegen, protobufs, manifest
Fix compile issue on Mailbox, allowedItems is now defined in StorageContainer
Adjust siege weapon protobuf ids to remove conflicts with other branches
Catapult 180 > 183
SiegeTower 181 > 184
Ballista 182 > 185
BallistaGun 183 > 186
BatteringRam 184 > 187
When tracking scrap being purchased with items, track how many items are sold rather than the scrap (inverse of normal behaviour)
Reduced temp radio size to 0.05m to prevent overlapping interaction with central locking system
Include System reference, fixes compile error
Revert all cockpit prefabs to their version from main
Reapply socket change
Underwater visibility increase.
merge from queue_improvements
