Commit graph

4676 commits

Author SHA1 Message Date
mazmazz
90eacd94cf Don't download individual asset files; support only archives 2018-12-31 19:08:27 -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
SeventhSentinel
5b4faa4ddb Merge remote-tracking branch 'kartinternal/master' into next 2018-12-31 15:16:39 -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
eb29a0bcef Fix dh_link for srb2kart debian symlink 2018-12-30 21:14:41 -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
8dd0c8dff8 Kart v1.0.2 deployer default fix 2018-12-30 19:00:09 -05:00
mazmazz
9b698d24b9 Set srb2home name to srb2kart 2018-12-30 18:57:33 -05:00
mazmazz
14c5805e90 Dummy out -Werror from travis config 2018-12-30 18:54:04 -05:00
mazmazz
679fe2aec1 Update deployer defaults to Kart v1.0.2 2018-12-30 16:01:32 -05:00
mazmazz
346e11d6da Update SDL mac icon to Kart 2018-12-30 15:59:42 -05:00
mazmazz
6d00b47225 Update deployer defaults to Kart v1.0.1 2018-12-30 15:54:15 -05:00
mazmazz
cf5aa7b807 Update Linux and Mac icons to Kart 2018-12-30 15:53:32 -05:00
mazmazz
355232ec30 Add kart to tar-ignore 2018-12-30 15:52:58 -05:00
mazmazz
e2f5c99217 Implement deployer scripts for Travis -- OSX and Linux package building [Kart merge] 2018-12-30 15:41:58 -05:00
Sal
1951548245 Merge branch 'stupid-orbinaut-bullshit' into 'master'
Fix stupid Orbinaut bullshit

See merge request KartKrew/Kart!120
2018-12-15 19:10:41 -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
d16c47ccb6 Edited the installer to support SRB2Kart
There is a LOT that can go wrong here, so I'm not gonna make this a priority for v1.0.2. If someone else wants to take a crack at maintaining this though, and fixing any and all inconsistencies, then feel free.
2018-12-05 20:39:42 -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
Digiku
0d86292d10 Merge branch 'exchndl-new' into 'master'
Slightly re-organize DLLs and document the required list for bundling

See merge request STJr/SRB2!365
2018-12-04 11:51:17 -05:00
TehRealSalt
0a00a0cebb Revert "Add player taunt functions to Lua"
This reverts commit 09e9e2ba4d.
2018-12-04 11:39:45 -05:00
Digiku
e224bfd0e6 Merge branch 'installer-followup' into 'master'
Make uninstaller a self-extractable

See merge request STJr/SRB2!367
2018-12-04 11:18:09 -05:00
mazmazz
decb22dabd Make uninstaller a self-extractable 2018-12-04 11:17:08 -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
Digiku
20386d26ee Merge branch 'installer-followup' into 'master'
Add old-install-list.txt to explicitly define which old install files need to be moved

See merge request STJr/SRB2!366
2018-12-04 01:12:21 -05:00
mazmazz
7b1423a236 Add old-install-list.txt to explicitly define which old install files need to be moved
Replaces MoveOldExeDlls routine in installer staging
2018-12-04 01:11:30 -05:00
mazmazz
2b336b9f2f Move DLL binaries from bin/Resources to libs/dll-binaries
Reason for this is because the SDL2 binaries live in libs/ for ease of copying. The DLLs ought to be in one location.
2018-12-04 00:57:28 -05:00