Commit graph

358 commits

Author SHA1 Message Date
mazmazz
da69539718 Display "joystick used" prompt correctly if setting use_joystick from an old value > I_NumJoys() 2018-12-14 05:31:47 -05:00
mazmazz
f7727fac5a Don't override an already-active controller
* Menu improvements to tell the user that they can't set a controller if it's already active
2018-12-14 05:02:41 -05:00
mazmazz
732956088a Lots of changes to better support hotplugging and unstable device indexes
* Don't save cv_usejoystick/2 because hotplugging changes can be made invalid by next run
* Properly set cv_usejoystick/2 for menu toggling
* Force-disable a player's joystick if setting another player's joystick to the same device
* Properly set cv_usejoystick/2 value of BOTH target player AND other players when hotplugging and unplugging
2018-12-14 03:58:07 -05:00
wolfy852
aa5ee0ebf3 Restore a change lost in the merge madness, do some SDL_GameController prep 2018-12-10 09:00:15 -06:00
wolfy852
a1fffe5755 Merge remote-tracking branch 'remotes/SRB2/vanilla-hotplug' into unfuck-gamepads
# Conflicts:
#	src/d_clisrv.c
#	src/d_netcmd.c
#	src/d_netcmd.h
#	src/dehacked.c
#	src/doomdef.h
#	src/g_game.c
#	src/hu_stuff.c
#	src/lua_baselib.c
#	src/m_menu.c
#	src/sdl/i_system.c
#	src/sdl/sdlmain.h
2018-12-06 13:07:39 -06:00
mazmazz
c4f035dfa9 Controller hotplugging by always keeping joy subsystem on (thanks WOLFS)
(with log messages)
2018-12-06 10:54:58 -05:00
TehRealSalt
6af84a96c1 Comment out M_DrawSaveLoadBorder 2018-12-05 21:27:51 -05:00
TehRealSalt
91448ddd95 Merge remote-tracking branch 'srb2public/next' into merge-next 2018-12-05 20:46:48 -05:00
TehRealSalt
bf3a9d1d2e Edited even more things to say "SRB2Kart" 2018-12-05 20:40:58 -05:00
TehRealSalt
26315ccf63 Merge remote-tracking branch 'srb2public/master' into merge-next 2018-12-05 19:21:13 -05:00
Monster Iestyn
b32f5830ed Merge branch 'next' into 21-version 2018-12-04 17:19:36 +00:00
Monster Iestyn
dfdba01591 Merge branch 'master' into next 2018-12-04 17:18:19 +00:00
Digiku
2c557d668a Merge branch 'joystick-juggling' into 'master'
Joystick juggling

See merge request STJr/SRB2!355
2018-12-04 11:51:55 -05:00
Digiku
d6dd0c8fef Merge branch 'joystick-juggling-two' into 'next'
Joystick additions for menu, axis defaults, and vertical look toggle

See merge request STJr/SRB2!359
2018-12-03 22:59:19 -05:00
Steel Titanium
c31c80d216 One small change 2018-12-03 13:32:24 -05:00
mazmazz
861b35dea4 Revert "Make pause key bring up the menu if it's a joy button"
This reverts commit 44bec22793.
2018-12-03 13:11:48 -05:00
mazmazz
4ad7cdc684 Menu for joy first/third person vertical look 2018-12-03 13:10:49 -05:00
mazmazz
44bec22793 Make pause key bring up the menu if it's a joy button
* Add "Pause" entry to multiplayer control panel to give joy users a way to pause in netgames
2018-12-03 13:10:27 -05:00
mazmazz
24ff6bc279 Add alwaysfreelook to joystick menu 2018-12-03 13:10:20 -05:00
mazmazz
3a72325355 Preserve event ch for other responders 2018-12-03 13:10:18 -05:00
mazmazz
a6ce80e9f4 Make M_Responder respond to joy buttons only in-menu (multiplayer bug?) 2018-12-03 13:10:16 -05:00
mazmazz
00fb8d4853 Remap menu actions to better joy keys 2018-12-03 13:10:12 -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
mazmazz
8fd8fca5f7 Remove console messages for joynames 2018-12-03 05:39:10 -05:00
Monster Iestyn
bc35851417 add deadzone + storing of previous joyx/y values etc to attempt to make joysticks less sensitive in menus 2018-12-02 21:52:30 +00:00
Monster Iestyn
6cdcd8ea0f make menu respond to joystick axis events without joyscale having to be 0 2018-12-02 21:18:28 +00:00
Monster Iestyn
94ad0b880f Merge branch 'next' into 21-version
# Conflicts:
#	src/d_netcmd.c
2018-12-02 15:45:07 +00:00
Steel Titanium
058dedb2ab Fix up controller menu support 2018-12-01 20:13:14 -05:00
TehRealSalt
cf866c706f Enable pk3 in addons menu 2018-11-29 10:07:53 -05:00
TehRealSalt
4507ee18fd Merge remote-tracking branch 'srb2public/next' into merge-next 2018-11-29 08:49:50 -05:00
Wolfy
cabe9871e3 Multiple admins
# Conflicts:
#	src/d_netcmd.c
#	src/d_netcmd.h
2018-11-29 06:46:59 -06:00
Sal
521b67834b Merge branch 'netcode-vars-strict' into 'master'
Make netcode var defaults stricter, add Advanced Server Options

See merge request KartKrew/Kart!110
2018-11-27 12:27:47 -05:00
Sal
9e4d826f1a Merge branch 'better-buffering' into 'master'
Better vote level buffering

See merge request KartKrew/Kart!109
2018-11-27 12:25:02 -05:00
TehRealSalt
74daafd9eb Advanced Server Options menu
More accessible way of modifying ping limit, timeouts, max file send, etc now that the defaults are stricter
2018-11-27 12:10:46 -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
Digiku
dcba8ab654 "Turn Left/Right" control naming instead of "Look Left/Right" due to analog mode keymapping quirk 2018-11-26 15:48:08 -05:00
TehRealSalt
4f0c74e1dc Remove previous commit's votebuffer, allow an external optional buffer to be passed into G_RandMap
I meant to fix the previous method, but I didn't even understand how it knew it was in a vote or not... so I just did it my own way :V

(Shouldn't FLUSHMAPBUFFEREARLY be on now...?)
2018-11-26 04:27:31 -05:00
TehRealSalt
f020441049 Add confirmation to reset controls 2018-11-26 03:12:22 -05:00
Steel Titanium
157502310f Save sound toggles to config 2018-11-25 14:22:52 -05:00
mazmazz
c91b2b4456 Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
TehRealSalt
ea655ba27a Reset to defaults option in controls 2018-11-22 22:50:40 -05:00
mazmazz
21095ad813 Added chasefreecam to menu 2018-11-22 17:32:03 -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
472caaf277 Adjust menu for movement and camera controls 2018-11-22 14:13:28 -05:00
TehRealSalt
b8696fc0ff Random map buffer only gets added to when
Needs another temporary buffer for the vote screen so that it doesn't roll dupes
2018-11-20 00:13:08 -05:00
Monster Iestyn
cfa4bbd75b change return type of M_CheckMODVersion to boolean 2018-11-19 17:47:23 +00:00
TehRealSalt
a69e4e489f Updated the one important modified game print that most people see to be more descriptive
(I could've SWORN there were more...)
2018-11-18 05:48:10 -05:00
Sryder
67f0b120c7 Squash various warnings
Shadowed declarations
Unsuffixed float constants
There's an unsuffixed float constant I can't fix because the define is outside of SRB2. We could have our own copy of Pi if we really wanted.
2018-11-14 21:53:57 +00:00