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

Move hardcoded ChromeLogic hotkeys to yaml #13711

Merged
merged 4 commits into from Aug 31, 2017

Conversation

Projects
None yet
3 participants
@pchote
Member

pchote commented Jul 23, 2017

Also enables lint testing.

Depends on #13706.

StopMusic();
else if (key == Game.Settings.Keys.PauseMusic)
else if (key == pauseKey.GetValue())
PauseOrResumeMusic();
}

This comment has been minimized.

@rob-v

rob-v Aug 6, 2017

Contributor

couldn't/shouldn't return it true when key is handled like in other cases?

@rob-v

rob-v Aug 6, 2017

Contributor

couldn't/shouldn't return it true when key is handled like in other cases?

This comment has been minimized.

@pchote

pchote Aug 25, 2017

Member

Possibly, but that's out of scope of this PR.

@pchote

pchote Aug 25, 2017

Member

Possibly, but that's out of scope of this PR.

Show outdated Hide outdated OpenRA.Mods.Common/Widgets/Logic/Ingame/ObserverShroudSelectorLogic.cs
@reaperrr

This comment has been minimized.

Show comment
Hide comment
@reaperrr

reaperrr Aug 25, 2017

Contributor

Needs rebase.

Contributor

reaperrr commented Aug 25, 2017

Needs rebase.

@pchote

This comment has been minimized.

Show comment
Hide comment
@pchote

pchote Aug 25, 2017

Member

Rebased.

Member

pchote commented Aug 25, 2017

Rebased.

@pchote pchote referenced this pull request Aug 28, 2017

Merged

Add command bar to TS #13802

@pchote

This comment has been minimized.

Show comment
Hide comment
@pchote

pchote Aug 28, 2017

Member

Updated the order in the settings code instead. I also took the opportunity to rename the music hotkey types to be consistent (*Music instead of *Music vs *Track).

Member

pchote commented Aug 28, 2017

Updated the order in the settings code instead. I also took the opportunity to rename the music hotkey types to be consistent (*Music instead of *Music vs *Track).

@rob-v

rob-v approved these changes Aug 28, 2017

👍

StopMusic();
else if (key == Game.Settings.Keys.PauseMusic)
else if (key == pauseKey.GetValue())

This comment has been minimized.

@rob-v

rob-v Aug 28, 2017

Contributor

only side node to ignore: this might be now only place with different/original order.

@rob-v

rob-v Aug 28, 2017

Contributor

only side node to ignore: this might be now only place with different/original order.

@@ -201,6 +205,7 @@ Container@EDITOR_ROOT:
Container@EDITOR_WORLD_ROOT:
Logic: LoadIngamePerfLogic, MapEditorLogic
ChangeZoomKey: TogglePixelDouble

This comment has been minimized.

@rob-v

rob-v Aug 28, 2017

Contributor

only side note: with latest nice consistency (StopMusicKey: StopMusic,..) this difference is now more visible

@rob-v

rob-v Aug 28, 2017

Contributor

only side note: with latest nice consistency (StopMusicKey: StopMusic,..) this difference is now more visible

This comment has been minimized.

@pchote

pchote Aug 28, 2017

Member

This one is intentional: the editor changes the zoom between a range of steps, but happens to be bound to the more standard pixel doubling hotkey.

@pchote

pchote Aug 28, 2017

Member

This one is intentional: the editor changes the zoom between a range of steps, but happens to be bound to the more standard pixel doubling hotkey.

@reaperrr reaperrr merged commit 1bd1a18 into OpenRA:bleed Aug 31, 2017

2 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

@pchote pchote deleted the pchote:remove-hardcoded-hotkeys-part-2 branch Oct 15, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment