98,456 Commits over 3,683 Days - 1.11cph!
Merge from media_projects
Confusing not being able to fold. Let's always allow it even when checking makes the most sense
- Fixed poker offering no options to the remaining player when only one player can make moves (since others have already folded or gone all in). Sometimes there are still multiple relevant options, e.g. fold or call.
- Fixed gameplay now that these additional options are allowed.
One more layout change
Updated the scientist/animal icons in the extended life stats now that we have better icons
Layout, hide stats button
Added warning to death screen
Merge from main (lots of branches with map changes, trying to keep conflicts to a minimum)
Proper reference to global network group
Possible fix for minicopter seat getting removed from the client after flying through the parenting volume on the harbor swing bridge
Don't let the client move an entity into it's parent group if it is set to global broadcast (group id = 0) as that won't match with the group that it is in on the server
Merge from hide_health_aim
Rebuilt Small Rubbish Skip Prefab to have correct Scale and Rotation values
Updated Small Rubbish Skip Folder Locations
Updated Small Rubbish Collider Locations to be in the correct position
█▋▍▅▄▍▆ ▋▊▍▇▅▆█▅_▊▋▆▍▊_▇▉▊▋▌▉▅ ▉▇▄▅ ▅▆▍▆▅▍▊▉█▇ ▊▌▉█▉▆▉ ▍▅ ▄▊▋▅▋▌▅▆▆█ ▌▊▇▊▌▆▌▆▅▍▋. ▄▊█▇▊ ▋▅ ▆▆▇ ▉▊▆ ▍▉█▄ ▆▇▄▊█ ▄▊▊▇-▆▊▆▊▍▇▍ ▇▄▍▆▌ ▄▅▍▍▍▅▆ ▄▄▊▇▌▋▍ ▋▍ ▅▉▉▌▊▇ ██▄ ▊▇▆▊▍▍▉▅▆▆▆▄▋█▌. ▇▉▆▊ ▇█▌▄▉▄▆ █▇█▅▊
merge from ship_patrol_path_vis
merge from mission_disabled_ui_fix
merge from hide_health_aim
merge from crane_attachment_flyhack_fix
▆█▇█▇▍▊▋▊▄█ ▌▋▆▉▊ (▇▆▋▉▆ ▊▇▍▄▇ ▆▊▅▊▅▄ ▍▋ █▌▆▆▆▍▆█▇▊ ▆▉██▅▄▅, ▄▍█▅▊▅█ ▇▄▋▄▉▄▌) █▌▍ ▋▋ █▅▄▋▇▌▇▊ ▊▉▌▌ █▅ █▅▅▉ ▊▌▊▌▌▅▆ ▅▌▆▋▋▊▉▊█▊▄▍, ▅▅▆▇█▋▋▅▍▊ █▊▊ ▇▇▆▍▄▉▆ ▌▉▆▍▄
Updated Small Rubbish Skip Materials and Textures
Updated tiger assets - lods and materials
▊▇█▍▆▌▉▆▌█▇ ▇▌▊ ▊▇▇▍▉▌▇ ▍▅█▇▌▆ ▆▆▍▊▅▅▊ ▄▉ ██▄▍▌█▆▌▉▇▅▆█▅▇▌▌, ▄▋▋ ▆▍▉▇▊▆ ▍▌ ▌▅▆▆▉▅▌▍ ▍▉▄▌▊▇ ▍▄▋▍▌▅ ▊▋ ▇▅▌▇▆▉▍▊▇▉▉█▍█▅▌▋ ▇▆█▍▆▄ ▌▅▍ ▄▉▊ ▋█▌▆▅, ▋▄▇▆▌▇▄▆▆ █▇▅▇ ▉▌ ▍▆█ ▌▆▌▅▄▄▅▆█ █▄ ▊▅▊▆▌▊ (▄█ █▉▍▇▊▍▊ > ▉▍ ▊▉▊▊▉▄▄ ▍▇ ▊▄▇▅▉▌▉▆▊▇)
Merged main into wiretool_fixes2
▍▇▉█▄▋█▋ ▍▌▅ ▍▄▍▋ ▍█▉ ▇▅█▅▍▄▋▇▅ ▍▇ ▇▄▇▇█▉▅ ▊▊ ▌▍█▉ ▆▄▌▅ ▋▅▌ ▆▉▋▋▊▇▋▇▉ ▋▋▉█'▇ ▊▌▌▉▊█▉▆ ▋▋▇▊▌ ▌▍▅▉▊▄▅▅▌ (▇▊'▋▅ ▋▌▅▍ ▄█ ▍▅▊▅ ▄▊▄ ▋▆▍▋ ▍▇▍█▌ █▇▆▄▉▇ ▆▌▉▅)
setting up blunderbus 3rd person in unity
▍▋▅▄▅ ▍▉▋▋▅▊ ▇▋▍▇▋▊ ▇▆▇▅ ▊▊▇▉▄█▋▋▋▆▌▉▇: ▌▅▄▇█▌▍ ▍▅▌ ▋█▄▅▊▍▆▌▆▆, ▍▆▅▌█▄▉▌ ▍▍▌▌▌ ▇▄ ▆▊▆ ▌██ ▅▉▋▉▄▄▇▅▌██, ▉▇█▊▍ ▅▌▇▇▅▄▅▍ ▍▊▋ ▄█▆▄▍▌▋▋ ▊▇▆█▄ ▅▋▅▉▇▇█
▌█▆█ █▉▅▇▅ ▇▌▊ █▇▆▊▉█ ▉▊▉▋▍ ▊▍█▇▅█▍▊ ▉▊▅ ▌▊▅▋ ▉▇▋█ ▊▆█▊▍▋ ▍▄▉▅▌▊▍▅
setting up blunderbus 3rd person in unity
Hack to ensure damage effect comes up
- ▅▍▄▆ ▇▊▊▅▄▇▄▆▋▅ ▆▉▅▆ ▍▇█▉█▋ ▆▋▆▊▅▆ █▇▇▄▇▉▆█▆ (█▍▇▋▇▍▍▊▍)
- ▇▆▋▍▌ ▉▇▊ ▉▆▍▉▇▄▄▌▌▋▌ ▋▌▊▇▊▄ █▇▄▋ ▄▌▆_▄▇▇▍█▉▉▋ ▋▋▄ ▍█▊_▅▍▇▌█▆▄▍▅▊▌
- ▅▌▇▅▆ ▌██▋█▍▋▄▇▇▅▅▍▅▊▇▆ █▇ █▊▍_▊▊▅▅▆▊▄▇ ▊▅▉█▌▉
Can now grab count of hackable counts on cargo
Cargo will now stay long enough for the last crate to be looted should it exist
Strip roman candle client gameobjects from server
Merge main - fix conflicts
Merge main - fixed conflicts
- ▍▉█▉▊ ▊▅▅▅█▆ ▍▆ ▄▊ ▉▋▇▋ ▆▇▉ ▄▍ █▉█▋▍▌ ▉▆▅▌▉▆▊▄▌▍▋▅ ▅█▋▍▌
- ▌▉▅▌▇▄▍ ▋█ ▉█▄▅▆ █▆▆▌▍ ▌█ ██▍▋█▌ █ ▆█▊▆▉ ▊▉▅'▋ ▍▅ ▆▅▅▅▊▅▍ ▋▋ ▇▍▌▉ ▌▄█▇▅▆▄ ▌▆▉▉▍▍▆▉
added decal layer ID 1,2,3 to terrain material
merge from terrain-decal-fix
- ▇▅▍ ██▆▌▊█▉ ▉▄▌█▅█ ▊▆▉▆ ▋▇▆▆▍ ▇▅▊▉▋▊▍ ▅▋▌▍█▊▄▄▍▋▆▌ ▄▉▅▋▄▉▆▄▇, ▍▋▄▍▋█▄▅▆ ▄▋▌ ▉▍▄▊▅▍▄/▆▉▇▍▄▇/▅█▅ ▇▉▄▉▊▉▅▄▋
- ▄▋▅▍▍▊▊▉ ▍▉▉▅▅ ▍▉ ▅▌▌▊▋▍▉ ▉▄▍▋ ▋▄▅▆▍ ▋▄▌▄ ▆▍▆▉▊▆█ ▇▊▌▄▆▉▉ ▇▋ ▊▉▆▌▉▅▄▄▅▍▊
▌▌▆▆▍▇█ ▅▇▅ ▋▆▅▌█▌▆▊▉ ▌▉▄▄▌ ▌▋▆▍▇ ▍▇ ▋▋▋█▍ ▊▍▌▉▅█▊ ▋▉ ▊▌▋▍ ▇▅▊'▊ ▋▉ ▋▋▇▇ ▆▅ █▌▇ ▌▄▉███▅
▆▉▉▄▉ ▉▍▊▆ ▌▄▉█▇▋▆_▌▍▉▉█▌▌▉
merge from coffin_storageadaptor_fix
merge from waterpurifier_guidemesh_fix
