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

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)

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)

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

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

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

[D11][Tutorial] Locked item check now checks against itemID

fixed 40mm smoke grenades colliding with player

Scene setup

Hide sections using slot hidden sections instead of prop asset Also setup hidden sections for attached clothing prop Add GetMeshSectionIndex and GetMeshSectionName for skeletal model entities

increased lr300 condition to match ak

[D11] [UI] Removed Debug Log.

Adjusted layout and functionality of Player Protections Panel/Resistances. TODO: Fix numbers being inconsistent with base player protection values.

Disable GPU skinning on xb1 due to 2019.1 crashhhhyycrashy

[D11][UI][#1182] Removed post processing from player preview

[D11][Tutorial] Fix for issue #1926, crash caused by shelter campfire not being the correct variant

Usaboility tweaks

Deployables can no longer be stacked. Things like TVs etc. can still be placed on tables etc. though.

[D11] [Audio] Fixes voice chat

[D11] [Audio] Fixes voice chat.

Should fix NRE in ConfiscatedItems

Updated gun descriptions, added strings changing seats

Try to dynamically determine the OS MacOs loading Special path for Windows call convention when returning a SteamId

Fixed RUST-295 (Pie menu icon colour invert not switching)

[D11][Tutorial] Added achievement award for finishing tutorial

[D11] Move JSON log files to server identity directory

Fix for map compression on xb1 (don't use fastmath)

[D11][Tutorial] Fix for issues #1901 and 1785, Swapped button prompts, different messages will display depending on tutorial finished, fixed tutorial UI options

[D11] Fix for pressing Start and then immediately trying to open the Inventory/Crafting menus causing overlapping UI

[D11] Updated manifest