137,201 Commits over 4,474 Days - 1.28cph!
Merge from poncho_fur_fix (used BDU_Shirt.fbx version from this branch, stomping conflicting version on main)
Emulate MaxStackable logic when spawning loot to account for container specific loot limits
Merge from JulQuickfire_balane1
Merge from videoplayer_volume
Merge from lunar_masks_wolf_headress
Sheep setup
Fixed interact colliders on animals affecting navmesh bakes
Shift up the second hotbar so it matches inventory placement
Setup calf with proper model
merge from main -> editor_hotbar_swap
merge from fix_instantiate_persistant_setactive -> main
Fix editor printing errors in ItemIcon.OnEnable() and QuickCraft.OnEnable()
- caused by an editor optimization to not create copies of single use prefabs (GameUI)
- however GameUI is cursed and called SetActive() from inside Awake() which caused OnDisabled() to not be called, causing some of the UI prefabs to get into weird states
- kept the optimization but locked it behind an editor pref for now until it can be properly fixed
Fix the second hotbar prefab not referencing the main inventory
Pool table:
- fix offset deploy guide
- enable pickup, repair
- assign protection and hp
- add cloth surface collider
Merge from PlayerMaintainedMonuments/powergrid
Merge from PlayerMaintainedMonuments
Restore recycler change from
158020
Powerplant fuse boxes now zap you if you try to remove a fuse
S2P powerplant
merge from grenade_drop_fix
Fix grenades sometimes incorrectly dropping on your feet when you meant to do a regular throw
Could happen if you right clicked -> switched away -> went back to grenade -> left click throw
Add the second hotbar to GameUI.Hud.prefab (so much for the dream of not reserializing the large UI prefabs)
Make the second hotbar a prefab instead of cloning the normal hotbar
merge from hackweek_nameplate_dist_sizes
Improved ESP player nametag size updating logic
Fixed nametags seemingly floating higher above players' heads the farther you go when using autosizing
Update Rust+ section in menu to link to the app when telling you to install it, and tell you if push notifications aren't enabled for the app yet
Update the GameUI.Inventory.prefab prefab manually with only the fields we want to change (instead of the whole prefab reserializing)
Modify ContainerSourceLocalPlayer so it can override the transform it uses for `ItemIcon[] allIcons`
- the main inventory panel was parented too high and grabbing icons from different panels
- keep the parenting the same, only changing where it's fetching the icons from
merge from main -> editor_hotbar_swap
Don't render the last row of the last row of the main inventory when the 2nd hotbar is shown so it looks better when openinga and closing main inventory
merge from PlayerMaintainedMonuments
move some sockets for better hardside wall placement
adjust darts clearing in multiplayer
Mild cleanup in UpdateVolumeVisuals
merge from automated_testing
Fix turret test failing due to weapon default ammo contents
handle rare drag-on-open NRE
Merge from PlayerMaintainedMonuments/powergrid
Read/write enabled on collision meshes for powerplant fuseboxes
Adjust required fuses for different powergrid stages
Recyclers outside safezones now have slightly boosted stats with higher powergrid stages. *Subject to change*
- Powergrid fuseboxes in the powerplant now only deteriorate the single oldest fuse in their inventory. Next oldest starts deteriorating once oldest becomes broken
- Changed 'powergrid.fuseConditionLossPerSec' convar to 'powergrid.fuseLifespanSeconds' and adjusted default value
- Make heavy fuse item stackable
Update darts with colours for each player
- 1p is blue, 2p is yellow (not red bc it blends with board too much)
- colours apply in 3 places: viewmodel, thrown darts, and 3p mountable props
- improved when darts are cleared from the board in multiplayer, now waits for next player to throw to clear old darts
merge from BoatVendor_BPchange
