Commit graph

70 commits

Author SHA1 Message Date
LJ Sonic
cfa48574be Merge branch 'next' into 'lua-inputs'
# Conflicts:
#   src/lua_script.c
2021-06-19 10:34:48 -04:00
LJ Sonic
d325c7e6d3 The year is 2021 2021-05-07 17:45:56 +02:00
SwitchKaze
3895c02330 Revert "Remove key stuff"
This reverts commit a439e569
2021-04-02 15:46:08 -05:00
SwitchKaze
cb3a8f7a58 Remove key stuff 2021-04-02 15:46:08 -05:00
SwitchKaze
eb2dc9e99b Mouse improvements 2021-04-02 15:46:08 -05:00
SwitchKaze
3faa98cf4a Expose inputs to Lua 2021-04-02 15:45:59 -05:00
SwitchKaze
6bf76602ed Refactor mouse 2021-04-02 15:22:22 -05:00
James R
dbd79a29a4 Replace C90's junk with a modest macro 2020-10-06 23:04:23 -07:00
GoldenTails
572bafa0f9 Use kinda counter-intuitive ternary operator to hack in a check for "use" for 2.2 compatibility 2020-07-11 21:59:54 -05:00
GoldenTails
a2635b2b86 The only "use" that I had to change to "spin" after a manual half hour search 2020-07-11 21:59:54 -05:00
GoldenTails
8b140b1831 Replace 'use' with 'spin' in game control constants 2020-07-11 21:59:54 -05:00
James R
7060083db5 Update copyright year to 2020 2020-02-19 14:08:45 -08:00
James R
3d9466e5f5 Semantics 2020-01-23 13:57:39 -08:00
James R
f0daea39d4 Don't set controls to keys out of array bounds
Shout-out to TAG's config that somehow had
`setcontrol2 "custom3" "KEY931926528"`, cuasing the game to crash only in
Splitscreen.
2020-01-22 22:19:00 -08:00
Steel Titanium
d415cd5c6d
Update copyright date on source files 2019-12-06 13:49:42 -05:00
toaster
d9129db5ed Add scroll-wheel weapon changing to default controls
(resolves #248)
2019-10-13 15:19:31 +01:00
mazmazz
075f28b7c8 WIP 20190101 merge
d_netcmd.c
filesrch.c
m_menu.c
p_setup.c
p_spec.c
r_data.c
r_main.c
r_things.c
w_wad.c
w_wad.h
2019-01-02 01:09:15 -05:00
mazmazz
cb01ebebed Merge remote-tracking branch 'public-gl/2122-version' into 2122-version 2018-12-23 18:09:54 -05:00
mazmazz
83a6f5d6ae Merge remote-tracking branch 'public-gl/master' into 2122-version 2018-12-23 18:09:17 -05:00
Digiku
fa36b8f5a2 Merge branch 'menu-mpjoy-fix' into '2122-version'
Menu: Fix joystick events causing the player to move during multiplayer system menu [2122-version]

See merge request STJr/SRB2!420
2018-12-23 18:06:27 -05:00
mazmazz
2b8cdc0381 Revert "Revert "Merge branch 'menu-mpjoy-fix' into 'next'""
This reverts commit c0c05043e6.
2018-12-23 18:04:01 -05:00
mazmazz
c0c05043e6 Revert "Merge branch 'menu-mpjoy-fix' into 'next'"
This reverts commit b5d4bb3530, reversing
changes made to 2d675750cf.
2018-12-23 17:57:50 -05:00
mazmazz
f55623ef9c Clear all control keys before loading defaults in LoadConfig 2018-12-23 14:59:26 -05:00
mazmazz
8f596376a9 Merge branch '2122-version' into execversion-filtercontrols 2018-12-23 14:30:24 -05:00
mazmazz
3277cf6976 Add JOY10 default to gc_centerview 2018-12-23 14:29:54 -05:00
mazmazz
dd4c7b539f Fix joy button default override when filling keynum2 with default 2018-12-23 14:29:10 -05:00
mazmazz
aa77038dfc Add chat_on to non-key move event checks 2018-12-23 03:21:32 -05:00
mazmazz
cb619e0353 Don't create movement events from joy or mouse when menu is active 2018-12-22 01:20:24 -05:00
mazmazz
e20c70d5fb Skip setting control if keynum is -1 (for KEY_PAUSE) handling 2018-12-20 18:27:44 -05:00
mazmazz
fe5001a38a Dummy out 2p pause, system menu, talk, and scores buttons because grayed out in-menu 2018-12-20 16:40:59 -05:00
mazmazz
6f8b126586 Add G_FilterKeyByVersion() to setcontrol 2018-12-20 16:30:37 -05:00
mazmazz
ed7178bca4 Assign joy button defaults for 1 and 2 player 2018-12-20 01:47:35 -05:00
mazmazz
3d8bc85494 Forgot config strings for menu keys 2018-12-03 12:19:41 -05:00
mazmazz
31f23fda8d Add gc_viewpoint from Kart 2018-12-03 11:50:57 -05:00
mazmazz
2a87093ece Add gc_screenshot and gc_recordgif from Kart 2018-12-03 11:31:48 -05:00
mazmazz
8e190932e7 Add gc_systemmenu from Kart 2018-12-03 11:21:25 -05:00
Monster Iestyn
cd57be640c Merge branch '21-controls' into 'next'
Default control changes for 2.1.21

See merge request STJr/SRB2!343
2018-11-27 11:50:42 -05:00
mazmazz
ea7162a76a Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
mazmazz
b60c10dc9b Change default mouse sensitivity 2018-11-23 20:51:57 -05:00
mazmazz
146dd52d24 Smarter pause/break rejection for setcontrol 2018-11-22 14:48:33 -05:00
mazmazz
a8e01ee69b Smarter pause/break rejection for setcontrol 2018-11-22 14:47:01 -05:00
mazmazz
7075cdbfa8 Don't accept KEY_PAUSE for control console command 2018-11-22 14:37:28 -05:00
mazmazz
f926774ee1 Hardcode Pause/Break key and change Pause default; show prompt in menu about Pause key 2018-11-22 14:37:21 -05:00
mazmazz
2a5ae054f9 Make movement controls consistent with 2.2 2018-11-22 10:41:21 -05:00
mazmazz
9bdab67de6 Don't accept KEY_PAUSE for control console command 2018-11-21 11:21:17 -05:00
mazmazz
8a9c10e633 Hardcode Pause/Break key and change Pause default; show prompt in menu about Pause key 2018-11-21 10:58:07 -05:00
mazmazz
1d86cc348d Refactor gclists 2018-11-12 23:23:39 -05:00
mazmazz
31c1145cf3 Uncomment gcs_platform defaults 2018-11-12 16:54:42 -05:00
mazmazz
c7a855de7a Split gclist_tutorial_check from gclist_tutorial 2018-11-11 09:35:15 -05:00
mazmazz
181d13fe73 gclist_tutorial include lookup/lookdown for conflict reasons 2018-11-11 08:56:40 -05:00