131,480 Commits over 4,262 Days - 1.29cph!
Merge from petting_gesture
Set trains to hit construction layer again so they can hit barricades
AND, OR, XOR switch network optim
Replaced the full network updates for flags only
Disable stackable item support on rockets
- the convar was already disabled but lets not forget this
merge from item_ownership -> crafting_update
Changed `Purchased From Vendor by {0}` -> `Purchased by {0}`
Merge from tssaa_hires_screenshot_fix
Disable TSSAA during hi res screenshots, fall back to FXAA
▅█▌ ▌█▋▉▅▉▍▌ ▌▌▅▊▇▉▍ ▇█ ▇▆▋█▇▍▇▇▍ ██▍▊▌▊
▊▅▅ ▊▍▍▄▊ █▊▄▄▅▊▍▋ ▅▇▇ ▄▆▍▉▅▆▇▉▋▋ ▊▄▊▆▌▆▋ ▋▍ █▆█▉▋▋▊█▊ ▋█▅▉▉ ▄▄▍▊ ▉▍▇ ▊▇▇▍▌ ▉█ ▌▆▇▆▍▆▌
siegeweapons_terrain_proxy_fix -> main
Attempt to fix some siege tower collision issues on terrain carving areas
merge from item_ownership -> crafting_update
Fixed some collision issues with the natural beehive
Actually change ownership to the newer protobuf ID since it's the newer one
Fix conflicting protobuf entity field ids
▍▍█▇▄ ▇▅▅▅ ▉▍▉▉▍▆▌▉▉▄_▌▋▆▋_▇▆▆▄▍
Fix ItemModSwap after merge
Natural Beehives should spawn on oak_e
Deployed Beehive:
- Reduced collider size
- Recalculated bounds
merge from crafting_update -> item_ownership
▆█▍▆▋ ▍▍▊█ ▋▆▉▅▇▋▋██▌_▌▅▄▌_▉▋▄▋▌
Reduce update rate when looking in a box
merge from main -> item_ownership
- Add Progress bar to Honeycomb generation
- RPCs added with client prediction
- Cleanup NucleusGrading code
Add item ownership to items horses poop
- uses breed's name as the username
- doesn't actually do anything because poop is stackable, planning for future if they poop different unstackable items
▅▋▋▍▄▊▆▊▋ ▉▌▍▄ ▅▉▄▍▋▋ ▉▇▉▌█▅
▅▊▄▊ ▍▍▌█ ▇▊ ▋▉▍ ▊▋▉█▅▆ ▄▄ ▅▇▆▆▄▊▄▉▉▉▌▆▌, ▌▄ ▅▍▌ ▉▄▉▋ ▉▋█▍▄ ▍▄ ▌▇▊█▅▄▆▌▇▌ ▇▌ ▌▌▄ ▍▆▅▌▊▇█ ▇▊▄ ▉█▋▉ ▌▄▊▄ ▉▊▅▅ ▌▋▌▌ ▇▊▍ ▆▅ ▊▌▉▌▅▌ ▆▆▊▇▄
▍▇▉▉ █▆▉▌▋▋ ▆▅▌▋█▇▍▌▄ ▌██▌▌▉▆▊ ▊▆█▋▌ ▆▅ ▅█▅▆▇ ▄▅▅▉ ██▋▋▅▋. █▆█▊▉▊▉ ▉▋▍▆ ▊▌ ▉ ▆▍▇ ▌▊▉ ▍▅▊▉ ▍▊▆▍ ██▌+ ▉█▌▋▅▇▆ ▋▉▊▍█▇ ▅▇ ▇▉▆ █▄▌ ▄▉▌▆▉▍▊▌▇▊, ▅▇▅▊▅▍▋▅▊▅ ▅▅▍▄▋▇▇▊▇ ▋▊▍ █▍█▌▄▉
Transfer item ownership when explosives are picked up
- this doesn't apply yet because C4 & satchels are stackable but laying the code down ahead of time
Add ownership to ItemModRecycler (no prefabs use this but better to be safe)
Set item ownership to keycards that are picked up
Add item ownership when animal head is beheaded with a skinning knife
Set item ownership for resources that use RandomItemDispenser instead of ResourceDispenser
Add item ownership when collectible is picked off the ground
Add item ownership for items produced when car is shredded
Add item ownership to plants harvested
Fix item ownership not applying to finishing bonus
Set item ownership of photographs taken by the camera
Set item ownership of cassette tape to the player who made the recording
▇▇▆ ▋▆▉▉▅▌▍▌▆ ▋▇ ▄▊▊█▇▋▇▌▇▆ ▊▉▋▌█▌
Add ownership for gifts that are wrapped
merge from main, fuck fuck Plastic or whatever we call it now..
Try without merge tracking, ignoring subtractions
Untangle bad merges - maybe
