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.

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

Minor maintenance on CaravanSplittingProxy #404

Conversation

SokyranTheDragon
Copy link
Member

  • The cancel button will be red to match the behaviour of other session dialogs
  • The proper translation key is used for travel supplies tab
  • GUI.Begin/EndGroup was replaced by Widgets.Begin/EndGroup to match vanilla dialog (it seems Widgets call fixes some Unity bugs on Linux/Steam Deck)
  • Removed a lot of temporary variables in DoBottomButtons
  • Cleaned up CaravanUIUtility.DrawCaravanInfo call by removing default values, removing new int?(), and inverting the conditional operator

@SokyranTheDragon SokyranTheDragon added the 1.4 Fixes or bugs relating to 1.4 (Not Biotech). label Dec 4, 2023
@Zetrith
Copy link
Member

Zetrith commented Apr 16, 2024

Can you take a look at the conflict?

@SokyranTheDragon
Copy link
Member Author

Oops, completely forgot about this. Will try to fix it in the next 1-2 days.

- The cancel button will be red to match the behaviour of other session dialogs
- The proper translation key is used for travel supplies tab
- GUI.Begin/EndGroup was replaced by Widgets.Begin/EndGroup to match vanilla dialog (it seems Widgets call fixes some Unity bugs on Linux/Steam Deck)
- Removed a lot of temporary variables in DoBottomButtons
- Cleaned up CaravanUIUtility.DrawCaravanInfo call by removing default values, removing `new int?()`, and inverting the conditional operator
@SokyranTheDragon SokyranTheDragon force-pushed the minor-caravan-splitting-proxy-maintenance branch from a074864 to 5d5601e Compare May 19, 2024 15:00
@SokyranTheDragon
Copy link
Member Author

I think that this should be it. I've tested it and it seemed fine on my end.

@Zetrith Zetrith merged commit 7977a33 into rwmt:master May 24, 2024
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
1.4 Fixes or bugs relating to 1.4 (Not Biotech).
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants