39,962 Commits over 4,597 Days - 0.36cph!
Merge from artist_pack_dlc
force_update_trigger_bypass -> main
force_update_trigger_bypass -> main
merge from steaminventory_scroll_fix
merge from testrunner_window
merge from artist_pack_dlc
Fixed the lighting for the Standard shader's decal layers on transparent surfaces
Merge from artist_pack_dlc
▇ █▉▋█▊ ▉▌▇▄ ▊▍▆▌█▍▄▌▅▉▆▋▅█▄▄▍▊▄▉▅▇▆▉▉▅▆
force_update_trigger_bypass -> main (yolo, sorry QA)
merge from artist_pack_dlc
merge from artist_pack_dlc
▍▆▅▉█▉ ▋▋▊▆ ▍▉▉▊▄▆▄▇█▉▍▉▊▋▍▅▊▆▌▉▆▄▇▍▌█▍▄
merge from artist_pack_dlc
pt_boat_turret_fixes -> main
merge from artist_pack_dlc
Merge from artist_pack_dlc
Merge: from playerinventory_oncycle_optim
- Bugfix for leaking onCycle items when calling Item::Remove
Tests: unit tests + cooked meat, consumed, cooked again
merge from artist_pack_dlc
merge from artist_pack_dlc
Merge from artist_pack_dlc
Merge from Reserialize_Prefabs_2
Fix error from pasting dead boats, only update submerged states of filtered buoyancies.
Add cannon reload animations to the shared content bundle.
Bump up cannon health by 3x to 1000.
Fix camera clipping while aiming the cannon on a boat.
merge from manifestwarnings_fixes
merge from artist_pack_dlc
merge from artist_pack_dlc
merge from artist_pack_dlc
Merge: from useplayertasks_removegroupocludee_nre
- Bugfix for an edge case of moving players during load of a save
Tests: ran unit tests
Reserialize_Prefabs_2 -> main
mountplayersync_ai_bypass
Merge: from playerinventory_oncycle_optim
- Buildfix for client
Tests: none, trivial change
Merge: from playerinventory_oncycle_optim
- Bugfix for exception of duplicate key when loading container with cookables
Tests: unit tests
Add another query check for native grids. dont set water infos if queries dont find anything
cherrypicking
139699 Mark Box_2, Santa-Hat, snowman fbx's as r/w
merge from sss_profile_cleanup
