MPC
9c2197db17
Software plane fixes
2018-12-14 14:08:25 -03:00
Jimita
d70dbada1c
Merge branch 'master' into automap_fix
2018-12-14 15:07:53 -02:00
mazmazz
c49a5ed8d2
Better I_InitJoystick log message
2018-12-14 06:14:21 -05:00
mazmazz
d094a70ec3
Allow use_joystick/2 to be saved once again
2018-12-14 06:07:20 -05:00
mazmazz
fa63ddda86
Fix cv_usejoystick being reset to None when cv_usejoystick was > NumJoys and changing to already-used joystick
2018-12-14 06:05:31 -05:00
mazmazz
70d6845d6c
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
b2c02838c4
Display "joystick used" prompt correctly if setting use_joystick from an old value > I_NumJoys()
2018-12-14 05:31:47 -05:00
mazmazz
e548f6f139
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
3b6de810e1
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
6b9fe87b60
Properly handle unstable device indexes for hotplug
2018-12-14 01:45:18 -05:00
mazmazz
44d6a1d236
Attempt to handle unstable device IDs
2018-12-14 00:22:25 -05:00
mazmazz
216e710b87
Improve hotplug edge case with changing device indexes; return proper joy_open output on error
2018-12-13 23:52:04 -05:00
mazmazz
14cde2d227
Change joystick log messages to DBG_GAMELOGIC
2018-12-13 23:26:07 -05:00
mazmazz
e81f05c496
Handle unstable device index when hotplugging controller
2018-12-13 23:09:05 -05:00
mazmazz
bcd747c1cd
Adjust SDL_JOYDEVICEREMOVED handler by checking the player's joy device explicitly
2018-12-13 22:26:13 -05:00
mazmazz
a3063ce89f
Merge tag 'SRB2_release_2.1.21' into vanilla-hotplug
2018-12-13 22:16:48 -05:00
Monster Iestyn
ef6533fb83
Merge branch 'master' into next
2018-12-13 22:21:31 +00:00
Monster Iestyn
880c017f8f
Merge branch 'cfg-srb2home-fix' into 'master'
...
Apply srb2home path to EXEC, SAVECONFIG, and debugfile
See merge request STJr/SRB2!379
2018-12-13 16:16:52 -05:00
Digiku
ab7f0ca4fb
Merge branch 'awayviewmobj-sanity-checks' into 'next'
...
Awayviewmobj sanity checks
See merge request STJr/SRB2!377
2018-12-13 16:11:27 -05:00
Digiku
c57f548c7b
Merge branch 'savegamename-fix' into 'master'
...
Fix savegamename being improperly built
See merge request STJr/SRB2!378
2018-12-13 16:11:13 -05:00
mazmazz
dc7992a815
R_Char2Frame special case for backslash: accept plus as substitute
2018-12-13 14:59:12 -05:00
mazmazz
d18b2cda59
Apply srb2home to saveconfig ONLY if srb2home isn't already there
2018-12-13 13:32:38 -05:00
mazmazz
93f7f0a8df
Apply srb2home to debugfile
2018-12-13 13:23:09 -05:00
mazmazz
b1641aa8e9
Apply srb2home to SAVECONFIG
2018-12-13 13:17:56 -05:00
mazmazz
93eda4e7c9
EXEC: Search for CFG by file path
2018-12-13 13:11:25 -05:00
mazmazz
b84470ec51
Fix savegamename being improperly built due to missing null char after copying timeattackfolder
2018-12-13 12:01:07 -05:00
Jimita
e628d98f20
Update am_map.c
2018-12-12 19:59:21 -02:00
Jimita
a5874019cb
Update am_map.c
2018-12-12 19:57:52 -02:00
MPC
649b6c9ca1
Remove MINIAUTOMAP code
2018-12-12 18:53:13 -03:00
MPC
6b22dc183b
Fix the automap
2018-12-12 18:01:52 -03:00
Jimita
966afb6017
Update p_user.c
2018-12-12 13:09:47 -02:00
Jimita
172fd3bf52
Merge branch 'master' into the_second_remote_view_camera_fix
2018-12-11 21:52:28 -02:00
MPC
c68875ad93
Fix remote viewpoint cameras for real
...
I'm so sorry
2018-12-11 20:48:45 -03:00
Monster Iestyn
582c5332f4
Add some checks to prevent invalid awayviewmobjs from crashing the game. Not fullproof but at the least the P_CameraThinker crash no longer happens
2018-12-11 18:39:58 +00:00
MPC
348ed1e43f
Large room fix
2018-12-09 19:34:17 -03:00
mazmazz
47ee3525af
Indentation
2018-12-08 14:10:56 -05:00
mazmazz
01f1933f69
Force directsound to fix wrong-pitch sound effects
2018-12-08 14:05:58 -05:00
Digiku
feb7b05e6e
Merge branch 'no-more-installer' into 'master'
...
Remove windows installer
See merge request STJr/SRB2!372
2018-12-07 16:58:37 -05:00
mazmazz
6b5fc921f2
Remove windows installer
2018-12-07 16:56:48 -05:00
Digiku
1029463741
Merge branch '21-version' into 'next'
...
Update code versions to 2.1.21
See merge request STJr/SRB2!338
2018-12-06 17:20:45 -05:00
mazmazz
df89781623
Windows string adjustment
2018-12-06 15:42:58 -05:00
mazmazz
ba60989c00
Adjust version strings
2018-12-06 15:39:19 -05:00
mazmazz
60afce5771
Disable XINPUT before initing the joy subsystem
2018-12-06 14:03:46 -05:00
Digiku
17e9188c89
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
3ceeb6a205
Register execversion and remove CV_SAVE because we write manually
2018-12-06 12:28:30 -05:00
mazmazz
0be61e8830
a stray if block
2018-12-06 12:03:53 -05:00
mazmazz
a5eb62b73e
alwaysfreelook -> alwaysmlook string
2018-12-06 12:02:45 -05:00
mazmazz
70aa4ce18e
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
6694b7d679
Controller hotplugging by always keeping joy subsystem on (thanks WOLFS)
...
(with log messages)
2018-12-06 10:54:58 -05:00
Digiku
88b2e5ce84
Merge branch 'fire-trigger' into '21-version'
...
Controller defaults: Set Ring Toss to right trigger instead of left trigger
See merge request STJr/SRB2!370
2018-12-06 08:15:38 -05:00
