31,134 Commits over 3,897 Days - 0.33cph!
Merge from launcher reload bug
Merge from shred_helicopters (also includes the changed ignore.conf file that seems to keep changing)
Merge from hab_hominglauncher
Merge from ai_wolf_iteration
merge from fix_teleport2grid_foundations -> main
Try fixing compile error from junkpile despawn
merge from qol_junkpile_despawn -> main
Merge: from VendingMachinePooling
Fixes a minor bug that caused Vending Machine's protobuf pool to inflate
Tests: spawned a vending machine on craggy, saved, loaded craggy again - marker was present. Monitored pooling stats - seemed normal.
Merge from admin_invis_command
merge from wire_slack_fix
Merge from ai_wolf_iteration
Restored monument marker font
▊▄▆▋▉ ▍█▄▊ ▇█▇▇▊▅▆█▊▋_▊▉▉▇▋▆▉▍▄▄_▌▉▍▉▉▉▅
▅▋▉▉▅ ▅▄▉█ ▄▊▉▊▅█_▉▄▄▋▆█▆▆▇_▅▌▄█▌▄▅▊▅▉▆
removed old dev dpvold prefab (unused)
Merge from shred_helicopters
Merge from cinematic_gestures
Include System reference, fixes compile error
merge from queue_improvements
merge from analytics_rcon_improvements
merge from analytics_identity_mgmt
Mere from peacekeeper_turret_hostile_warning_ui
merge from qol_variable_zoom_scope -> main
merge from qol_variable_zoom_scope -> main
merge from qol_dropbox_new_slots -> main
Merge from discofloor_rotation
merge from ocean-edges-issue
Fixed item radioactivity NRE when loading a save with item that doesn't exist (happen a lot when switching in between aux2 and main using the same save)
Merge from ai_wolf_iteration
Safer TrainCar OnChildAdded behaviour
Manifest
Merge from oxygen_qol_tweaks
Fix exception from foliage tutorial change when entering play mode in the editor
Merge from ore_resource_optimisations
Merge from december24_art_fixes
merge from analytics_voice_chat -> main
Added a new localization key for train yard's skip container, to avoid conflicts with 'skip' the verb in other languages
Merge from peacekeeper_turret_hostile_warning_ui
merge from 2d-flickering-workaround
merge from wire_slack_fix
Merge: from soundmodulator_leak
- Fixed sound leaks from quickswitching scenarios
- Fixes wrong loop sound being played when coasting on a pedal bike
- Fixing flamethrower not playing sound when quickswitching while holding fire button
- Fixing pilot sound not played on taking out a flamethrower
- Recycle footsteps when their sounds end, instead of potentially incorrect preset time
Tests: played with a lot of weapons and vehicles while monitoring sounds via audio.printsounds and log.level Audio 2