13,473 Commits over 2,435 Days - 0.23cph!
Merge from conveyor_min_fix
Remove asset labels from electric.waterwheel.guide.prefab as it was breaking tests generation
Fixed a case where conveyors would ignore the minimum field when transferring items if there were multiple filtered items being transferred
Added a test for this case
Don't show the world version of an attachment if we're in first person (it was floating in the air)
Improved world space rotator, slowed down rotation lerp so we get a little bit of easing
Decent enough workflow pss for evaluation
After editing a shot the shot is reopened and edit settings reset
Overwrite the existing slot
Fixes
First pass on recording new data into a track
UI kinda functional
Under the hood work to support muting and recording over specific demo shot tracks (eg. pos, rot, fov, etc)
Merge from armored_ladder_hatch
If an effect is going to be parented to a scaled bone, reparent the effect to the root object
Fixes Look rotation errors when shooting scaled mesh colliders
Added door controller slots to the outside of the armored hatches
Expanded renderer bounds on the ladder hatch skinned meshes
Merge from armored_ladder_hatch
Merge from engine_missing_parts_tooltip
Added a tooltip when a slot is missing in the engine loot panel
Setup a material and colour mask
Merge form armoured_ladder_hatch
Add door controller sockets to both hatches
Fixed hatch not being visible to icon renderer because it was named LOD1 (we should always start from LOD0)
Updated Icon Renderer to open ladder hatches when taking a screenshot
Renamed directory and prefabs to match new item name (armoured.ladder.hatch -> floor.ladder.hatch.toptier)
Disable armored hatch placment on boats as they don't have convex colliders
Set lock positions for armored hatches
Slightly awkward placement as the hatch itself is too thick, had to place it on the thinner surface
Update hatch item names and descriptions
Fix pickup and repair targets
Disabled read/write on models conflicting in last merge
Merge from main
Lots of conflicts due to the viewmodel_early_disable_fix and hackweek_server_mesh_cull branches
For fbx .meta file conflicts I used the versions on this branch instead of on main, will need to verify that they have r/w turned off
Fixed first person light effect not working
Merge from cannon_hit_slowdown_revert
Merge from bb_triangle_floor_frame_fix
Merge from brutalist_skin_shadows_fix
Merge from camera_fog_fix
Merge from manifest_size_optimization
Merge from server_side_server_list_filters
Merge from easter_fixes_2026
Fixed incorrect item id on ladder hatch
Merge from armored_ladder_hatch
Merge from shield_idle_collider
Fix local shield collider being disabled permanently after attacking (wouldn't have actually affected any server side hit detection)
Merge from shield_idle_collider
▍▊▍▋█▌▌ ▇▋▌▋ ▊▋▆▉▆▆▌▆▄▇▄▄▆▋▅▋▌▊▊▅▊▌
Merge from Armored_ladder_hatch
Descriptions, fix guide mesh offset on triangle
Triangle hatch prefab setup
Enable r/w on collision meshes
