Commit graph

4744 commits

Author SHA1 Message Date
Sal
b69013a4f1 Merge branch 'bump-fixes' into 'next'
Push bouncing players backwards if they get stuck in a wall

See merge request KartKrew/Kart-Public!3
2019-01-03 12:27:14 -05:00
mazmazz
f0715d7af3 Updated Kart icons to higher res 2019-01-03 12:26:25 -05:00
Sal
1b02805445 Merge branch 'map-palette-titlefix' into 'next'
Fix per-map palette not being reset properly when it should.

See merge request KartKrew/Kart-Public!9
2019-01-03 01:08:42 -05:00
Sal
5c1267d2e6 Merge branch 'waypoint-lap-option' into 'next'
Add waypoint lap field via Parameter field

See merge request KartKrew/Kart-Public!4
2019-01-03 00:58:09 -05:00
mazmazz
5347d5390f Fixx GCC 4.4 array-bounds compile errors 2019-01-02 20:58:52 -05:00
mazmazz
72ff758b07 Dummy out unused functions (OSX xcode errors) 2019-01-02 20:10:53 -05:00
mazmazz
93e8751938 Better rewrite for addons draw adjustment [Kart] 2019-01-02 20:03:53 -05:00
mazmazz
5b663bfd28 Remove FIXUPO0 GCC pragma 2019-01-02 20:03:52 -05:00
mazmazz
2fe8317103 Fix gcc 8 compile by using strcpy instead of memcpy for PM 2019-01-02 19:23:59 -05:00
mazmazz
08a788af74 Initialize skinnum for MD2 star colors (fix CLANG error) 2019-01-02 19:23:57 -05:00
mazmazz
238be26915 Fix strncpy nodenum length overflow 2019-01-02 19:23:56 -05:00
wolfy852
b517b738c8 Fix a randomly changed comment (?) 2019-01-02 15:45:04 -06:00
wolfy852
916d87ead6 Whitespace fixes 2019-01-02 15:43:07 -06:00
wolfy852
b3cd4283e4 Fix a duped line 2019-01-02 15:03:13 -06:00
wolfy852
bf5d14c37f Rebind the talk key by default, but move it to D-Pad Down 2019-01-02 14:50:36 -06:00
wolfy852
1c33146e95 Turns out we don't need this 2019-01-02 14:47:24 -06:00
Latapostrophe
40140d4372 More cleanups and WANTED stuff 2019-01-02 20:36:13 +01:00
Steel Titanium
4e0f4ed709 Remove double brackets 2019-01-02 13:04:56 -05:00
Alam Ed Arias
13e3a975d8 Merge branch 'master' into next 2019-01-01 23:00:39 -05:00
Digiku
764e6e7659 Merge branch 'expanded-nmuslist' into 'next'
Expand NMUSList to include HUD changes

See merge request STJr/SRB2!388
2019-01-01 15:06:04 -05:00
Digiku
4560b4cb41 Merge branch 'caps-lock-consistency-fix' into 'master'
Update capslock state on window re-focus

See merge request STJr/SRB2!436
2019-01-01 15:05:20 -05:00
Digiku
80dc98624b Merge branch 'mingw-64bit-cpu-target-revise' into 'master'
MinGW64:Target nocona for 64-bit builds [revision]

See merge request STJr/SRB2!440
2019-01-01 11:15:34 -05:00
Steel Titanium
b63f4a66e8 Comment this out again.
How did this even get reverted...
2018-12-31 18:34:04 -05:00
mazmazz
c520447f77 Merge remote-tracking branch 'kart-public-gl/next' into kart-public-travis-deployer 2018-12-31 18:20:04 -05:00
Steel Titanium
26a257eda7 Better attempt at fixing this 2018-12-31 18:19:18 -05:00
SeventhSentinel
998374d603 This would probably be fine, but lets make it consistent like every other instance of this. 2018-12-31 17:59:42 -05:00
SeventhSentinel
c24f53f2f8 Remove accidental DEVELOP commit 2018-12-31 17:55:27 -05:00
Steel Titanium
de6c2a84f3 Attempt 1 to properly fix 2018-12-31 14:18:00 -05:00
Steel Titanium
fddd6fb0d5 Revert "Fix per-map palette not being reset properly on title"
This reverts commit b63e6ab325.
2018-12-31 13:35:38 -05:00
mazmazz
f395aeda96 Increase ChangeControl text buffer to resolve buffer overflow with System Menu/GIF control config 2018-12-31 01:45:03 -05:00
mazmazz
61e8685713 Increase ChangeControl text buffer to resolve buffer overflow with System Menu/GIF control config 2018-12-31 01:43:47 -05:00
mazmazz
af519d3c07 Also change DEFAULTWADLOCATION to SRB2Kart in SDL2 2018-12-31 00:21:19 -05:00
Steel Titanium
b63e6ab325 Fix per-map palette not being reset properly on title 2018-12-30 23:38:38 -05:00
mazmazz
937ac47650 Change DEFAULTWADLOCATION to SRB2Kart 2018-12-30 21:13:02 -05:00
mazmazz
e510804b4b Apply srb2home to saveconfig ONLY if srb2home isn't already there 2018-12-30 19:39:44 -05:00
mazmazz
b77f290e02 Apply srb2home to debugfile 2018-12-30 19:39:42 -05:00
mazmazz
b42c265707 Apply srb2home to SAVECONFIG 2018-12-30 19:39:41 -05:00
mazmazz
9be802f304 EXEC: Search for CFG by file path 2018-12-30 19:39:39 -05:00
mazmazz
08176eda18 Fix savegamename being improperly built due to missing null char after copying timeattackfolder 2018-12-30 19:39:36 -05:00
mazmazz
c31ef0c821 Set srb2home name to srb2kart 2018-12-30 18:57:33 -05:00
mazmazz
c698eed16c Update SDL mac icon to Kart 2018-12-30 15:59:42 -05:00
mazmazz
337e0da8e4 Implement deployer scripts for Travis -- OSX and Linux package building [Kart merge] 2018-12-30 15:41:58 -05:00
Steel Titanium
07f1d495a4 Inclue PNG file 2018-12-29 23:10:45 -05:00
Steel Titanium
b6538c966e Update XPM icon 2018-12-29 22:52:04 -05:00
mazmazz
deec4550d3 Rename M5 to ARCHOPTS; allow override by command line 2018-12-29 21:55:35 -05:00
mazmazz
44d2340a5b Check for NONX86 in addition to X86_64; move MINGW64 subflags from win32/Makefile.cfg to Makefile 2018-12-29 21:14:50 -05:00
Latapostrophe
473b4ff5a4 Cleaner code because I was a huge idiot 2018-12-29 21:46:40 +01:00
wolfy852
f5cd56004c JoyInfo1 -> JoyInfo
Don't you love it when typos ruin everything? :P
2018-12-29 13:55:58 -06:00
Latapostrophe
9a9b13bf51 Alignment mistakes for nongreen 2018-12-29 11:17:51 +01:00
Latapostrophe
55d79622fa Clean up splitscreen huds to allow minimap 2018-12-29 10:59:34 +01:00