Commit graph

4408 commits

Author SHA1 Message Date
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
TehRealSalt
7f335e9c46 Actually, best of both:
Let Grow/Shrink revert itself when it changes to 0, as well as add a function for removing either. Means we don't have to modify every single > 0/< 0 check, and is overall cleaner.
2018-12-05 23:28:44 -05:00
TehRealSalt
2d9ad86d20 > 2
Same here
2018-12-05 22:54:06 -05:00
TehRealSalt
fbf0cb2211 < -2
I doubt this hurts anything, but might as well I guess
2018-12-05 22:53:34 -05:00
TehRealSalt
90f480faa2 Set Shrink timer, don't add to it 2018-12-05 22:51:08 -05:00
TehRealSalt
5e4bd29c9c Add Miku's author to credits. 2018-12-05 21:58:26 -05:00
Sal
2cd332f5c6 Merge branch 'force-spb' into 'master'
Beyond a certain threshold, forcefully give 2nd a SPB if one's not already out.

See merge request KartKrew/Kart!119
2018-12-05 21:43:59 -05:00
TehRealSalt
0b40488fb8 Give lap animation V_SNAPTOTOP as intended 2018-12-05 21:39:34 -05:00
TehRealSalt
6af84a96c1 Comment out M_DrawSaveLoadBorder 2018-12-05 21:27:51 -05:00
TehRealSalt
d7ee931a16 Cut this down slightly 2018-12-05 20:54:58 -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
TehRealSalt
6012fd09e6 Beyond a certain threshold, forcefully give 2nd a SPB if one's not already out. 2018-12-05 19:09:05 -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
TehRealSalt
681b4d4b99 Revert "Add player taunt functions to Lua"
This reverts commit 1de54c0bbd.
2018-12-04 11:39:45 -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
TehRealSalt
1de54c0bbd Add player taunt functions to Lua
People have REALLY wanted these for their scripts
2018-12-03 20:28:07 -05:00
TehRealSalt
2ff31a7b72 Buff item hitbox size
I was gonna hold off for v2 to do this, but frankly... this is too good to have. Honestly I think this is a big buff for karma items... people unable to hit as bombs will have a LOT less trouble as item.
2018-12-03 17:30:27 -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
mazmazz
098f02fc95 Reset vertical look when toggling joyaiming 2018-12-03 13:10:24 -05:00
mazmazz
24ff6bc279 Add alwaysfreelook to joystick menu 2018-12-03 13:10:20 -05:00
mazmazz
faeb2ff430 Add joyaiming qualifier for joystick look up/down 2018-12-03 13:10:19 -05:00