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

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

Merged
merged 4 commits into from
Nov 7, 2019
Merged

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

merged 4 commits into from
Nov 7, 2019

Conversation

Couls
Copy link
Contributor

@Couls Couls commented Nov 6, 2019

About The Pull Request

Restores the T, O and M macros so that you can escape out of chat windows and they have an X in the corner, this also prevents the latency you get when you have a high ping and attempt to use T, O or M hotkeys.The downside is that these three keys are no longer customizable. Also adds in custom movement hotkeys
should fix #47621

Why It's Good For The Game

Not every keyboard is QWERTY and this allows people to change the movement keys to whatever they feel comfortable with

Changelog

馃啈
add: Movement keys are now customizable
del: T, O and M are no longer customizable
del: admin commands for messing with movement keys, this won't work since they're different for each client
fix: ooc, say and me are all escapable now and no longer lag at higher pings
/:cl:

@tgstation-server tgstation-server added the Fix Rewrites a bug so it appears in different circumstances label Nov 6, 2019
Comment on lines 33 to +38
/datum/controller/subsystem/input/proc/refresh_client_macro_sets()
var/list/clients = GLOB.clients
for(var/i in 1 to clients.len)
var/client/user = clients[i]
user.set_macros()
user.update_movement_keys()
Copy link
Contributor Author

@Couls Couls Nov 6, 2019

Choose a reason for hiding this comment

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

don't know if I should rename the proc now that it also updates movement keys after it sets macros

@Tharcoonvagh
Copy link
Contributor

Thank god I can play again

@actioninja
Copy link
Member

You could still make these rebindable a different way, I've got an idea once this is working and merged.

@Couls
Copy link
Contributor Author

Couls commented Nov 7, 2019

Looking forward to it I鈥檓 interested to see how you鈥檒l do it

@Couls
Copy link
Contributor Author

Couls commented Nov 7, 2019

Should be ready for review, I kind of want ninja to take a look at it because he's done stuff with input before and this code touches some of the code in the input subsystem

@kriskog kriskog mentioned this pull request Nov 7, 2019
@ninjanomnom ninjanomnom merged commit 971ef6a into tgstation:master Nov 7, 2019
AustationBot referenced this pull request in austation/austation Nov 7, 2019
* Custom movement hotkeys and restore macros for T, O and M

* stray comma

* update movement keys on SSinput initialize

* use cardinals
@Takov-Mala
Copy link

You borked everything. Everything is actually unbinded now and people have to change hotkeys in preferences to even move.
Also add a way to just blank some hotkeys, a bunch of these I don't even want.

@Couls
Copy link
Contributor Author

Couls commented Nov 8, 2019

There is a way to unbind keys it explains how when you click on the key you wish to unbind

Pressing ESC while it listens for key input will unbind the key

@Takov-Mala
Copy link

Ah, cool.

@peoplearestrange
Copy link
Contributor

Bullshit

@Couls
Copy link
Contributor Author

Couls commented Nov 10, 2019

what?

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 custom-movement-keys 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.

some issues with custom hotkeys
8 participants