- Siege tower towing setup - Added editor gizmos to towing visuals

- Added icon to siege tower - Finalised basic constructable (added each of the build steps and relevant colliders)

jungle skin prefabs setup progress

manifest

Fixed .gma whitelist being different between game/gmad Update net.lua - comment typo Add all missing Portal 2 map icons Fix more potential crash issues to do with particles Make particle preview background slightly lighter (32,32,32) Fixed more crashing issues to do with particles ClientSignOnStateChanged is no longer called for HLTV clients util.IsValidModel uses meshcount to determine useless models If mesh count is 0 - it's a useless model, instead of using hardcoded model name substrings. This fixes certain valid models being unable to be spawned in Sandbox

added ability lock/unlock edits to sculpture when you're not holding a melee weapon

actual client compile fix

Implemented catapult incendiary ammo model Updated icon and recipes Naming

Merge: from main Tests: Booted editor - no errors

emit_continuously additions & changes Added fields "emission count scale control point" & "emission count scale control point field" Added "emission_start_time max" to "emit_instantaneously" Enable DMX versions 3, 4 and 5 loading Mostly intended for PCF, saves still as version 2. This should allow Portal 2 and L4D particles to load correctly (excluding missing particle operators/renderers) DMX versions 3,4,5 tools support (datamodel.dll) Allow loading PCF version 2 in tools Particle system changes from CS:GO Many potential crash fixes Added particle operators: C_OP_DecayMaintainCount, C_OP_AlphaDecay, C_OP_FadeInSimple, C_OP_FadeOutSimple, C_OP_RadiusDecay Added particle force generators: C_OP_ParentVortices, C_OP_TimeVaryingForce, C_OP_TurbulenceForce, C_OP_ForceBasedOnDistanceToPlane Added new particle constraint: C_OP_BoxConstraint Added new options to C_OP_WorldTraceConstraint - "minimum speed to kill on collision", "Confirm Collision", as well as apply potential crash/garbage data fixes Particle initializers updates "Particle Increment Amount" for C_INIT_CreateFromParentParticles Various small optimization changes Added new particle operators "Oscillate Scalar Simple", "Oscillate Vector Simple", "Remap Difference of Sequential Particle Vector to Scalar", "Movement Maintain Offset", "Movement Place On Ground" More particle operators Added "Alpha Fade and Decay for Tracers", "Restart Effect after Duration", "Stop Effect after Duration" operators New parameters: "additive" for "Noise Scalar", "Noise Vector" "output field" for C_OP_ColorInterpolate "output is scalar of current value" for C_OP_DistanceToCP "rotation field" for C_OP_OrientTo2dDirection "output is scalar of current value" for C_OP_RemapDotProductToScalar Added even more particle operators from CS:GO "Override Max Velocity from this CP" and "Override CP field" for C_OP_MaxVelocity "use existing particle count" and "control point movement tolerance" for C_OP_MaintainSequentialPath Added operators: "Movement Lag Compensation", "Movement Lock to Saved Position Along Path" Particle initializer additions "Local Offset Min", "Local Offset Max", "Set Normal" for C_INIT_CreateFromPlaneCache "end offset", "bias lifetime by trail length" for C_INIT_MoveBetweenPoints "randomly select sequential CP pairs between start and end points" for C_INIT_CreateAlongPath "reverse warp (0/1)" for C_INIT_PositionWarp More particle system changes from CS:GO Endcap particle stuff. New parameters for all operators: "operator fade oscillate", "operator time offset seed", "operator time offset min"/max, "operator time scale seed", "operator time scale min"/max, "operator time strength random scale max", "operator strength scale seed", "operator strength random scale min"/max, "operator end cap state" Particle intitializer updates from CS:GO "scale cp (distance/speed/local speed)" for C_INIT_CreateWithinSphere "randomly_flip_direction" for C_INIT_RandomRotationSpeed and C_INIT_RandomRotation "shuffle" and "linear" for C_INIT_RandomSequence "use particle count instead of time" for C_INIT_PositionWarp "Use sequential CP pairs between start and end point" and "Save Offset" for C_INIT_CreateSequentialPath "collide with water" for C_INIT_LifespanFromVelocity Internal changes to certain particle initializers from CS:GO Added "Lerp EndCap Scalar" and "Lerp EndCap Vector" Ops New options for rope particle renderer "texture_offset", "scale CP start", "scale texture by CP distance", "scale scroll by CP distance", "scale scroll by CP distance", "scale offset by CP distance" Branch specific compile fixes Build 64bit particle editor

client compile fix

Catapult - added reload anim

Plushy crafting fix

- Redone siegetower constructable with the new model - Setup colliders for each stage - Use constructable stage 1 model as the guide mesh

Added small ramp so its easier to get in and out of the tower

- Cleaned up Siege Tower - New colliders for front entrace - Wired up doors to the dual damage system

Remove allocs in async pathfinding Make sure querying allies nearby doesn't return null or dead allies

updated rig and anims for mini crossbow

jungle skin - models and gibs

Ballista bolt effects tweaks

Ballista Spear -> Ballista Bolt Updated placeholder icons

Update: drop sound instances for variety of types on disable - HarborBridge - HarborCrane - PhoneDialler Tests: none, trivial changes

Bugfix: Stop DigitalClock from leaking sound instances when it's flags change - Also dropping sound refs on disable Tests: none, trivial change

merge from main

Update: drop sound refs when vehicles are destroyed - Magnet Crane - MLRS - Modularcar Garage - VehicleModuleSeating - Traincar audio Tests: none, trivial changes

merge from wire_slack_fix

merge from storagemonitor_passthrough

Added passthrough output to the storage monitor 'Power Out' now sends 1 power instead of passthrough - 1

jungle skin atlas/material update

Don't show game screen hostile warning text or menu UI timer remaining, if it's just a turret

Update: drop sound refs when ScrapTransportHelicopter is destroyed Tests: none, trivial change

Updated blowpipe skinning and animation adjustments on holding pose

Clean: removing empty override method Tests: none, trivial change

Update: drop sound refs when AttackHelicopter is destroyed Tests: none, trivial change

dropping resolution of grid by roughly 50%, still feels good to carve but gives a big speed and memory improvement

Update: drop sound references when ground vehicle is disabled Tests: rode a pedal bike, jumped of and destroyed it with console commands - saw expected debug log

Undo: of the previous undo to ensure we don't hold dangling references Although the resources are cleaned up, the pointers are not so we end up with stale pointers on entity recycle Tests: none, trivial undo

Only show warnings if in peacekeeper mode, powered, and player is not authed

fixed issues with non-square sculptures and increased height of ice sculpture by 25%

Undo: Partial undo of recent work to remove unnecessary DoClientDestroy callbacks - Turns out we already invoke cleanup for sounds that are attached to network entities - meaning we don't need to manually handle it in these cases. Was confused why pedal bike wasn't leaking it's sounds on destroy, and tracked it down to above mechanism. Tests: Tested compound bow and flamethrower still work and don't leak sounds

PowerCounter and ElectricSwitch minor optims

initial support for smoothing sculpture through a simple box blur on elements in a sphere - moved carving and blurring to jobs and running them directly on main thread, roughly 10x faster - upped carving radius and scaling hit guide properly to show it

increased size of sculpture to roughly 1m cube

ElectricBattery server optims Fixed battery deplete and charge commands not replying with the correct battery name

Fix wolves leaping at players that didn't climb on anything, or dying suddenly for no apparent reason Add better failed path vislogs

Electric button minor server optims Cleanup and formatting

properly set texture sizes in the import settings

added mini crossbow bolt smaller mesh version of the wood arrow - same material

network++