134,494 Commits over 4,293 Days - 1.31cph!
Merge: from playerinventory_oncycle_optim
- Bugfix for leaking onCycle items when calling Item::Remove
Tests: unit tests + cooked meat, consumed, cooked again
Bugfix: fix leaking onCycle items when calling Item::Remove
- Consolidated onCycle callback cleanup to DoRemove
- ItemManager::DoRemoves(bool) can now force remove all items
- Added a unit test to validate the logc
Tests: ran unit test, cooked meat on a campfire, ate it, cooked again - no exception
Simplify wooden collision
- Paintball overalls mostly functional
- Update WearableNotifyConditionalClothing to be able to check for clothing both under and over the source wearable, and for a clothing slot match only on specific slots
- Changed PlayerModel.HasClothingUnder to return the bitmask value of all clothing slot matches both under and over the source wearable
- Remove garbage allocations from SkinnedMultiMesh.FindParts
merge from artist_pack_dlc
BakeBallPositionsToVertexColor compile fix
merge from artist_pack_dlc
random meta keep deleting itself
Fixed reactive target not paintable
Merge from small_engine_col_simpler
Fixed paintable window ground watch
▅▊▉▍ ▌▆█▅▅▍▉▊ ▅▄▇▅▉ ▋▋█▉▋▉ █▄▆▌ ▊▍▆ ▄█▋█▊▄ ▆▆▄ ▇▋▇▆▍ █▋▅ ▊▉▉▉▇
More rotation fixes on all frames
Fixed large light up frame sticking into walls
Standing frames rotation fix
merge from hopper_shader_test
set deploy rotation on frames to 90
Paintball Gun - worldmodel hopper updates to material, meshes and prefab
▌▍▇▉▊ ▆▇▄▆▄ ▋▅▅▋▅▅ ▌ ▌▆▆█▌▌▍ █▍▄▋▉▇
Impact splat colours vertex driven, so that we don't need a ton of mats.
toggled rotate on deploy and after deploy on frames
▄▋▊▅▊▊ ▇▉▌▄ ▊▉▉▄█▆▆▄▍▍▍▅▄▄█
Removed more colliders from shadow proxies on leg_shared_geo
S2P all floating cities
Merge from floating_cities
Remove overlapping couch on Ghost ship 1 (not using remove_static_couch branch due to conflict)
Merge from boatplanner_worldmodel
Merge from artist_pack_dlc
Ensure InitLOD is called before GetBounds, prevents unit cube bounds
Fixed UpdateBuoys NRE in demos
NRE's caused by setting the demo time will no longer stop shots from working
Merge from Reserialize_Prefabs_2
Restore module_1200x1800_2way
removed large and huge signs from easel capability
Fix window not keeping damage when picked up
set small frames and paintable window to resolutions that set their dimensions so paint marks aren't stretched
Movable colliders on reactive target are now parented to regular colliders
Fix error from pasting dead boats, only update submerged states of filtered buoyancies.
Add cannon reload animations to the shared content bundle.
Fix easel deployOBB, move back camera position, cant place so close to walls
artist canvas names to put size at the end
