]> git.smokeofanarchy.ru Git - space-station-14.git/commit
Shuttle console + FTL rework (#24430)
authormetalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Sun, 3 Mar 2024 07:39:19 +0000 (18:39 +1100)
committerGitHub <noreply@github.com>
Sun, 3 Mar 2024 07:39:19 +0000 (18:39 +1100)
commitc5486873db0d6826122eb1f30007e392fc101082
tree25f87f7029d231d5ed89843ce77cc72290227ad6
parent2ef38f8a629726b5f4dbe94a443b69d91167a4ec
Shuttle console + FTL rework (#24430)

* Add shuttle interior drawing back

Just do it per-tile she'll be right, at least it's done with 1 draw call.

* Revamp shuttle console

* Bunch of cleanup work

* Lables sortito

* dok

* Pixel alignment and colours

* Fix a bunch of drawing bugs

* Shuttle map drawing

* Drawing fixes

* Map parallax working finally

* weh

* Commit all my stuff

* mic

* deez

* Update everything

* Xamlify everything

* uh

* Rudimentary blocker range

* My enemies have succeeded

* Bunch of changes to FTL

* Heaps of cleanup

* Fix FTL bugs

* FTL

* weewoo

* FTL fallback

* wew

* weh

* Basic FTL working

* FTL working

* FTL destination fixes

* a

* Exclusion zones

* Fix drawing / FTL

* Beacons working

* Coordinates drawing

* Fix unknown map names

* Dorks beginning

* State + docking cleanup start

* Basic dock drawing

* Bunch of drawing fixes

* Batching / color fixes

* Cleanup and beacons support

* weh

* weh

* Begin pings

* First draft at map objects

* Map fixup

* Faster drawing

* Fix perf + FTL

* Cached drawing

* Fix drawing

* Best I got

* strips

* Back to lists but with caching

* Final optimisation

* Fix dock bounds

* Docking work

* stinker

* kobolds

* Btns

* Docking vis working

* Fix docking pre-vis

* canasses

* Helldivers 2

* a

* Array life

* Fix

* Fix TODOs

* liltenhead feature club

* dorking

* Merge artifacts

* Last-minute touchup
99 files changed:
Content.Client/Administration/UI/ManageSolutions/EditSolutionsWindow.xaml
Content.Client/Atmos/Monitor/UI/Widgets/PumpControl.xaml
Content.Client/Atmos/Monitor/UI/Widgets/ScrubberControl.xaml
Content.Client/Atmos/Monitor/UI/Widgets/SensorInfo.xaml
Content.Client/Atmos/Monitor/UI/Widgets/ThresholdControl.xaml
Content.Client/Bed/Cryostorage/CryostorageEntryControl.xaml
Content.Client/Guidebook/Controls/GuideReagentEmbed.xaml
Content.Client/Humanoid/HumanoidMarkingModifierWindow.xaml
Content.Client/Medical/CrewMonitoring/CrewMonitoringNavMapControl.cs
Content.Client/Medical/CrewMonitoring/CrewMonitoringWindow.xaml.cs
Content.Client/Pinpointer/UI/NavMapControl.cs
Content.Client/Power/PowerMonitoringConsoleNavMapControl.cs
Content.Client/Shuttles/BUI/RadarConsoleBoundUserInterface.cs
Content.Client/Shuttles/BUI/ShuttleConsoleBoundUserInterface.cs
Content.Client/Shuttles/ShuttleConsoleComponent.cs
Content.Client/Shuttles/Systems/DockingSystem.cs
Content.Client/Shuttles/Systems/ShuttleSystem.Console.cs [new file with mode: 0644]
Content.Client/Shuttles/UI/BaseShuttleControl.xaml [new file with mode: 0644]
Content.Client/Shuttles/UI/BaseShuttleControl.xaml.cs [new file with mode: 0644]
Content.Client/Shuttles/UI/DockObject.xaml [new file with mode: 0644]
Content.Client/Shuttles/UI/DockObject.xaml.cs [new file with mode: 0644]
Content.Client/Shuttles/UI/DockingControl.cs [deleted file]
Content.Client/Shuttles/UI/DockingScreen.xaml [new file with mode: 0644]
Content.Client/Shuttles/UI/DockingScreen.xaml.cs [new file with mode: 0644]
Content.Client/Shuttles/UI/MapScreen.xaml [new file with mode: 0644]
Content.Client/Shuttles/UI/MapScreen.xaml.cs [new file with mode: 0644]
Content.Client/Shuttles/UI/NavScreen.xaml [new file with mode: 0644]
Content.Client/Shuttles/UI/NavScreen.xaml.cs [new file with mode: 0644]
Content.Client/Shuttles/UI/RadarConsoleWindow.xaml
Content.Client/Shuttles/UI/RadarConsoleWindow.xaml.cs
Content.Client/Shuttles/UI/RadarControl.cs [deleted file]
Content.Client/Shuttles/UI/ShuttleConsoleWindow.xaml
Content.Client/Shuttles/UI/ShuttleConsoleWindow.xaml.cs
Content.Client/Shuttles/UI/ShuttleDockControl.xaml [new file with mode: 0644]
Content.Client/Shuttles/UI/ShuttleDockControl.xaml.cs [new file with mode: 0644]
Content.Client/Shuttles/UI/ShuttleMapControl.xaml [new file with mode: 0644]
Content.Client/Shuttles/UI/ShuttleMapControl.xaml.cs [new file with mode: 0644]
Content.Client/Shuttles/UI/ShuttleNavControl.xaml [new file with mode: 0644]
Content.Client/Shuttles/UI/ShuttleNavControl.xaml.cs [new file with mode: 0644]
Content.Client/UserInterface/Controls/MapGridControl.cs [deleted file]
Content.Client/UserInterface/Controls/MapGridControl.xaml [new file with mode: 0644]
Content.Client/UserInterface/Controls/MapGridControl.xaml.cs [new file with mode: 0644]
Content.Server/Salvage/SalvageSystem.Runner.cs
Content.Server/Shuttles/Commands/DockCommand.cs
Content.Server/Shuttles/Components/AutoDockComponent.cs [deleted file]
Content.Server/Shuttles/Components/FTLBeaconComponent.cs [new file with mode: 0644]
Content.Server/Shuttles/Components/FTLComponent.cs
Content.Server/Shuttles/Components/FTLDestinationComponent.cs [deleted file]
Content.Server/Shuttles/Components/FTLExclusionComponent.cs [new file with mode: 0644]
Content.Server/Shuttles/Components/RecentlyDockedComponent.cs [deleted file]
Content.Server/Shuttles/Systems/ArrivalsSystem.cs
Content.Server/Shuttles/Systems/DockingSystem.AutoDock.cs [deleted file]
Content.Server/Shuttles/Systems/DockingSystem.Shuttle.cs
Content.Server/Shuttles/Systems/DockingSystem.cs
Content.Server/Shuttles/Systems/EmergencyShuttleSystem.Console.cs
Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs
Content.Server/Shuttles/Systems/RadarConsoleSystem.cs
Content.Server/Shuttles/Systems/ShuttleConsoleSystem.Drone.cs
Content.Server/Shuttles/Systems/ShuttleConsoleSystem.FTL.cs [new file with mode: 0644]
Content.Server/Shuttles/Systems/ShuttleConsoleSystem.cs
Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs
Content.Server/Shuttles/Systems/ShuttleSystem.GridFill.cs
Content.Server/Shuttles/Systems/ShuttleSystem.cs
Content.Shared/Parallax/ParallaxComponent.cs
Content.Shared/Shuttles/BUIStates/DockingInterfaceState.cs [new file with mode: 0644]
Content.Shared/Shuttles/BUIStates/DockingPortState.cs [new file with mode: 0644]
Content.Shared/Shuttles/BUIStates/NavBoundUserInterfaceState.cs [new file with mode: 0644]
Content.Shared/Shuttles/BUIStates/NavInterfaceState.cs [moved from Content.Shared/Shuttles/BUIStates/RadarConsoleBoundInterfaceState.cs with 53% similarity]
Content.Shared/Shuttles/BUIStates/ShuttleBoundUserInterfaceState.cs [new file with mode: 0644]
Content.Shared/Shuttles/BUIStates/ShuttleConsoleBoundInterfaceState.cs [deleted file]
Content.Shared/Shuttles/BUIStates/ShuttleMapInterfaceState.cs [new file with mode: 0644]
Content.Shared/Shuttles/Components/FTLDestinationComponent.cs [new file with mode: 0644]
Content.Shared/Shuttles/Components/FTLMapComponent.cs [new file with mode: 0644]
Content.Shared/Shuttles/Components/IFFComponent.cs
Content.Shared/Shuttles/Components/PilotComponent.cs
Content.Shared/Shuttles/Components/ShuttleMapParallaxComponent.cs [new file with mode: 0644]
Content.Shared/Shuttles/Events/DockRequestMessage.cs [moved from Content.Shared/Shuttles/Events/AutodockRequestMessage.cs with 64% similarity]
Content.Shared/Shuttles/Events/ShuttleConsoleFTLBeaconMessage.cs [new file with mode: 0644]
Content.Shared/Shuttles/Events/ShuttleConsoleFTLPositionMessage.cs [moved from Content.Shared/Shuttles/Events/ShuttleConsoleFTLRequestMessage.cs with 54% similarity]
Content.Shared/Shuttles/Events/StopAutodockRequestMessage.cs [deleted file]
Content.Shared/Shuttles/Systems/SharedDockingSystem.cs [new file with mode: 0644]
Content.Shared/Shuttles/Systems/SharedRadarConsoleSystem.cs
Content.Shared/Shuttles/Systems/SharedShuttleConsoleSystem.cs
Content.Shared/Shuttles/Systems/SharedShuttleSystem.IFF.cs
Content.Shared/Shuttles/Systems/SharedShuttleSystem.cs
Content.Shared/Shuttles/UI/MapObjects/GridMapObject.cs [new file with mode: 0644]
Content.Shared/Shuttles/UI/MapObjects/IMapObject.cs [new file with mode: 0644]
Content.Shared/Shuttles/UI/MapObjects/ShuttleBeaconObject.cs [new file with mode: 0644]
Content.Shared/Shuttles/UI/MapObjects/ShuttleExclusionObject.cs [new file with mode: 0644]
Resources/Audio/Effects/Shuttle/attributions.yml
Resources/Audio/Effects/Shuttle/radar_ping.ogg [new file with mode: 0644]
Resources/Locale/en-US/shuttles/console.ftl
Resources/Maps/Nonstations/nukieplanet.yml
Resources/Maps/Shuttles/infiltrator.yml
Resources/Prototypes/Entities/Markers/shuttle.yml
Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
Resources/Prototypes/Procedural/salvage_mods.yml
Resources/Textures/Parallaxes/space_map2.png [new file with mode: 0644]
Resources/Textures/Parallaxes/weh.txt [new file with mode: 0644]