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

Scale shortcut #10341

Merged
merged 1 commit into from Dec 13, 2019
Merged

Scale shortcut #10341

merged 1 commit into from Dec 13, 2019

Conversation

AN-2001
Copy link
Contributor

@AN-2001 AN-2001 commented Dec 6, 2019

it functions normally, only thing that's missing is the shortcut name in the shortCutBindingList, right now it's empty, I could add the text to eng-gb.txt but I thought that localization would take of that, do you think I should add it?

@IntelOrca
Copy link
Contributor

Yes always add new strings to en-GB.txt, it is only the other languages that are updated via the localisation repository.

@duncanspumpkin
Copy link
Contributor

duncanspumpkin commented Dec 8, 2019

Just needs a clang format and this will be good to go. In future stick to the commit message format. https://github.com/OpenRCT2/OpenRCT2/wiki/Commit-Messages

Fixes #10305

@AaronVanGeffen
Copy link
Member

In addition to the clang-format issues, please restore the whitespace surrounding the strings. It's there for clarity, and I'd prefer it to remain. :)

@@ -31,7 +31,7 @@
// This string specifies which version of network stream current build uses.
// It is used for making sure only compatible builds get connected, even within
// single OpenRCT2 version.
#define NETWORK_STREAM_VERSION "2"
#define NETWORK_STREAM_VERSION "3"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unnecessary, please revert this change. This only needs changing when the change could cause two clients to run different logic and lead to them inferring different state from same input.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Alright! thx for the info! btw is there any resources I can read to get a better understanding of how everything works,apart from the source code of course.

@duncanspumpkin
Copy link
Contributor

Argh could you also add an entry to the changelog.

@AN-2001
Copy link
Contributor Author

AN-2001 commented Dec 9, 2019

Argh could you also add an entry to the changelog.

alright! don't worry Ima read the wiki in a bit to stop making these stupid mistakes :>

@@ -3,7 +3,7 @@
- Change: [#1164] Use available translations for shortcut key bindings.
- Fix: [#10228] Can't import RCT1 Deluxe from Steam.
- Fix: [#10325] Crash when banners have no text.

- Feature: [#10305] Add two shortcuts for increasing and decreasing the sacling factor.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Leave a blank line between versions. Also, there's a typo, "sacling"

@@ -3,6 +3,7 @@
- Change: [#1164] Use available translations for shortcut key bindings.
- Fix: [#10228] Can't import RCT1 Deluxe from Steam.
- Fix: [#10325] Crash when banners have no text.
- Feature: [#10305] Add two shortcuts for increasing and decreasing the scaling factor.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Features should be placed at the top of the changelog.

@janisozaur janisozaur merged commit 1ace96c into OpenRCT2:develop Dec 13, 2019
@AN-2001 AN-2001 deleted the scale_shortcut branch December 14, 2019 05:10
XplosiveLugnut pushed a commit to XplosiveLugnut/OpenRCT2 that referenced this pull request Apr 27, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants