125,436 Commits over 4,171 Days - 1.25cph!
Merge: from main
Tests: none, no conflicts
Merged from siege_weapons
removing old autospawn cliff related prefab folders
merge ice_sculptures->main
added ice block to iconrender scene's ice sculpture
removing some incomplete unused content folder
removing old cliffs, old formations except types still in use, test folders
Merge from simple_upgrade
Re-exported rock_formation_mid_b_nrm to get rid of import errors
Merge from launcher reload bug
Added separate mask tiling and offset and blending to the detail mask in the blend shaders
Apply the same fix when going from loaded-> unloaded (should never really happen in reality, but there's no reason for it to take 0.25s)
Adjusted duration between unloaded <-> loaded in crossbow viewmodel to possibly fix the 0.25s delay before firing when a reload on the server takes longer than the client
Affects crossbow and speargun vms
added temp material values that I think make the ice look better - changes and request written up on task comments
Fixed the double reload bug for all weapons in BaseProjectile
Store a new reload cooldown that is 50% longer than the normal cooldown, cancel it when the client receives the reload (the local ammo changes)
Only need to store this new cooldown in case we don't receive a response from the server because the reload was rejected, in that case the regular reload functionality will start working after a few seconds
▍▉▍▋▊▇ ▆▋▇▌▄▅▊▅▅▆▄ ▄▋▍▋▆▍▍█▉▄
█▆▆█▅ █▋▆▆ █▆▇▍▊█▊▉█▋_▉▉▄▋▊▇▌▅_▊▄▄▋▅▌▌_█▅█▄▊
▍▄▉▆▋▉▇▋ ▅▄ ▉▊▇▅▋▄ ▅▌ ▊▅ █▌▉ ▆▆▆▇▄▋▆ ▇▌█▌▄ ▄▊ ▇█▍▅▌▄▉▍ ▅▍▉ █▆ ▍▍▍▊▊ ▅█▆▍█▆▆▍▌▋▊
fixed colliders on sculpture that were blocking some placement and block upgrades
Add Ice shader tessellation to forwardAdd pass, and make transmission map triplanar
Fix compile error in none.
Remove some randomly added Usings
refactored door.DrawBridge_01,02,03 prefabs to include skinmesh LODs
▋▄▉▅▅▌ ▌▊▍ ▇▅▋█▍▋▌▍ ▊█▆▅▇ ▌▋▆▋▋▌▍▅ ▊▆█▉ ▉▊▇▉▋▆▉▄▇▇ ▊▇▉█▉▍ ▋█▋▉▊▇ ▅▋▌█▄▍▋ ▋▋ ▍▇▌▇ ▄██▍ ▅▋▄▄█▅▍▆▇ ▇▄█▆▉
Ice shader tessellation with phong and bezier smoothing options
Merge from main (keeping main changes to external wall prefabs)
Don't show on default 5.56
Prototyping a way to show which ammo type is equipped on the itme icon, only hooked up on the assault rifle for now
Merge from oxygen_qol_tweaks
Fixed ItemModGiveOxygen working as an unintentional singleton and returning incorrect values to the oxygen time remaining vital if multiple dive tanks are in the players inventory
Fixed some rounding issues when using dive tanks after the last commit
Increase depth required to start losing oxygen to 1 (fully submerged)
Changed the Oxygen display on the vitals bar to a round instead of a floor, this should be more accurate (and now shows that you have 4s when entering the water instead of 3s)
Merge from launcher reload bug
Print reload time option now recommends a reload time based on a 0.34ms buffer
Updated both rocket launchers again
Merge from modding_prefabs
Added new greybox scene containing all cube prefabs (for testing)
Backlog of unsaved mapping/modding prefabs:
- More tiled cube prefabs; concrete, charcoal, gravel, ceiling, roof and plaster
- Cold and heat volume variants (low, med, high)
- Toxic/radiation water cube + cylinder prefabs
- Admin spawnable invisible 3x3 cube + wall
- Static fire prefabs (looping)
- Static xmas light string prefab
- Static spraycan decals
- Birthday cake prefabs
- Invisible static PressButton
move clouds to branch off main
- clouds can cast approximate shadows on world
- add exposure/contrast parameters
- add dedicated configuration for coverage worley
- adjust atmospheric haze mie scattering
- Got recent transactions displaying
- Fixed index
main -> vendingmachine_transaction_history
radiation_cube_support -> main
