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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

keybindings save file fix #47804

Merged
merged 2 commits into from
Nov 16, 2019
Merged

keybindings save file fix #47804

merged 2 commits into from
Nov 16, 2019

Conversation

Couls
Copy link
Contributor

@Couls Couls commented Nov 15, 2019

About The Pull Request

Fixes issues with keybindings not updating properly
Fixes #47800
big thanks to anturK for helping me out with this

Why It's Good For The Game

People won't need to reset their keybinds manually

Changelog

馃啈
fix: keybindings should now update properly
tweak: hotkey mode is the new default preference
/:cl:

@tgstation-server tgstation-server added Fix Rewrites a bug so it appears in different circumstances Tweak labels Nov 15, 2019
@TheVekter
Copy link
Contributor

Does this fix #47800?

@Couls
Copy link
Contributor Author

Couls commented Nov 15, 2019

Yeah it does

@optimumtact optimumtact merged commit 2d3fe49 into tgstation:master Nov 16, 2019
AustationBot referenced this pull request in austation/austation Nov 30, 2019
yoyobatty referenced this pull request in HippieStation/HippieStationdeprecated2020 Dec 10, 2019
* Port Custom hotkeys from TGMC (#47003)

* custom keybindings

* Update _lists.dm

* Update robot.dm

* modify weights and clean up some vars

* Update say.dm

* Apply suggestions from code review

Co-Authored-By: Emmett Gaines <ninjanomnom@gmail.com>

* some review changes

* formatting

* include focus hack, remove me_wrapper, give default keybinds to new characters, misc fixes

* revert hack and more reviews

* remove another focus hack

this was causing issues with the keydown proc returning early

* Fix loadout tab

* fixes modifier hotkeys and adds alternative move intent toggle (#47569)

* fixes modifier hotkeys and adds alternative move intent toggle

* Fixes pulling keybind

* make the wrappers look more like the old popup windows

* it was the freaking save file

* bump up save file version

* reset keybindings to default

* Custom movement hotkeys and restore macros for T, O and M (#47626)

* Custom movement hotkeys and restore macros for T, O and M

* stray comma

* update movement keys on SSinput initialize

* use cardinals

* Add to our DME

* ports TGMCs click hack for non-hotkey players ports classic keybinds from TGMC (#47670)

About The Pull Request

Ports tgstation/TerraGov-Marine-Corps#2977, overrides click proc to return focus back to chat bar using winsets also ports tgstation/TerraGov-Marine-Corps#1904 which has two sets of defaults for hotkey and classic mode
fixes #47672 fixes #47659

much credit to @Rohesie and the TGMC team for a bunch of these improvements
Why It's Good For The Game

lets the non-hotkey players walk and talk again
Changelog

cl
add: Custom keybinds will now check what style (classic / hotkey) you prefer when resetting if you use classic mode make sure to reset your keybinds to default!
add: multiple keybind support
tweak: non-hotkey mode keeps focus on chat
fix: pressing 4 as cyborg now properly cycles
fix: AI location hotkeys now work again
/cl

* Merge pull request #47804 from Couls/fix-savefiles

keybindings save file fix

* Merge pull request #47750 from ninjanomnom/doafuckinflip

Makes every emote keybindable

* Hippie stuff

* Stuff

* Woops
Neo1w pushed a commit to Nopm/Beat-Station that referenced this pull request Dec 10, 2019
* Port Custom hotkeys from TGMC (tgstation#47003)

* custom keybindings

* Update _lists.dm

* Update robot.dm

* modify weights and clean up some vars

* Update say.dm

* Apply suggestions from code review

Co-Authored-By: Emmett Gaines <ninjanomnom@gmail.com>

* some review changes

* formatting

* include focus hack, remove me_wrapper, give default keybinds to new characters, misc fixes

* revert hack and more reviews

* remove another focus hack

this was causing issues with the keydown proc returning early

* Fix loadout tab

* fixes modifier hotkeys and adds alternative move intent toggle (tgstation#47569)

* fixes modifier hotkeys and adds alternative move intent toggle

* Fixes pulling keybind

* make the wrappers look more like the old popup windows

* it was the freaking save file

* bump up save file version

* reset keybindings to default

* Custom movement hotkeys and restore macros for T, O and M (tgstation#47626)

* Custom movement hotkeys and restore macros for T, O and M

* stray comma

* update movement keys on SSinput initialize

* use cardinals

* Add to our DME

* ports TGMCs click hack for non-hotkey players ports classic keybinds from TGMC (tgstation#47670)

About The Pull Request

Ports tgstation/TerraGov-Marine-Corps#2977, overrides click proc to return focus back to chat bar using winsets also ports tgstation/TerraGov-Marine-Corps#1904 which has two sets of defaults for hotkey and classic mode
fixes tgstation#47672 fixes tgstation#47659

much credit to @Rohesie and the TGMC team for a bunch of these improvements
Why It's Good For The Game

lets the non-hotkey players walk and talk again
Changelog

cl
add: Custom keybinds will now check what style (classic / hotkey) you prefer when resetting if you use classic mode make sure to reset your keybinds to default!
add: multiple keybind support
tweak: non-hotkey mode keeps focus on chat
fix: pressing 4 as cyborg now properly cycles
fix: AI location hotkeys now work again
/cl

* Merge pull request tgstation#47804 from Couls/fix-savefiles

keybindings save file fix

* Merge pull request tgstation#47750 from ninjanomnom/doafuckinflip

Makes every emote keybindable

* Hippie stuff

* Stuff

* Woops
@Couls Couls deleted the fix-savefiles branch April 5, 2020 01:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Fix Rewrites a bug so it appears in different circumstances
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Tabbing into hotkey mode no longer works
4 participants