136,916 Commits over 4,324 Days - 1.32cph!
merge from Frame_Playerboats
merge from artist_pack_dlc
merge from smallartistframe_placement_fix
merge from artistpack_storepage
merge from paintballgun_viewmodel_fix
merge from boat_destroy_ents_fix
Fixed small artist canvas frame being placeable on top of itself
merge from strenghtenedwindow_rugs_fix
Restored rug and bear rug prefabs to their versions before rug_window_fix
Set paintable window glass collider layer to Construction too
Restored strengthened window glass collider layer to Construction
Implement no respawn icon for player boats
Subtract subtraction of naval_update merge, fix compile error on server
▋▍▇▄▅█▄▌▋▊▆▉█▆ █ ▉▉▊▅▅█▌▌▌▌▇▋▆▉ ▇▅▆█▄█▅▌ ▆▄▍
Fix null exception when quickly switching between paintball guns
In editor client server, PrefabPreProcess::Process always make a copy of the prefab even if no processing is needed, to avoid touching the asset
This fixes instantiated prefabs saved as disabled after playmode
subtracting
142870 naval_update merge
merge from island_shore_seam_fix
merge from minor_turret_adjustments
▅▌█▉▍▇▍ ▇▍ ▄▄▅▊▊▉▅▉▇▍█ ▉▄▋█▅▌▋▍ ▉▋ ▉▇▉▌▍▌▄█▌▄▌█▊▋▌▌▍▄▉▄▊▌▆▉ ▌▄▅▄█ ▅▉ ▍▋▆▉▊▉▋ ▊▋▄▄█ ▍▉ ▄█▍ ▉▆▌▋ ▇▉▅▋▄ ▄▄▍▊▄▄▋█▌▋█▆▅ ▇▅ ▇▌▄▉▇ ▇▍▌▊▆ █▅▆▌▉▆▅ ▌▊█▋ ▋ ▅▍▄▋▉▋▇▍▋█▌ ▋█▉▉ ▉▇▋ ▅▆▇ █▊▌█▉▆█▇██ ▍█▊▋▄ █▊▋▅▉ ▋█▍▆
merge from pt_turret_reload_mag_fix
scientist_boat_aggro_fixes -> main
▍ ▉▌▌▇▇▇▇▍ ▅ ▅▌▅█ ▍▅▅▇ ▋▇█▅▇▊ ▇▊▌▍▇ ▆▉▆ ▇▊▅██▄▉█▊▆ ▅▌ ▊▌▆▌ ▋▄▊ ▆█▌ ▆▌▅▆█▊ █ ▇▍▊▉▍ ██▇█▊▅▌▇▊ ▅▄▉▄▉ █▍▆▇▉▇▋██ ▇▆▆▉ ▌▄▇▇█▇▊ ▇▋▉▆ ▇▉▇ ▅▆ ▄▋▊▅▍▆█▅ ▉▄▅▅▄ ▄▍▆█▊ ▄▆▇ ▌▉▆▇▅ ▋█▍▄▄▄▉▆▇
scientist_boat_aggro_fixes -> main
Ensure scientist boats dont target players deep underwater
ptboat_front_turret_nerf -> main
Nerf PT Boat front turret
- Allow BaseProjectile turret scaling to be used with MountedWeapons for AI
- Fix HumanNPCs not recognising inflictor name whilst using a MountedWeapon
mounted_weapon_seat_errorspam_fix -> main
mounted_weapon_seat_errorspam_fix -> main
Optimisations on dev tool opening/closing
Renamed the branch new_console-ui
Cleanup
Tools tab HUD components toggles
Apply lightmap with lightstyles fix from CS:GO
* Seems to help a little on MC:V maps
Minor cleanups
Make game.GetMapVersion also return the BSP version
Apply a tiny fix for dynamic lights (Light tool) for bumped lightmaps
* This is the difference: https://files.facepunch.com/rubat/2026/February06-2318-JoyousQueenslandgrouper.mp4
Minor changes from CS:GO to do with float bumped lightmaps
Apply same limitations of render.CapturePixels to render.Capture
* Allow render.Capture on rendertargets
Fixed some potential crash issues
chat.AddText handles numbers
Placeholder notify for third person reload sound
merge from fix_texture_streaming_naval
* Changed entry point from a menu that checked children based on selected object to a context menu on the UI_Settings component itself (thanks Flavien for suggesting this approach).
* Removed Parents, replaced with catregory (it's broader but will suffice for current need).
* Lots of tidying up
* Removed the now redundant MenuUI2_Settings_Export class and namespace (they were only added in this branch).
Charcoal Box - texture and gibs update
Added horse mask to the skin viewer
merge from LNY26/skinviewer
- Swap weapon seat lazy loading so that it runs with a time gate instead
- Remove error
merge from LNY26/skinviewer
Skin viewer scripts folder cleanup
Fix rhib/pt boat ai driver causing to stream network errors when saving a rhib/pt scientist boat thats had its ai driver killed
silly horse mask world model prefab setup
Added silly horse mask to the skinviewer
