Commit Graph

2079 Commits

Author SHA1 Message Date
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 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
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 f0c7848e50 Use proper DD define for use_joystick 2018-12-06 06:50:18 -05:00
mazmazz 5b3a1e0c55 Implement EXECVERSION consvar to invalidate previous versions' default config values 2018-12-06 06:28:34 -05:00
mazmazz a802069313 Move joyaxis_fire default to right trigger 2018-12-06 05:55:56 -05:00
mazmazz aaf5d2e1dc Change 2p controller defaults 2018-12-06 05:26:28 -05:00
mazmazz 9055c9aeab Hex instead of octal colors 2018-12-05 13:08:25 -05:00
mazmazz c5b349ddc4 More concise bitness check 2018-12-05 13:06:56 -05:00
mazmazz 1ea2fa447a Make the ifdefs cleaner 2018-12-05 13:00:42 -05:00
mazmazz 389c2d4ea1 _WINDOWS instead of _WIN32 for DD 2018-12-05 12:55:05 -05:00
mazmazz 6d9fb0d3fd Merge remote-tracking branch 'public-gitlab/21-version' into versionflags 2018-12-05 12:49:21 -05:00
Monster Iestyn aee8dcdff8 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 a6dcd5555e Add various flags to version string 2018-12-05 11:43:33 -05:00
Monster Iestyn ae14fd2f85 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 b4b82e681c 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 e353e2ef70 Merge branch 'next' into 21-version 2018-12-04 17:19:36 +00:00
Monster Iestyn f2b0db5a1c Merge branch 'master' into next 2018-12-04 17:18:19 +00:00
Digiku e6e5856fd8 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 631f6ed406 Merge branch 'joystick-juggling' into 'master'
Joystick juggling

See merge request STJr/SRB2!355
2018-12-04 11:51:55 -05:00
Monster Iestyn d1a8e3acdb 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 c799584f3d 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 60feae1014 Update OSX icon 2018-12-03 23:09:54 -05:00
Digiku ba81e26f71 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 42cb597731 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 fbb2cde800 Make this be consistent with non-CMake builds 2018-12-03 15:42:37 -05:00
Steel Titanium 168647275c One small change 2018-12-03 13:32:24 -05:00
mazmazz 6ca1130551 Hardcode Screenshot, GIF, and Viewpoint to their F keys 2018-12-03 13:21:16 -05:00
mazmazz 205e52f6d4 thisjoyaiming fix for chasefreelook 2018-12-03 13:13:01 -05:00
mazmazz 7ce092128b Revert "Make pause key bring up the menu if it's a joy button"
This reverts commit 9de31cf2e7.
2018-12-03 13:11:48 -05:00
mazmazz 6730c6c765 Menu for joy first/third person vertical look 2018-12-03 13:10:49 -05:00
mazmazz ed57d0d9f9 Add Joy2 for network abort 2018-12-03 13:10:47 -05:00
mazmazz 9de31cf2e7 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 7e523a1e35 Reset vertical look when toggling joyaiming 2018-12-03 13:10:24 -05:00
mazmazz 0bb113130b Add alwaysfreelook to joystick menu 2018-12-03 13:10:20 -05:00
mazmazz 59cabea8bd Add joyaiming qualifier for joystick look up/down 2018-12-03 13:10:19 -05:00
mazmazz 3134d72c12 Preserve event ch for other responders 2018-12-03 13:10:18 -05:00
mazmazz 6bf31492b7 Make M_Responder respond to joy buttons only in-menu (multiplayer bug?) 2018-12-03 13:10:16 -05:00
mazmazz 6dd44ca1de Change PC axis defaults to 360-friendly values 2018-12-03 13:10:15 -05:00
mazmazz 78dde93f3e Remap menu actions to better joy keys 2018-12-03 13:10:12 -05:00
mazmazz 06faf6ffe4 Unneeded input header in st_stuff 2018-12-03 12:36:42 -05:00
mazmazz 8851f39b84 Use static joyname instead of malloc 2018-12-03 12:35:12 -05:00
mazmazz 6c78af3542 Missed (unused?) viewpoint strings 2018-12-03 12:20:19 -05:00
mazmazz 3d8bc85494 Forgot config strings for menu keys 2018-12-03 12:19:41 -05:00