110,890 Commits over 3,897 Days - 1.19cph!
Use the correct given amount
merge from battery_fullcharge_slot
Restored medium battery power in slot importance
siege tower construction mesh lods. lod fixes. guide mesh.
Setup with 4 spine bones (same as main)
▇▅▊▌▉▆▌ ▌▆▅▊ ▇▅▆▍▆▋▉▉ ▅▉▌█▇▊▇
merge from battery_fullcharge_slot
Merge: from soundmodulator_leak
Hopefully improving stuttering audio for ModularCrane in bad server conditions
Tests: while connected to a local staging server moved the arm and rotated the cabin
Make sure the aux output drain can’t exceed 1
Update: simplify MagnetCrane's audio handling
- this is an experiemental change, as in theory it should help stuttering audio, but couldn't validate in practice
Tests: while connected to a local staging server moved the arm and rotated the cabin(though I couldn't reproduce the original issue anyway)
Added knight armour assets and set up prefabs.
Make sure to set the full flag even when the current power in is 0
Fixed half full and very full flags not set correctly, this fixes the electric arcs effects not showing correctly on the medium battery
Make sure to set the full flag even when the current power in is 0
Fixed half full and very full flags not set correctly, this fixes the electric arcs effects not showing correctly on the medium battery
Re-applied 107994: fixed battery deplete and charge commands not replying with the correct battery name
Re-applied 107994: fixed battery deplete and charge commands not replying with the correct battery name
Send client selected timescale to the server. Request timescale for the client selected one
Don't actually prevent short rcon passwords... yet.
Don't actually prevent short rcon passwords... yet.
Added a "Fully Charged" output slot to all batteries
Will output 1 power when the battery is fully charged
merge from old_rocks_delete
List of prefabs removed: https://files.facepunch.com/Alistair/127/11/2024/6F64/plastic_eKsHP1tlho.png
Merge from blend_shaders_detail_layer to siege_weapons
merge from queue_improvements_2 -> main ...this time without guid corruption.
cinematic 4k car radio texture and material
frontier high wall and gate collider import options
car radio model and textures
materials and basic prefab setup
merge ice_sculptures->main
corrected carving bounds check - big performance gain
Shop name now reflected in stats page
Plushy crafting cost 50 cloth
Merge from simple_upgrade
Restore child entities.
Allow gates with locks to be upgraded again, copy the lock across instead.
manifest update post merge
- Add empty feed entry if theres no data yet
- Refresh colours
Fix in RustUI:
Menu options now respect having no icon on them. Rather than defaulting to an information icon
Force rebuild of the icon and text setup if the icon has no been swapped to no icon
Merge from simple_upgrade
Merge from simple_upgrade
▅▊▉ ▇▊█▅▆▆▆▌ ▇▍▇▌▊ ▄▇▉▍▌▍▅▌ ▉█▋ ▉▌▌▉▉▋▊▉▉ ▄▌▅▋▉▄▍ ▆▇▆▆ ▄▋▊▋▌▍▇▆▆▉▋▌▅ ▋▊ █▇▊▇▊▇▋▇ ▊▆▆▌█▌▍▌ ▉▇▆▊▋▆▄▋▉█▇▇▍
Merge: from main
Tests: none, no conflicts
