192,383 Commits over 4,049 Days - 1.98cph!
scene to prefab all (to refresh tunnel entrances for env volumes)
Restore changes to BaseProjectile lost in merge
Added a tip for how to climb trees
merge from spatially aware branch - underground train tunnels and caves content converted
Experimental vine chaining
Hold E while swinging on a vine to automatically grab onto the first available vine at the destination branch
Can only chain to destination vines that are within 90 degrees of your direction, so you can't loop back and forwards
Can be disabled with VineMountable.allowChaining convar (defaults to true)
Another fix for serialisation layout
Added kapok_b variant
Manifest
Expose DismountViewmodelHoldTime on VineMountable
Flatten look angle when deciding what branch to swing to
Merge from TransferAllItemsToContainer_nre_fix
Speculative TransferAllItemsToContainer nre fix
Add a corner icon when meat is being refrigerated. Especially important with the new vending machine fridge
https://files.facepunch.com/ianhenderson/1b1611b1/Unity_3xOHJjqneq.png
vending_machine_fridge -> main
Reset all existing vending machine prefabs to 128 slots for good measure
Remove logs, moved capacity code into delayed method.
Hardcode capacity into the npc vending machine instead (if the slot number is unset) . They all have the same capacity anyway - saves doing S2P on all monuments with vending machines.
Revert last change, add a new disableLerps option to Ironsights component that will override any animation when calculating the viewmodel rotation while in ADS
Fixed issue causing outpost and bandit camp vending machines to be out of stock
Adjust blowpipe ironsights intro speed to 1.5 (was 2) and adjusted intro curve to kick in later, seems to fix it sometimes overshooting at the cost of a slightly slower ADS
Setup correct deployed vending machine slots 36 -> 30
Mild texture param tweak.
Snake reveal & snake hide prefabs.
Removed debug gizmo.
Applied FX to prefab.
Eliminating more branch differences / minor cleanups
Eliminating more branch differences / minor cleanups
Fixed floor and foundation using the wrong wallpaper skin id
Pressing right click with wallpaper in hands open the skin selection menu
Applying some properties that were modified in Procedural Map scene to the World Setup prefab
Keep at least 50m distance from harbors to other monuments (fixes harbor spawning too close to jungle swamp)
added dlc gesture preview and hooked up
Fixed new jungle meats turning into spoiled bear meat when expired
Eliminating more branch differences
Fix crashes to do with material's representative texture
Apply FCVAR_USERINFO to gmod_npcweapon
func_movelinear improvements
Rework how sounds are played, so they are always consistently played, regardless if they are given, or if both sounds are the same sound.
Also merged Portal 2 parented movement fixes.
Allow mat_picmic below -1 in multiplayer
Init text fields for func_precipitation
Fix crashes to do with material's representative texture
Apply FCVAR_USERINFO to gmod_npcweapon
func_movelinear improvements
Rework how sounds are played, so they are always consistently played, regardless if they are given, or if both sounds are the same sound.
Also merged Portal 2 parented movement fixes.
Allow mat_picmic below -1 in multiplayer
Init text fields for func_precipitation
Eliminating more branch differences
fixed a missing mesh from collider script on corner_c prefab
Final polish pass on vm camera animations for the initial list of guns
Merge: from relationshipmanager_leaks
- Server and Client-side bugfixes for pooling around RelationshipManager types
Tests: local 2 player session with flicking open-closed the contacts screen and with pooling tracking
Merge: from main
Tests: none, no conflicts
