129,836 Commits over 4,232 Days - 1.28cph!
propane_stack_size -> main
Update Propane Tank stack size from 5 -> 20
merge from localcoord-blend-layer
Merge: from profiling_improvements
- Moves core of ServerProfiler to an unmanaged DLL - this deals with various mod issues and massively reduces recording overhead (less than 10% vs previous up to 7x).
- Snapshot marks are prefixed with assembly name
Tests:
- 3 times in a row: Generated snapshot in editor on Craggy
- 5 times in a row: Generated snapshot in Release standalone server with 6k world and 190k entities (with borked and good harmony mods)
- 3 times in a row: Generated snapshot in Debug standalone server with 6k world and 190k entities (with borked and good harmony mods)
- Built Wint64 client (debug and relase); booted up release
Set battering ram gibs mesh to read/write enabled
Updated gibbable component
▌▍▆ ▍▅▌▆▉▇▄▅▌▊ ▅█▍▄▆▇█ ▇▆ ▄▋▇▆▌▌ ▄▊▌▄▋▉ ▋▇▌▊▊▄ ▉▉▋▇▍▉▋▋▍ ▌▋▆ ▊▄▊▉▌█▉▍▍▇█
- ▊▅ ▅▅ ▅█▄▄ ▇▊▇ ▌▌▉▋▌▌▉▄▍ ▅▍▊█▊▌▅ ██▅ ▋▄ ▆▄▄▆▌█▉▇ ▌▌ ▇▉▇▅▋▄▅▉ ▋▇▍█▇▋█ ▊█▆▆▊▊▅▌ ▆▊▋██▄▇▄▋ ▅▇▉▄▄█▄▅▆▌
Mini crossbow icon render setup and icon
Update: Avoid shipping ServerProfiler to clients
- Done by deleting the dll after it's built
Tests: Build Win64 Client Debug and Release - no more dll
Update Catapult Flammable Ammo Textures and LODS
launcher reload bug fix attempt 1 + dryfire additions/improvements
exported wolf attack ledge animation
drawbridges door prefabs and setup, anim controllers
Save/load permanent RCON IP bans
Merge from main to jungle ruins
Mini crossbow:
- Swapped world model to use the viewmodel for just now
- Added multi swap arrow script to support multiple swap arrows in different slots
Update: added Assembly name to the snapshot marks
Makes it a bit clearer where calls are coming from at the expense of larger snapshot(compressed: 2mb -> 7mb, json: 50mb->140mb). But, since the profiler is much faster now, the snapshots are smaller on 6k servers.
Tests: exported 2 snapshots from Editor's Craggy, and exported 5 from standalone 6k server
Bugfix: Prohibit constexpr initialization of mutexes in ServerProfiler.Core
Turns out the toolset I'm using produces non-binary compatible assembly - using an escape hatch to avoid this issue. This only manifested in standalone builds.
Tests: exported 5 snapshots from procgen 6k world in a row over 2 minutes. Used both borked and good hamony mods as well.
merge from upgrade_forgiveness
merge from skin_change_noclip_fix
▍▋▊▌▄ ▉▆█▊ ▍▅▅▉█▌_▅▄▋▇▋▇▍_▊▉▊▌▅▇▉▄_▌▄█▉█▊▇
█▉▍▉▉ ▋▋▍█ ▊██▌▍_▅▉▊▄▇_▇▅▊█▅▉▅
▍▆▆▇▅ ▌▇█▇ ▆▋▊▅▇█_▍▆█▆▍▄_█▆▌█▉█_▄▍█▅▉
█▍▉▅▊ ▍▌▍▆ ▌▍▌█▌▋▇▋▌▆_▉▍▆▅█_▇▌▉█▋▊
removed copied crossbow files from blowpipe folder, added/set up worldmodel prefab
anim import options for drawbridges
clipped the open anims on the drawbridges to be the correct span
New view model and 3rd person blowpipe animations set up
Bugfix: fixed incorrect time scale in reports
- Also replaced the debug dll with a release one (interestingly, this also removed quite a lot of scopes in the report)
Tests: exported snapshot from Craggy in editor
Merged battering ram gibs
Updating catapult rig with new mesh LODs
▍▊▍▇▉▆▌ ▍▄▆▋▌ ▅█ ▅▄▆▊▋▊▉▋ ▄▅ ▊▇▅▇▋▅▄▉ ▄▄▅▋ ▍█▉▉▆▅▍ ▊▌▊▊▌▅▄▌▊▋▄, ▌▆▉▌▋, ▆▅█ ▅▌▅▅▋▄ ▇▇▄'▋ ▅▆▇▇ ▌█▇▍▊▆
cherrypicking aux2 ice_sculpture fixes
Bugfix: various issues that snuck in during rewrite
- Turns out unmanaged threads get destroyed by engine, so needed to add deferred clean up of collected telemetry - this fixed editor crashes and crashes in export thread
- I accidentally recorded allocations for worker threads only - flipped to record main thread only
- I was emitting methods for MethodExit and MethodException marks, which is unnecessary - cleaned up
Still need to fix timestamp conversion on export, that'll be next
Tests: exported snapshot from Editor's Craggy
fixed 3rd person cake to display corredct birthday number, also tweaked materials for better SSS and jam colour/height
Fixed offset battering ram scoop
Merge from december24_art_fixes/tutorialcleanup
Moved the tutorial island scene to the Test subfolder so it is separate from actual scenes used in the game or S2P
Created a new TutorialIslandSceneDressing nested prefab that contains all of the content from the scene. Some of this set dressing had been updated just in the prefab and not in the scene so this resolves some issues
Added a big written note to the top of the Tutorial Island scene to discourage edits, we still need the scene in order to rebake out the terrain mesh or foliage
Added missing texture maps for catapult. Added battering ram hardware gibs.
PSA -- Please do not duplicate content. Use nested prefabs instead -- moved cliffs and overgrowth content in tutorial island scene in release folder to nested prefabs since the actual tutorial island is a manual reconstructed prefab copy in the missions folder, this at least saves us from manually rebuilding the target prefab when it comes to these objects and it can be updated externaly. kthx
merge from skin-bundles-2024-11
merge from rfbroadcaster_powerloss_fix
merge from tod-dithering-disable
collider fixed on barge 3600
Merging .editorconfig from main/StandardCodeFormatting
Don't load the keys_default.cfg file if a keys.cfg file already exists
