Alam Arias
380bce88a0
remove whitespaces
2019-02-05 15:42:37 -05:00
wolfy852
d1bbebcbea
Fix player 2 not being able to play while the chat is open
...
Also attempts to fix the d-pad typing characters into the chat box.
2019-01-10 06:08:12 -06:00
wolfy852
5c5e6a26dd
Merge remote-tracking branch 'remotes/public/next' into gamepad-tweaks
...
# Conflicts:
# CMakeLists.txt
# appveyor.yml
# src/command.c
# src/command.h
# src/d_clisrv.c
# src/d_netcmd.c
# src/dehacked.c
# src/doomdef.h
# src/hu_stuff.c
# src/m_misc.c
2019-01-08 16:32:24 -06:00
SeventhSentinel
3fe7856ba3
Keep execversion stuff on, just dummied out
...
Had issues with skin values not changing from the menu, this seemed to fix it
2019-01-06 01:41:42 -05:00
SeventhSentinel
046d66d803
Fix errors from merge
2019-01-06 01:00:30 -05:00
SeventhSentinel
1d58c6b8c2
merge srb2 next
2019-01-05 15:59:23 -05:00
wolfy852
bf5d14c37f
Rebind the talk key by default, but move it to D-Pad Down
2019-01-02 14:50:36 -06:00
wolfy852
0bd646d381
Kill default d-pad bindings aside from "Show Rankings"
2018-12-24 21:30:42 -06:00
mazmazz
c82cd78bb7
Merge remote-tracking branch 'public-gl/2122-version' into 2122-version
2018-12-23 18:09:54 -05:00
mazmazz
915c90d9f3
Merge remote-tracking branch 'public-gl/master' into 2122-version
2018-12-23 18:09:17 -05:00
Digiku
2fbb5995d8
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
39b0a16727
Revert "Revert "Merge branch 'menu-mpjoy-fix' into 'next'""
...
This reverts commit ee63ed22d5
2018-12-23 18:04:01 -05:00
mazmazz
ee63ed22d5
Revert "Merge branch 'menu-mpjoy-fix' into 'next'"
...
This reverts commit eaab2da10050710c3f10
2018-12-23 17:57:50 -05:00
mazmazz
ff2ec801bc
Clear all control keys before loading defaults in LoadConfig
2018-12-23 14:59:26 -05:00
mazmazz
98b59f3f9d
Merge branch '2122-version' into execversion-filtercontrols
2018-12-23 14:30:24 -05:00
mazmazz
d05896415e
Add JOY10 default to gc_centerview
2018-12-23 14:29:54 -05:00
mazmazz
7a1094f56e
Fix joy button default override when filling keynum2 with default
2018-12-23 14:29:10 -05:00
mazmazz
88a503aa76
Add chat_on to non-key move event checks
2018-12-23 03:21:32 -05:00
mazmazz
5a18d89414
Don't create movement events from joy or mouse when menu is active
2018-12-22 01:20:24 -05:00
mazmazz
77402df2e6
Skip setting control if keynum is -1 (for KEY_PAUSE) handling
2018-12-20 18:27:44 -05:00
mazmazz
e54086038f
Dummy out 2p pause, system menu, talk, and scores buttons because grayed out in-menu
2018-12-20 16:40:59 -05:00
mazmazz
2cd851652a
Add G_FilterKeyByVersion() to setcontrol
2018-12-20 16:30:37 -05:00
mazmazz
119b7cb469
Assign joy button defaults for 1 and 2 player
2018-12-20 01:47:35 -05:00
mazmazz
fd985d0d51
Forgot config strings for menu keys
2018-12-03 12:19:41 -05:00
mazmazz
8aa4575bc1
Add gc_viewpoint from Kart
2018-12-03 11:50:57 -05:00
mazmazz
ec361ee6ac
Add gc_screenshot and gc_recordgif from Kart
2018-12-03 11:31:48 -05:00
mazmazz
0e52208384
Add gc_systemmenu from Kart
2018-12-03 11:21:25 -05:00
TehRealSalt
4507ee18fd
Merge remote-tracking branch 'srb2public/next' into merge-next
2018-11-29 08:49:50 -05:00
Monster Iestyn
a6a4b74692
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
c91b2b4456
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
mazmazz
ef18d22f63
Change default mouse sensitivity
2018-11-23 20:51:57 -05:00
TehRealSalt
ea655ba27a
Reset to defaults option in controls
2018-11-22 22:50:40 -05:00
mazmazz
6e25b6f523
Smarter pause/break rejection for setcontrol
2018-11-22 14:47:01 -05:00
mazmazz
7c689946e0
Don't accept KEY_PAUSE for control console command
2018-11-22 14:37:28 -05:00
mazmazz
340b5e9d4f
Hardcode Pause/Break key and change Pause default; show prompt in menu about Pause key
2018-11-22 14:37:21 -05:00
mazmazz
2a61fa990f
Make movement controls consistent with 2.2
2018-11-22 10:41:21 -05:00
toaster
b8f78d30df
Swap gc_lookback and gc_brake's default binded keys on controllers. (see the first issue in http://mb.srb2.org/showpost.php?p=802758&postcount=30 )
2018-11-18 19:31:07 +00:00
TehRealSalt
8e5c6adfe0
Minor whitespace
2018-10-15 20:34:53 -04:00
TehRealSalt
771367c5d7
New bindable keys
...
You can now remap Change Viewpoint, Screenshot, and Toggle GIF Recording to other keys, mainly for gamepads
They also pushed me to my breaking point and I couldn't tolerate the control menu anymore, thanks to toaster for the scrolling backport
2018-09-27 16:55:21 -04:00
TehRealSalt
42fe27420f
Quick fix
...
No other keys bound to this, it should be 0
2018-09-10 03:35:10 -04:00
TehRealSalt
eb3bfba1ed
System menu default
2018-09-10 03:27:05 -04:00
TehRealSalt
b4bf63b16b
Merge branch 'sonicitems' into sal-misc
2018-09-10 03:22:11 -04:00
TehRealSalt
08e101e8f8
New gamepad defaults
...
Based on input recieved from Jeck
2018-09-09 20:57:54 -04:00
wolfy852
56e615d595
Merge commit 'c92926bfb6e080e39e658086fbc6f44b605348d3' into sonicitems
2018-09-09 17:57:23 -05:00
TehRealSalt
aff74fa234
nice
...
nice
2018-05-31 01:06:48 -04:00
TehRealSalt
714992a152
Restore gc_camrotate
...
Sorry if this breaks everyone's configs again :V
2018-05-30 16:54:59 -04:00
TehRealSalt
fc329d893b
Better gamepad axis support
2018-03-11 18:07:28 -04:00
TehRealSalt
30c84057dd
Restructured some ticcmd stuff, temporary keyboard defaults, commented out mouse options menu
...
No more weapon number buttons, button constants reordered, and BT_JUMP
renamed to BT_DRIFT, and removed a lot of commented out stuff or stuff
we didn't need. Spectator-only support for looking up/down soon.
Keyboard defaults are just what I use, plan on adjusting it further
after more feedback
2018-01-24 02:45:06 -05:00
Matthew Marsalko
c92926bfb6
Add support for overriding the ESC key
2017-12-24 23:09:06 -08:00
TehRealSalt
60675ec101
Fixed joysticks 3 & 4
...
fun typos
2017-12-24 15:02:41 -05:00
