Commit graph

3949 commits

Author SHA1 Message Date
mazmazz
3a0217c8c8 Dummy out unused functions (OSX xcode errors) 2019-01-02 20:10:53 -05:00
mazmazz
b08e522aca Better rewrite for addons draw adjustment [Kart] 2019-01-02 20:03:53 -05:00
mazmazz
4ea7c53d8e Remove FIXUPO0 GCC pragma 2019-01-02 20:03:52 -05:00
mazmazz
6166b78c87 Fix gcc 8 compile by using strcpy instead of memcpy for PM 2019-01-02 19:23:59 -05:00
mazmazz
963819c81d Initialize skinnum for MD2 star colors (fix CLANG error) 2019-01-02 19:23:57 -05:00
mazmazz
c338115ebc Fix strncpy nodenum length overflow 2019-01-02 19:23:56 -05:00
mazmazz
97295bb285 Merge remote-tracking branch 'kart-public-gl/next' into kart-public-travis-deployer 2018-12-31 18:20:04 -05:00
mazmazz
91f9168a01 Increase ChangeControl text buffer to resolve buffer overflow with System Menu/GIF control config 2018-12-31 01:45:03 -05:00
mazmazz
07e7dba730 Also change DEFAULTWADLOCATION to SRB2Kart in SDL2 2018-12-31 00:21:19 -05:00
mazmazz
9684dfd6f6 Change DEFAULTWADLOCATION to SRB2Kart 2018-12-30 21:13:02 -05:00
mazmazz
48d3df5c6e Apply srb2home to saveconfig ONLY if srb2home isn't already there 2018-12-30 19:39:44 -05:00
mazmazz
fa551a980b Apply srb2home to debugfile 2018-12-30 19:39:42 -05:00
mazmazz
7616e30142 Apply srb2home to SAVECONFIG 2018-12-30 19:39:41 -05:00
mazmazz
de0da37691 EXEC: Search for CFG by file path 2018-12-30 19:39:39 -05:00
mazmazz
077469cbab Fix savegamename being improperly built due to missing null char after copying timeattackfolder 2018-12-30 19:39:36 -05:00
mazmazz
9b698d24b9 Set srb2home name to srb2kart 2018-12-30 18:57:33 -05:00
mazmazz
346e11d6da Update SDL mac icon to Kart 2018-12-30 15:59:42 -05:00
mazmazz
e2f5c99217 Implement deployer scripts for Travis -- OSX and Linux package building [Kart merge] 2018-12-30 15:41:58 -05:00
SeventhSentinel
2cb2b02b73 Fix Ballhog under the last commit...
It actually uses trailing item's throw speeds instead of its own, oddly enough; I don't want to mess with the gameplay there, so I just gave it its own exception.
2018-12-13 09:47:14 -05:00
SeventhSentinel
6d19be6412 Make SPB follow the same rules too 2018-12-13 09:34:27 -05:00
SeventhSentinel
bbf8222767 Stupid Orbinaut bullshit
- Fix Orbinaut/Jawz not accepting top speed changes (This means back-spam being slower now for real works, and the speed buff on boosters for real works.)
- Make the top-speed buffs for boosters not work for back-spam
2018-12-12 21:25:18 -05:00
TehRealSalt
c599d84d6e 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
9bafdaf492 > 2
Same here
2018-12-05 22:54:06 -05:00
TehRealSalt
0bd0240464 < -2
I doubt this hurts anything, but might as well I guess
2018-12-05 22:53:34 -05:00
TehRealSalt
c2dfc1155f Set Shrink timer, don't add to it 2018-12-05 22:51:08 -05:00
TehRealSalt
101feb9498 Add Miku's author to credits. 2018-12-05 21:58:26 -05:00
Sal
261319b754 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
97f2f858ad Give lap animation V_SNAPTOTOP as intended 2018-12-05 21:39:34 -05:00
TehRealSalt
116b10c29d Comment out M_DrawSaveLoadBorder 2018-12-05 21:27:51 -05:00
TehRealSalt
d0180ecb15 Cut this down slightly 2018-12-05 20:54:58 -05:00
TehRealSalt
d53e4af93a Merge remote-tracking branch 'srb2public/next' into merge-next 2018-12-05 20:46:48 -05:00
TehRealSalt
7ab098636b Edited even more things to say "SRB2Kart" 2018-12-05 20:40:58 -05:00
TehRealSalt
df191639bd Merge remote-tracking branch 'srb2public/master' into merge-next 2018-12-05 19:21:13 -05:00
TehRealSalt
b3b5b3f81d Beyond a certain threshold, forcefully give 2nd a SPB if one's not already out. 2018-12-05 19:09:05 -05: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
TehRealSalt
0a00a0cebb Revert "Add player taunt functions to Lua"
This reverts commit 09e9e2ba4d.
2018-12-04 11:39:45 -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
TehRealSalt
09e9e2ba4d Add player taunt functions to Lua
People have REALLY wanted these for their scripts
2018-12-03 20:28:07 -05:00
TehRealSalt
188c0164b6 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
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