mazmazz
752fec8270
Fix menu where cv_usejoystick.value > I_JoyNum and selecting an unused controller and the "used!" prompt pops up erroneously
2018-12-14 05:57:10 -05:00
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
mazmazz
18287c09bb
Properly handle unstable device indexes for hotplug
2018-12-14 01:45:18 -05:00
mazmazz
601535fe41
Attempt to handle unstable device IDs
2018-12-14 00:22:25 -05:00
mazmazz
d2e39c660e
Improve hotplug edge case with changing device indexes; return proper joy_open output on error
2018-12-13 23:52:04 -05:00
mazmazz
651c99c5e3
Change joystick log messages to DBG_GAMELOGIC
2018-12-13 23:26:07 -05:00
mazmazz
1cdbe75183
Handle unstable device index when hotplugging controller
2018-12-13 23:09:05 -05:00
mazmazz
85bfe704e2
Adjust SDL_JOYDEVICEREMOVED handler by checking the player's joy device explicitly
2018-12-13 22:26:13 -05:00
mazmazz
7dd6dba27e
Merge tag 'SRB2_release_2.1.21' into vanilla-hotplug
2018-12-13 22:16:48 -05:00
mazmazz
72e55b4623
Windows string adjustment
2018-12-06 15:42:58 -05:00
mazmazz
dac15d2283
Adjust version strings
2018-12-06 15:39:19 -05:00
mazmazz
cc6daa751d
Disable XINPUT before initing the joy subsystem
2018-12-06 14:03:46 -05:00
Digiku
31b88c5195
Merge branch 'execversion' into '21-version'
...
Block previous versions' config defaults with EXECVERSION consvar
See merge request STJr/SRB2!371
2018-12-06 12:41:20 -05:00
mazmazz
439fff4402
Register execversion and remove CV_SAVE because we write manually
2018-12-06 12:28:30 -05:00
mazmazz
49d899ffea
a stray if block
2018-12-06 12:03:53 -05:00
mazmazz
86b3221986
alwaysfreelook -> alwaysmlook string
2018-12-06 12:02:45 -05:00
mazmazz
fd6f5a9fbd
Add alwaysfreelook2 and mousemove2 to config versioning
...
* Change alwaysfreelook2 to be consistent with alwaysfreelook (the only one that wasn't the same)
2018-12-06 11:59:34 -05:00
mazmazz
c4f035dfa9
Controller hotplugging by always keeping joy subsystem on (thanks WOLFS)
...
(with log messages)
2018-12-06 10:54:58 -05:00
mazmazz
5e6e0d539b
Use proper DD define for use_joystick
2018-12-06 06:50:18 -05:00
mazmazz
e8584f2535
Implement EXECVERSION consvar to invalidate previous versions' default config values
2018-12-06 06:28:34 -05:00
mazmazz
d488dd0763
Move joyaxis_fire default to right trigger
2018-12-06 05:55:56 -05:00
mazmazz
0e0ccf2ae6
Change 2p controller defaults
2018-12-06 05:26:28 -05:00
mazmazz
41ca8bb24a
Hex instead of octal colors
2018-12-05 13:08:25 -05:00
mazmazz
e30832216f
More concise bitness check
2018-12-05 13:06:56 -05:00
mazmazz
a0938bdd24
Make the ifdefs cleaner
2018-12-05 13:00:42 -05:00
mazmazz
d576ed31e0
_WINDOWS instead of _WIN32 for DD
2018-12-05 12:55:05 -05:00
mazmazz
91504ed81d
Merge remote-tracking branch 'public-gitlab/21-version' into versionflags
2018-12-05 12:49:21 -05:00
Monster Iestyn
f5e6db5f56
Fix 64-bit build-using admins not being able to kick players besides themselves, by not checking sendingsavegame[] code at all if not the server
...
it turns out playernode[pn] is typically 255 in the above situation, so sendingsavegame[playernode[pn]] goes out of bounds ...but goodness knows why 32-bit builds didn't suffer the same bug, seems to have been pure luck
2018-12-05 17:39:02 +00:00
mazmazz
b03da28390
Add various flags to version string
2018-12-05 11:43:33 -05:00
Monster Iestyn
c642015b81
Fix motd being broken for admins
...
It turns out the game was sending the full size of the motd buffer (254) rather than just the size of the string made, therefore sending a load of garbage and making the game apparently execute unknown or illegal net commands
2018-12-04 21:09:28 +00:00
Monster Iestyn
05a8bbe056
Fix the game being basically broken due to multi-admin, by porting over some missing changes from Kart
2018-12-04 18:54:36 +00: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
6146429696
Merge branch 'auto-joystick' into 'master'
...
Use Joystick 1 and Joystick 2 by default if plugged in
See merge request STJr/SRB2!364
2018-12-04 11:53:58 -05: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
Monster Iestyn
ca01834d2e
Merge branch 'tiny-makefile-fix' into 'master'
...
Tiny Makefile Fix
See merge request STJr/SRB2!289
2018-12-04 08:09:27 -05:00
mazmazz
872227f211
Change joystick default to auto-use joystick 1 and joystick 2 if plugged in (like Kart)
2018-12-03 23:36:36 -05:00
mazmazz
95fff25a7f
Update OSX icon
2018-12-03 23:09:54 -05:00
Digiku
ffd1f400e1
Merge branch 'controller-menu-touchup' into 'master'
...
Controller select menu improvements.
See merge request STJr/SRB2!354
2018-12-03 23:00:36 -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
2797b1e428
Make this be consistent with non-CMake builds
2018-12-03 15:42:37 -05:00
Steel Titanium
c31c80d216
One small change
2018-12-03 13:32:24 -05:00
mazmazz
22232847e2
Hardcode Screenshot, GIF, and Viewpoint to their F keys
2018-12-03 13:21:16 -05:00
mazmazz
3bdb738888
thisjoyaiming fix for chasefreelook
2018-12-03 13:13:01 -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
0e25ec9309
Add Joy2 for network abort
2018-12-03 13:10:47 -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
