147 commits

Author	SHA1	Message	Date
Sally Coolatta	8731c6b7a4	Another round of fixing up ... - gametyperules are now fitting for kart, not applied to the whole codebase though - a few more files compile	2020-08-11 16:13:17 -04:00
Sally Coolatta	7ac6723e46	gamecontrol has another index for player num, instead of being duplicated for players 2-4	2020-08-10 20:08:32 -04:00
Sally Coolatta	b546f7d188	Merge g_input.c/h	2020-08-04 01:41:00 -04:00
GoldenTails	7c3a565709	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	1dd754d139	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	3c4200901a	Replace 'use' with 'spin' in game control constants	2020-07-11 21:59:54 -05:00
Sally Coolatta	63917ffccc	The start of the scary 2.2 merge ... All conflicts are left in-tact. We should be collaborating on solving these files one at a time.	2020-05-29 13:43:38 -04:00
James R	2274129f57	Update copyright year to 2020	2020-02-19 14:08:45 -08:00
James R	128f0757b6	Semantics	2020-01-23 13:57:39 -08:00
James R	a127045d98	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	a5cdb0a4b3	Update copyright date on source files	2019-12-06 13:49:42 -05:00
toaster	8f7a13137b	Add scroll-wheel weapon changing to default controls ... (resolves #248)	2019-10-13 15:19:31 +01:00
fickleheart	d22601e979	Clear P3 and P4 controls too when clearing all controls	2019-03-24 17:31:04 -05:00
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
mazmazz	81352aece1	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
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 eaab2da100, reversing changes made to 50710c3f10.	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	55dae90eb7	Smarter pause/break rejection for setcontrol	2018-11-22 14:48:33 -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