Commit graph

5175 commits

Author SHA1 Message Date
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
5149fb7d66 Merge branch 'appveyor-installer-revise' into 'master'
Make AppVeyor installer paths consistent with Travis installer paths

See merge request STJr/SRB2!446
2019-01-01 11:52:42 -05:00
mazmazz
7d66f912d0 Make AppVeyor installer paths consistent with Travis installer paths(assets/deployer/installer -> assets/installer) 2019-01-01 11:51:17 -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
mazmazz
120e5d9a63 Correct ASSET_FILES_HASHED for kart assets 2019-01-01 10:49:10 -05:00
Digiku
2374750d3c Merge branch 'appveyor-64' into 'mingw-64bit-cpu-target-revise'
Add 64-bit job to Appveyor

See merge request STJr/SRB2!442
2019-01-01 10:14:37 -05:00
Digiku
f2aa86cab2 Merge branch 'appveyor-deployer' into 'appveyor-64'
Add Windows installer building to AppVeyor

See merge request STJr/SRB2!443
2019-01-01 10:14:25 -05:00
mazmazz
a22e5d9a4f Don't download individual asset files; support only archives 2018-12-31 19:08:27 -05:00
mazmazz
3860c557b4 Use optional asset archive instead of file 2018-12-31 18:41:49 -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
mazmazz
77eea3c41d Use optional asset archive instead of file 2018-12-31 17:31:25 -05:00
SeventhSentinel
ac3b69f6e1 Merge remote-tracking branch 'kartinternal/mobj-scale-global' into mobjscale-global 2018-12-31 16:18:33 -05:00
SeventhSentinel
199f71172d Merge remote-tracking branch 'kartinternal/master' into next 2018-12-31 15:16:39 -05:00
SeventhSentinel
3e81975e54 Merge branch 'master' into revert-master 2018-12-31 15:08:43 -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
7024d89e94 Fix dh_link for srb2kart debian symlink 2018-12-30 21:14:41 -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
7d2d3dda7a Kart v1.0.2 deployer default fix 2018-12-30 19:00:09 -05:00
mazmazz
c31ef0c821 Set srb2home name to srb2kart 2018-12-30 18:57:33 -05:00
mazmazz
bcbcc48ada Dummy out -Werror from travis config 2018-12-30 18:54:04 -05:00
mazmazz
50e65ffce7 Update deployer defaults to Kart v1.0.2 2018-12-30 16:01:32 -05:00
mazmazz
c698eed16c Update SDL mac icon to Kart 2018-12-30 15:59:42 -05:00
mazmazz
41517ee57b Update deployer defaults to Kart v1.0.1 2018-12-30 15:54:15 -05:00
mazmazz
1c1050fa9d Update Linux and Mac icons to Kart 2018-12-30 15:53:32 -05:00
mazmazz
85ae6f9b74 Add kart to tar-ignore 2018-12-30 15:52:58 -05:00
mazmazz
337e0da8e4 Implement deployer scripts for Travis -- OSX and Linux package building [Kart merge] 2018-12-30 15:41:58 -05:00
mazmazz
e52eba698a Dummy out ERRORMODE=1 from circleci 2018-12-30 13:50:41 -05:00
mazmazz
e2bd044425 Correct asset links 2018-12-30 13:40:21 -05:00
mazmazz
0056ff7a65 Dummy out DD builds 2018-12-30 13:34:43 -05:00
mazmazz
5ec958fcc3 Update Kart asset paths to 1.0.2 2018-12-30 12:42:58 -05:00
mazmazz
bda09035e3 Dummy out ERRORMODE from appveyor; update to Kart version 1.0.2 2018-12-30 12:38:55 -05:00
mazmazz
1db0ba29cf Rename ASSET_PATCH_DLL_GET to PACKAGE_PATCH_DLL_GET 2018-12-30 12:36:50 -05:00
mazmazz
dab907ff6f Implement install building for appveyor (deployer) 2018-12-30 12:36:49 -05:00
mazmazz
3b581bdcce Add 64-bit DD buildbot 2018-12-30 12:36:13 -05:00
mazmazz
ca0ca0f75c Consolidate [%CONFIGURATION%] == [SDL64] into %X86_64% 2018-12-30 12:36:11 -05:00
mazmazz
e93896ebeb Disable UPX by default in appveyor 2018-12-30 12:36:10 -05:00