mazmazz
5047e41e7d
Merge remote-tracking branch 'kart-public-gl/next' into kart-public-appveyor-improvements
2019-01-02 14:59:00 -05:00
mazmazz
8c1b062352
Flip back ERRORMODE=1 for AppVeyor and CircleCI
2019-01-02 14:58:50 -05:00
mazmazz
18b2f91aee
Use optional asset archive instead of file
2018-12-31 18:41:49 -05:00
SeventhSentinel
5b4faa4ddb
Merge remote-tracking branch 'kartinternal/master' into next
2018-12-31 15:16:39 -05:00
mazmazz
07abd30183
Dummy out ERRORMODE=1 from circleci
2018-12-30 13:50:41 -05:00
mazmazz
7f3549256b
Correct asset links
2018-12-30 13:40:21 -05:00
mazmazz
1154ac16b9
Dummy out DD builds
2018-12-30 13:34:43 -05:00
mazmazz
c4d5317ae3
Update Kart asset paths to 1.0.2
2018-12-30 12:42:58 -05:00
mazmazz
2f743f722a
Dummy out ERRORMODE from appveyor; update to Kart version 1.0.2
2018-12-30 12:38:55 -05:00
mazmazz
9272557241
Rename ASSET_PATCH_DLL_GET to PACKAGE_PATCH_DLL_GET
2018-12-30 12:36:50 -05:00
mazmazz
db6e21a8ac
Implement install building for appveyor (deployer)
2018-12-30 12:36:49 -05:00
mazmazz
07dc638096
Add 64-bit DD buildbot
2018-12-30 12:36:13 -05:00
mazmazz
ee4fc62109
Consolidate [%CONFIGURATION%] == [SDL64] into %X86_64%
2018-12-30 12:36:11 -05:00
mazmazz
5d06e6d054
Disable UPX by default in appveyor
2018-12-30 12:36:10 -05:00
mazmazz
cdcb13c257
Add 64-bit SDL builds to appveyor config
2018-12-30 12:36:08 -05:00
mazmazz
353fd2409d
Rename M5 to ARCHOPTS; allow override by command line
2018-12-30 12:35:29 -05:00
mazmazz
9a186243de
Check for NONX86 in addition to X86_64; move MINGW64 subflags from win32/Makefile.cfg to Makefile
2018-12-30 12:35:27 -05:00
Steel Titanium
aeca8f9967
Don't set if LINUX64 is defined
2018-12-30 12:35:26 -05:00
Steel Titanium
8964fa35c1
Stupid restrictions
2018-12-30 12:35:24 -05:00
Steel Titanium
cc7cff9686
More explict check
2018-12-30 12:35:23 -05:00
Steel Titanium
2dd6bbcc1d
Target nocona for 64-bit builds
2018-12-30 12:35:20 -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