138,448 Commits over 4,324 Days - 1.33cph!
Remove Golf Ball Rock that was bricking some prefab ID's
Cleanup to try another merge
updated Windows client Unity version to 635cbaf/2022.3.41x1 as well, MacOS client still on 2022.3.41f1
Component Ammo Box - Updated corpse mesh and prefab
Cherrypick
139401 "Space LR despawn timer set, Neonsign TR crafting pass"
Apply xmas tree change from
139653
These were left over changes from naval_backport
Added Sail.MaxThrustMultiplier and SmallEngine.MaxThrustMultiplier replicated vars.
Refactored sail and engine thrust variables/functions to include them.
merge from hackweek_more_tests/fixes
Removed some multi-compiles from the Standard shader and replaced some with shader variants to reduce shader memory further. Also, converted the forward shadow keywords to a dynamic branch in the shader so its multi-compiles could be removed
Apartment complex greybox update
Fix worldmodel issues / missing outlines on 39 items
Re-ran all the new tests - all green (except for horse mask which was fixed seperately on lunar branch)
append clothing box and charcoal box to the storage adaptor allow collision group.
Merge from main
Conflict on building_planner.entity, auto resolved
ran manifest, localization, icon manifest
clothing box - greybox, initial prefab setup, placeholder models, item created, icon created, placeholder matrix
hamster water wheel blockout
Clearer feedback in editor when using the deepsea.enabled convar
Better fix for the portal map marker nre
Compile fixes
Merge from vine_rotation_error_fix
Merge from scientist2_trophy_fix
Fix groundwatch issues for 8 deployables
Remove collision and push force from divesite buoys
Fix missing phys impact sounds for 6 items
Fix missing io arrows for 5 items
Setup Salvaged Axe Remake Folder Structure
Imported and Setup Salvaged Axe Remake Materials and Textures
Imported Salvaged Axe Remake Viewmodel FBX
Merge from demo_improvements_feb_2026
▆ ▌▊▉▉▋ ▆▍▆▊ ▋▉▄▌▊▇▊█▄██▌▅▋▌▍▉▆▇▌▌▍▊▇▄▇▌
▋ ▉▍▇▄▌▋█▅ ▆▄▋▇▇▍▋ ▆▋▄▄ ▆▊▍█▋▆▊▊▄▄█▊▆▇▊▇▄▇▅▌▌▍█▋ ▅▊ ██▉▉▅█▅ ▊▊ ▅▊▉ ▉▌▅▅▇▄▋ ▇▉▄▊ ▉▋▍▉ ▅▅▇▆▅▆▅▌▆▄ ▉▌ ▍█▉▊▉▋█ ▋▇▊ ▋▉▇▄▌▄ █▋▄▌▆▍ ▄▉▆▌█▇█ ▍▍▄▋▅▋▌▍▇▄▌▆ ▅▅█▇▋ ▌▅█▄█▉▄ ▋▊▄█▄▇▊▆ ▅▆ █▋▋▌▅▇▍ ▅▄▊▅▉▄▋ ▉▅▉ ▄▇▌█▉█ ▍▄▉ ▊█▍▄█▉▄▌ ▋▋▊▍ ▊▌▉▍▇
merge from wantedposters_canvas_fix
merge from prefab_preprocess_fix
Deep sea cooldown in between each opening is random
Added deepsea.wipeCooldownMin and deepsea.wipeCooldownMax
Default range is 1.5h -> 2.5h
merge nre_fix back to main
Fix buoyancy batching throwing errors in scenes without a water system/ocean sim.
door closer hackweek files
▉▊▍▆▉▅ ▇▇▌▉ ▊▍█▅▍▉▄▉▋▅▍▅▆▍▋▌▄█▇▍▋▄▆
▄▇▆▍▅▆ ▌▌▋▅▍ ▅▋▊▆ ▍▊ ▍▋▋▌▍▄ ▉▊▆▆▌ ▄▅ █▋▌▄▌ ▌▍ ▌▇▊█▌▅ ▉▇▍▊▆ ▉▅▌ ▉▅██▄▆▋▇
Added layer to the scene for props testing
update server to 635cbaf/2022.3.41x1
- potential 64k collider limit crash fix, client will still spew old limit warning/error though
- updated decor plants' LODs, added colliders
- added mesh colliders to plant containers
- fixed cacti colliders' import scale
- monstera XS billboard setup
Fix airdrops not becoming lootable when landing on playerboats
Some new nodes and optims wip
Fixed UIDeepSeaPortalMarker NRE
Increased the default interval in between each entity spawn when the deep sea is opening
Added deepsea.entities_spawninterval and deepsea.spawngroups_spawninterval convars
Added deployed sfx when placing a windturbine
Fixed drone deploy guide to face the correct way when clear to place.
