115,665 Commits over 3,959 Days - 1.22cph!
merge from lunar_new_year_2025
merge from isolate_Jan_wipe/LNY_merge_release_friendly
cherrypicking lunar_new_year_2025
Add rotation toggle and face cullmode options in foliage billboard shader. Update all relevant materials which had the old unused _Cull property with the default off.
When running "Populate T0" in tech tree editor tool, ensure that only items that are allowed in the era populate the tech tree
Merge from cmbrainenabled
Merge from cmbrainenabled
Fix cmBrainForceDisable convar running in edit mode
Ensure techtree filters out items that are not allowed in the era
- items don't move into the correct location yet but at least you only see items you can craft in the current era
Optimize opening tech tree to make it 4x faster
- 500ms -> 130ms lag spike
- 55MB allocation -> 13MB allocation
- initially thought it was above changes causing it but was long standing issue
Fixed swapping seats blocking the horse
Passenger can't send local input to the horse
Fixed door skins skin ids
Add menu item for "Update Game Manifest (optimized)" to allow you to use the faster generate manifest optimization in the editor (instead of only on the build server)
merge from primitive -> primitive_gm
Distortion voodoo to fake the rammed wall shaking on impact.
Merge from industriallights_skins
merge from primitive_gm -> primitive
Don't show train tunnel markers inside monuments on the map when underground tunnels is disabled (since they are blocked off with debris)
Some tests on changing the catapult boulder for a scatter shot
Change reward of shark hunt mission (since it gives out jackhammer but those are loot only now)
- 1 icepick + 3 med syringe instead
Change reward of "free crates" diving mission in primitive era
- used to be pump shotgun, but that's restricted now
- instead give 1 combat knife, 1 small backpack, 1 compound bow + 32 arrows
Add support for missions to return different rewards in each era
Update light skin ids so they don't conflict with primitive
Added a dedicated TerrainCollisionProxy collider for the horses
Removed custom rotation pivot on the snake mask, re-enabled the 3d view in the store
Fixed horses standing on trough in ranches
S2P both ranches
Make sure to include any passenger when ragdolling the horse driver
Fixed horse double saddle culling
Closed battering ram cockpit door
Scaled up the wheel a lil bit and added suspension
Fixed battering ram not using its VehicleChassisVisuals
Updated BatteringRamVisuals to move the axles
Cleaned up BaseSiegeWeaponVisuals
Updating more player seeds to v4 rig
fixed slight gaps around wall frame semi circle on swirling wallframe
merge from main -> primitive_gm
