Disabled global trees

Networked tree billboard manager/renderer - initial commit

prevent players exploiting inside large furnace

Stage descriptions in main menu Fix for error when progression data is empty Merge branch 'master' of SpaceUsurperUnity

Update README.md

Tiki torch prop Cleanup some missing script warnings Disable staff hire button New master data file, used for storing general non-settings data that isn't per save file Store which modal tutorials the player has seen and don't show them again

[D11] For for PS4 NpToolKit exception

Overloaded functions swap locations only on windows

[D11] Commented out UI Markup code to help compile times on consoles.

Missed file

[D11] [UI] fixed the first button in the crafting category sometimes not selecting properly

Unregister events

#1848, #1856, #1850, #1891, #1873, #1874, #1877, #1870, #1888, Added strings for; gun descriptions, changing seats, taking fuel

GetGlobals are in bytes, not array size Request the stats on startup, harmless enough but useful Changd SteamClient.Update to SteamClient.RunCallbacks

[D11] [UI] re-linked more variables and fixed some alignment issues

[D11] [UI] Commented out protection value scale hack. Protection should now use actual values until we know how we should actually display them.

[D11] DTLS plugin now has optional simple unencrypted UDP socket backend. Updated Windows console test app to work with it.

[D11] [UI] Adjusted item info spacing to better fit longer value strings. Changed colour of protections adjustment values to match item info adjustment values.

Cleaning up warnings

[D11] Deadzone 0 and sprint backwards fix

[D11] [UI] re-linked some variables that got unlinked switching defines

[D11] [UI] set a limit of 30 items in the crafting queue, and made certain parts of the pinned recipe element larger

[D11] Scrapman fix

merge from hapis_194

Some custom emojis for discord Get rid of serialisation warning WIP rest system - a way for props to pop periodic jobs that require player/staff attention Staff can reset props SFX and particles for retune radio job Replace sheets job for bedding

Interaction option work

Working on interaction UI changes. Going to support multiple interaction options at once (for NPC commands).

Update to 2019.1.0b7 for ecs updates WIP 2019.1 API upgrades More wall integration Lots more wall stuff WIP support for external walls Did some cleanup, removed old inventory system Cleaned up some missing component objects Jenkins? Merge branch 'ocean' into 2019.1 Compile/merge fixes Import ECS Navigation system WIP implementing navigation system Reset HasArrived, convert flags to bools Merge branch 'ocean' into 2019.1 Import animation baker WIP baked character setup, can override generated class name Can now bake specific datasets, instead of having to bake everything WIP new character renderer implementation, still some issues Merge branch 'master' into 2019.1 Merge branch '2019.1' of SkyCruise into 2019.1 Merge fixes Fix session create not finishing More wall stuff, moving some bit out of ECS, still needs lots of cleanup Unsaved WallSystem cleanup Support for double wide wall fills Railing support, more cleanup, delete support Merge branch 'master' into 2019.1 Merge fix Merge commit '11f898629b87ca68eecb0fcd6dbd869439f667a4' into 2019.1 # Conflicts: # Assets/AnimationBaking/CitizenEconomyFemale.2.Material.mat.meta # Assets/AnimationBaking/PassengerAnimatorComponent.cs.meta # Assets/Content/Props/DoubleArchway.prefab # Assets/Content/Props/Walls/WallRepresentation.prefab.meta # Assets/Scripts/Entities/Props/Prop.cs # Assets/Scripts/Entities/Props/Walls/WallFill.cs # Assets/Scripts/Entities/Props/Walls/WallFillVolume.cs.meta # Assets/Scripts/Entities/Ships/Ship.cs # Assets/Scripts/Generated/Generated.cs # Assets/Scripts/Player/Placement_SurfacePaint.cs # Assets/Scripts/Session.cs # Assets/Scripts/UI/UIPurchaseableDetails.cs Merge branch 'master' into 2019.1 # Conflicts: # Assets/Scenes/GameplayUI.unity # Assets/Scripts/Entities/RoomArea/RoomAreaPassengerCountSystem.cs # Assets/Scripts/Entities/Units/UnitECS/Unit+LineOfSight.cs # Assets/Scripts/Player/Placement_PremadeRooms.cs # Assets/Scripts/SkyCruise.Scripts.asmdef Merge fixes Jenkins Fix units not running action chains Baked hold positions, trigger fix Fix ECS init order, support scaling of animators Sync walking animation state Merge remote-tracking branch 'origin/master' into 2019.1 # Conflicts: # Assets/Scripts/SkyCruise.Scripts.asmdef Another merge fix Added support for look at in the navigator component, disable conversations for now WIP job click system Remove hudpopups after job is clicked, click handling Can now click complete restock jobs Jobs can mark themselves as not completable Click completes now play a sfx Can pick up rubbish by clicking Minimise clickup UI when transform is too far away from the camera WIP support for staff rooms only allowing staff member to perform jobs in a radius Added a pause while in fullscreen panels toggle in settings, defaults to true Enable click jobs for emptying rubbish bins Show an icon on the job popup if a staff member is handling the job Add range limits for stockpile restocking Pie charts can now animate their values in Click configs can now spawn a particle effect New optimised male premium model, fixed premium passengers not being included in build (!) Moved Clothing, outfits and MiscVisuals out of Content Rescaled expansion costs Merge branch 'master' into jobclicks Minimise clickable popups when ship shell is visible Load job popups on a game load Can now hire staff members directly for vacant work positions via a HUD popup Assign name and gender via entitystart Show room radius for staff rooms, enable generic method for declaring a radius display on rooms Locker prop Update staff room with new lockers and increase staff radius Refactors, new popup widget for staff room hiring/firing Update staff wander logic to leash staff to their staff room New hire effect for staff, spawn a particle effect and drop the staff from height Can fire workers from smart object inspector, more widget fixes Some sfx for hiring staff Unsaved Can now disable animation instancing via game config Restructed how on arrived callbacks are processed for units Added support for override stopping distances Merge branch 'master' into 2019.1 Fixed toggle group issue introduced in 2019.1 More toggle 2019 fixes More toggle fixes Fixed sessions not loading walls from blueprints More toggles Fixed staff spawning in inaccessible locations, updated starter furniture Fixed staff not getting on arrived nav callbacks, other pathfinding fixes Don't init animation systems if animation instancing is disabled Fixed disembarking logic Merge branch 'master' into jobclicks # Conflicts: # Assets/Scripts/Entities/Units/Passenger.cs Fix NRE in staff wander Show a description on hover for job clicks Better tooltips and custom fail texts in job tooltip Particle fx for crate restock Repair prop click effect Disable staff type checks (for now) Merge branch 'master' into resource_rework Merge fix

WIP job click system Remove hudpopups after job is clicked, click handling Can now click complete restock jobs Jobs can mark themselves as not completable Click completes now play a sfx Can pick up rubbish by clicking Minimise clickup UI when transform is too far away from the camera WIP support for staff rooms only allowing staff member to perform jobs in a radius Enable click jobs for emptying rubbish bins Show an icon on the job popup if a staff member is handling the job Add range limits for stockpile restocking Click configs can now spawn a particle effect Merge branch 'master' into jobclicks Minimise clickable popups when ship shell is visible Load job popups on a game load Can now hire staff members directly for vacant work positions via a HUD popup Assign name and gender via entitystart Show room radius for staff rooms, enable generic method for declaring a radius display on rooms Locker prop Update staff room with new lockers and increase staff radius Refactors, new popup widget for staff room hiring/firing Update staff wander logic to leash staff to their staff room New hire effect for staff, spawn a particle effect and drop the staff from height Can fire workers from smart object inspector, more widget fixes Some sfx for hiring staff Unsaved Merge branch 'master' into jobclicks # Conflicts: # Assets/Scripts/Entities/Units/Passenger.cs Fix NRE in staff wander Show a description on hover for job clicks Better tooltips and custom fail texts in job tooltip Particle fx for crate restock Repair prop click effect Disable staff type checks (for now)

WIP job click system Remove hudpopups after job is clicked, click handling Can now click complete restock jobs Jobs can mark themselves as not completable Click completes now play a sfx Can pick up rubbish by clicking Minimise clickup UI when transform is too far away from the camera WIP support for staff rooms only allowing staff member to perform jobs in a radius Enable click jobs for emptying rubbish bins Show an icon on the job popup if a staff member is handling the job Add range limits for stockpile restocking Click configs can now spawn a particle effect Merge branch 'master' into jobclicks Minimise clickable popups when ship shell is visible Load job popups on a game load Can now hire staff members directly for vacant work positions via a HUD popup Assign name and gender via entitystart Show room radius for staff rooms, enable generic method for declaring a radius display on rooms Locker prop Update staff room with new lockers and increase staff radius Refactors, new popup widget for staff room hiring/firing Update staff wander logic to leash staff to their staff room New hire effect for staff, spawn a particle effect and drop the staff from height Can fire workers from smart object inspector, more widget fixes Some sfx for hiring staff Unsaved Merge branch 'master' into jobclicks # Conflicts: # Assets/Scripts/Entities/Units/Passenger.cs Fix NRE in staff wander Show a description on hover for job clicks Better tooltips and custom fail texts in job tooltip Particle fx for crate restock Repair prop click effect Disable staff type checks (for now)

Repair prop click effect Disable staff type checks (for now)

Update pie menu to the modern age.

Merge to NPC interaction branch

Show a description on hover for job clicks Better tooltips and custom fail texts in job tooltip Particle fx for crate restock

- Fix unified inventory total cash change calculation. - Fix unified inventory Find and Take over multiple containers. Fixes show buy error when cash is spread between inventory and belt.

Update to 2019.1.0b7 for ecs updates WIP 2019.1 API upgrades More wall integration Lots more wall stuff WIP support for external walls Did some cleanup, removed old inventory system Cleaned up some missing component objects Jenkins? Merge branch 'ocean' into 2019.1 Compile/merge fixes Import ECS Navigation system WIP implementing navigation system Reset HasArrived, convert flags to bools Merge branch 'ocean' into 2019.1 Import animation baker WIP baked character setup, can override generated class name Can now bake specific datasets, instead of having to bake everything WIP new character renderer implementation, still some issues Merge branch 'master' into 2019.1 Merge branch '2019.1' of SkyCruise into 2019.1 Merge fixes Fix session create not finishing More wall stuff, moving some bit out of ECS, still needs lots of cleanup Unsaved WallSystem cleanup Support for double wide wall fills Railing support, more cleanup, delete support Merge branch 'master' into 2019.1 Merge fix Merge commit '11f898629b87ca68eecb0fcd6dbd869439f667a4' into 2019.1 # Conflicts: # Assets/AnimationBaking/CitizenEconomyFemale.2.Material.mat.meta # Assets/AnimationBaking/PassengerAnimatorComponent.cs.meta # Assets/Content/Props/DoubleArchway.prefab # Assets/Content/Props/Walls/WallRepresentation.prefab.meta # Assets/Scripts/Entities/Props/Prop.cs # Assets/Scripts/Entities/Props/Walls/WallFill.cs # Assets/Scripts/Entities/Props/Walls/WallFillVolume.cs.meta # Assets/Scripts/Entities/Ships/Ship.cs # Assets/Scripts/Generated/Generated.cs # Assets/Scripts/Player/Placement_SurfacePaint.cs # Assets/Scripts/Session.cs # Assets/Scripts/UI/UIPurchaseableDetails.cs Merge branch 'master' into 2019.1 # Conflicts: # Assets/Scenes/GameplayUI.unity # Assets/Scripts/Entities/RoomArea/RoomAreaPassengerCountSystem.cs # Assets/Scripts/Entities/Units/UnitECS/Unit+LineOfSight.cs # Assets/Scripts/Player/Placement_PremadeRooms.cs # Assets/Scripts/SkyCruise.Scripts.asmdef Merge fixes Jenkins Fix units not running action chains Baked hold positions, trigger fix Fix ECS init order, support scaling of animators Sync walking animation state Merge remote-tracking branch 'origin/master' into 2019.1 # Conflicts: # Assets/Scripts/SkyCruise.Scripts.asmdef Another merge fix Added support for look at in the navigator component, disable conversations for now Can now disable animation instancing via game config Restructed how on arrived callbacks are processed for units Added support for override stopping distances Merge branch 'master' into 2019.1 Fixed toggle group issue introduced in 2019.1 More toggle 2019 fixes More toggle fixes Fixed sessions not loading walls from blueprints More toggles Fixed staff spawning in inaccessible locations, updated starter furniture Fixed staff not getting on arrived nav callbacks, other pathfinding fixes Don't init animation systems if animation instancing is disabled Fixed disembarking logic Merge branch 'master' into jobclicks # Conflicts: # Assets/Scripts/Entities/Units/Passenger.cs Fix NRE in staff wander

Don't init animation systems if animation instancing is disabled Fixed disembarking logic

Update to 2019.1.0b7 for ecs updates WIP 2019.1 API upgrades More wall integration Lots more wall stuff WIP support for external walls Did some cleanup, removed old inventory system Cleaned up some missing component objects Jenkins? Merge branch 'ocean' into 2019.1 Compile/merge fixes Import ECS Navigation system WIP implementing navigation system Reset HasArrived, convert flags to bools Merge branch 'ocean' into 2019.1 Import animation baker WIP baked character setup, can override generated class name Can now bake specific datasets, instead of having to bake everything WIP new character renderer implementation, still some issues Merge branch 'master' into 2019.1 Merge branch '2019.1' of SkyCruise into 2019.1 Merge fixes Fix session create not finishing More wall stuff, moving some bit out of ECS, still needs lots of cleanup Unsaved WallSystem cleanup Support for double wide wall fills Railing support, more cleanup, delete support Merge branch 'master' into 2019.1 Merge fix Merge commit '11f898629b87ca68eecb0fcd6dbd869439f667a4' into 2019.1 # Conflicts: # Assets/AnimationBaking/CitizenEconomyFemale.2.Material.mat.meta # Assets/AnimationBaking/PassengerAnimatorComponent.cs.meta # Assets/Content/Props/DoubleArchway.prefab # Assets/Content/Props/Walls/WallRepresentation.prefab.meta # Assets/Scripts/Entities/Props/Prop.cs # Assets/Scripts/Entities/Props/Walls/WallFill.cs # Assets/Scripts/Entities/Props/Walls/WallFillVolume.cs.meta # Assets/Scripts/Entities/Ships/Ship.cs # Assets/Scripts/Generated/Generated.cs # Assets/Scripts/Player/Placement_SurfacePaint.cs # Assets/Scripts/Session.cs # Assets/Scripts/UI/UIPurchaseableDetails.cs Merge branch 'master' into 2019.1 # Conflicts: # Assets/Scenes/GameplayUI.unity # Assets/Scripts/Entities/RoomArea/RoomAreaPassengerCountSystem.cs # Assets/Scripts/Entities/Units/UnitECS/Unit+LineOfSight.cs # Assets/Scripts/Player/Placement_PremadeRooms.cs # Assets/Scripts/SkyCruise.Scripts.asmdef Merge fixes Jenkins Fix units not running action chains Baked hold positions, trigger fix Fix ECS init order, support scaling of animators Sync walking animation state Merge remote-tracking branch 'origin/master' into 2019.1 # Conflicts: # Assets/Scripts/SkyCruise.Scripts.asmdef Another merge fix Added support for look at in the navigator component, disable conversations for now Can now disable animation instancing via game config Restructed how on arrived callbacks are processed for units Added support for override stopping distances Merge branch 'master' into 2019.1 Fixed toggle group issue introduced in 2019.1 More toggle 2019 fixes More toggle fixes Fixed sessions not loading walls from blueprints More toggles Fixed staff spawning in inaccessible locations, updated starter furniture Fixed staff not getting on arrived nav callbacks, other pathfinding fixes Don't init animation systems if animation instancing is disabled Fixed disembarking logic

Fixed staff spawning in inaccessible locations, updated starter furniture Fixed staff not getting on arrived nav callbacks, other pathfinding fixes

Progress

warden bullet tweaked atom pattern trench form 1 plant guns respawn into different cores some trench balance Merge branch 'master' of SpaceUsurperUnity

Terrain belts progress

[D11] Fix server compilation error

[D11] Fix server log compilation error

[D11] Merge with main

Texture stuff

Cache skeletal model material slot names as a safer way to get sections by index or name