111,707 Commits over 3,928 Days - 1.18cph!
Merge: from main
Tests: none
Submitting battering ram hardware rig
jungle_ruins_c iteration2
merge from indirect_instancing
Fixed missing namespace error in server build
- Fixed wildly inflacted Vending Machine Anayltics when buing multiple purchases
- Fixed new vending stats also inflating when buying multiple purchases
Battering ram
- Added new driving pose
- Added battering ram sit mountpose enum
- Added pose to player controller
- Set to use new pose in seat prefab
adjusted gui slider values
adding the surface type mat for gibs
merge from server_baseplayer_optim
merge from player_catapulting
merge from create_asset_menu
▌█▌▋▄ ▌▆▇▄ ▄▇▋▆▉▊▆▋▌_▄▊▄▇▍▆_▄▇▍█▊_▌▄▇▌▍
merge from scrap_exchange_dynamic_pricing
fixed ore spawns and some tree spawns on tutorial island being off after the cliff update, also fixed a terrain gap with a cliff.
Prevent scientists from shooting when they are sprinting
After they sprint, if their target is not directly in front of them, they will need some time to aim at their target again
Make killscientists command also kill new scientists
Fix scientist appearing on server but not client (had to redo DoPrepare and rebuild manifests after changing folder)
fixed terrain blend map for Lake_a
Re-implemented player catapulting
Update spawns in desert mil base dwellings
/main/indirect_instancing:
battering ram - updated ik hand targets
Bake covers for mil desert base
merge from /indirect_instancing
Check if there is an instance of the indirect instancing component because apparently it's possible that we add/remove instances when there isn't an active camera.
More organising and combining.
Deleted now unused menu items and removed their refs in presets.
initial ui sign.update.sculpture prefab variant
Started organising options layouts
exported edited wolf attack ledge rm animation
Merge from bag_pickup_auth
Fixed bag interactions when in auth
merge from /indirect_instancing
Indirect instancing:
- Prevent NullReferenceException when attempting to remove instances without a MeshFilter component
- Fixed shader compilation error in the shadow pass
- Surround instancing code with `#ifdef CLIENT` for cleaner server builds
Updated workshop scene set dressing for new rocks
merge from caminfo_barrel_squeeze
merge from fix_toolgun_LOD
merge from hexagontile_kill_fix
merge from fix_binocular_2024
merge from bag_pickup_auth
merge from store_gesturepack_uiscale_fix
Added snap sockets for the triangle planters to the triangle foundation and triangle floor piece
WIP system to track food spoilage
Operates via new ItemModFoodSpoiling that stores a countdown in real time for how long an item remains unspoilt
Added a new getSpoilMultiplier callback to ItemContainer that can modify the rate food spoils when items are contained within it, powered fridges reduce the rate by 90%
