Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Implmement trading post and finish shuttle refactor cherry-pick #941

Merged
merged 20 commits into from
Mar 11, 2024
Merged

Implmement trading post and finish shuttle refactor cherry-pick #941

merged 20 commits into from
Mar 11, 2024

Commits on Mar 8, 2024

  1. Add trade stations (#23863)

    @metalgearsloth @DebugOk
    metalgearsloth authored and DebugOk committed Mar 8, 2024
    Configuration menu
    Copy the full SHA
    fa61952 View commit details
    Browse the repository at this point in the history

  2. Modify trade station for Delta

    @DebugOk
    DebugOk committed Mar 8, 2024
    Configuration menu
    Copy the full SHA
    76d0641 View commit details
    Browse the repository at this point in the history

  3. Run fixgridatmos on trading outpost (#24264) 

    (cherry picked from commit 129892f1442fa0873b907aaf822a9a6d617d2ecf)
    @metalgearsloth @DebugOk
    metalgearsloth authored and DebugOk committed Mar 8, 2024
    Configuration menu
    Copy the full SHA
    8246734 View commit details
    Browse the repository at this point in the history

  4. Update Trading Outpost (#24281) 

    * add

* yes

(cherry picked from commit 83640863699720bce708af20ae0bc37ce2a9ff54)
    @UbaserB @DebugOk
    UbaserB authored and DebugOk committed Mar 8, 2024
    Configuration menu
    Copy the full SHA
    b330429 View commit details
    Browse the repository at this point in the history

  5. Clear cargo orders on approval (#24278) 

    (cherry picked from commit f82fd23f2c87b7cab852bdc2563cfa30c2d2a6dd)
    @metalgearsloth @DebugOk
    metalgearsloth authored and DebugOk committed Mar 8, 2024
    Configuration menu
    Copy the full SHA
    fa3e17d View commit details
    Browse the repository at this point in the history

  6. Update Trade Station (#24295) 

    add

(cherry picked from commit 00e770d4dc68f98ecc8a3ef1605277fc2c59fb8f)
    @UbaserB @DebugOk
    UbaserB authored and DebugOk committed Mar 8, 2024
    Configuration menu
    Copy the full SHA
    0f85467 View commit details
    Browse the repository at this point in the history

  7. Resave trading outpost (#24536) 

    Removes metadata merge alongside space-wizards/RobustToolbox#4861

(cherry picked from commit 6ae45378715b9f8fc843a28b762f8b785330f28d)
    @metalgearsloth @DebugOk
    metalgearsloth authored and DebugOk committed Mar 8, 2024
    Configuration menu
    Copy the full SHA
    5c7b5ac View commit details
    Browse the repository at this point in the history

  8. Fix centcom cargo gifts (#24701) 

    (cherry picked from commit 3933490962993e839c71efea46c3e799ac824778)
    @themias @DebugOk
    themias authored and DebugOk committed Mar 8, 2024
    Configuration menu
    Copy the full SHA
    554f664 View commit details
    Browse the repository at this point in the history

  9. Update cargo guidebook entry and other minor guidebook changes (#24828) 

    * Minor cloning change in guidebook

Cloning this should be removed at some point anyway, but im unsure if it can still be found in salv? can anyone confirm?

* Changes and updates to survival, removed fluff

* Create TradeStation.xml

* Forgor

* Change hex

* Rework this cause it was out of date

* Pointless spacing fixed (copy and pasted made it funny,)

* revert (somewhat)

Science cant set up cloning, so i just removed that part

* Remove more space

(cherry picked from commit 7ba6a278a410af8e894abd5798e4577a782f0f94)
    @Hmeister-real @DebugOk
    Hmeister-real authored and DebugOk committed Mar 8, 2024
    Configuration menu
    Copy the full SHA
    0129a6e View commit details
    Browse the repository at this point in the history

  10. Fix guidebook (#24947) 

    Co-authored-by: Kevin Zheng <[email protected]>
(cherry picked from commit 1837459614fde9a11c1e5f2a34b3f82fa92f7167)
    @Hmeister-real @DebugOk
    Hmeister-real authored and DebugOk committed Mar 8, 2024
    Configuration menu
    Copy the full SHA
    b7619d3 View commit details
    Browse the repository at this point in the history

  11. Made ordering multiple crates at cargo order multiple crates (#25518) 

    * please tell me this is empty

* it wasn't empty, fixing that

* This should fix it

* fix for the fix

* address changes

* fix

* Added some comments, hoping that failed test was a fluke.

(cherry picked from commit aa4e7c061939fbe314be97a2e7f559477b941c07)
    @PolterTzi @DebugOk
    PolterTzi authored and DebugOk committed Mar 8, 2024
    Configuration menu
    Copy the full SHA
    44613e6 View commit details
    Browse the repository at this point in the history

  12. 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

(cherry picked from commit c5486873db0d6826122eb1f30007e392fc101082)
    @metalgearsloth @DebugOk
    metalgearsloth authored and DebugOk committed Mar 8, 2024
    Configuration menu
    Copy the full SHA
    f102e8f View commit details
    Browse the repository at this point in the history

  13. Fix FTLToDock (#25803) 

    * Fix FTLToDock

- Removed Enabled coz unneeded really.
- Fixed SetCoordinates call that got dumped at some point oop.

* Fix this docking check

(cherry picked from commit 92872e546ad5c281980ab8f56fea970c1921f8e4)
    @metalgearsloth @DebugOk
    metalgearsloth authored and DebugOk committed Mar 8, 2024
    Configuration menu
    Copy the full SHA
    f5a6a11 View commit details
    Browse the repository at this point in the history

  14. Fix shuttle console UI scaling (#25807) 

    (cherry picked from commit b7ccf738883b486364b10b272ce4c9fef3ad6261)
    @metalgearsloth @DebugOk
    metalgearsloth authored and DebugOk committed Mar 8, 2024
    Configuration menu
    Copy the full SHA
    772218a View commit details
    Browse the repository at this point in the history

  15. Fix FTL docks not opening (#25808) 

    (cherry picked from commit 21a95960f0fd04b6d99cd7c6617985a7eb5e9175)
    @metalgearsloth @DebugOk
    metalgearsloth authored and DebugOk committed Mar 8, 2024
    Configuration menu
    Copy the full SHA
    5ada275 View commit details
    Browse the repository at this point in the history

  16. Fix shuttle IFF drawing (#25821) 

    Didn't account for UI scale properly I love transforms.

(cherry picked from commit 87e2755c31a972f8839b408e5cf78d4665533927)
    @metalgearsloth @DebugOk
    metalgearsloth authored and DebugOk committed Mar 8, 2024
    Configuration menu
    Copy the full SHA
    02c58d4 View commit details
    Browse the repository at this point in the history

  17. Fix drone console docking (#25822) 

    (cherry picked from commit 4b6e5deb59f53d8d66a2ea9f7af276c0f2aff19d)
    @metalgearsloth @DebugOk
    metalgearsloth authored and DebugOk committed Mar 8, 2024
    Configuration menu
    Copy the full SHA
    27f43cc View commit details
    Browse the repository at this point in the history

  18. Fix exped FTL (#25823) 

    Also fixed some other stuff I noticed.

(cherry picked from commit c23b3d804efc7f35cf6c56d872d8dd7fee82ece1)
    @metalgearsloth @DebugOk
    metalgearsloth authored and DebugOk committed Mar 8, 2024
    Configuration menu
    Copy the full SHA
    132d026 View commit details
    Browse the repository at this point in the history

  19. Fix docking fallback (#25854) 

    Only thing that even triggers it atm is escape pods.

(cherry picked from commit bbb78807c43a9c22b08cf055339dbb74e8ab5d4c)
    @metalgearsloth @DebugOk
    metalgearsloth authored and DebugOk committed Mar 8, 2024
    Configuration menu
    Copy the full SHA
    c30ff6e View commit details
    Browse the repository at this point in the history

  20. Fix shuttle disabling on ftl (#25859) 

    Branch moment.

(cherry picked from commit 574c625d124ba086f03d327be28d961c680dbd73)
    @metalgearsloth @DebugOk
    metalgearsloth authored and DebugOk committed Mar 8, 2024
    Configuration menu
    Copy the full SHA
    5de30d1 View commit details
    Browse the repository at this point in the history