wolfy852
|
69a760c923
|
Fix a duped line
|
2019-01-02 15:03:13 -06:00 |
|
wolfy852
|
4da56398ca
|
Rebind the talk key by default, but move it to D-Pad Down
|
2019-01-02 14:50:36 -06:00 |
|
wolfy852
|
e4830b1a3a
|
Turns out we don't need this
|
2019-01-02 14:47:24 -06:00 |
|
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 |
|
Steel Titanium
|
3273924743
|
Remove double brackets
|
2019-01-02 13:04:56 -05:00 |
|
Alam Ed Arias
|
819e4ef2ae
|
Merge branch 'master' into next
|
2019-01-01 23:00:39 -05:00 |
|
Digiku
|
393c64b8bc
|
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
|
5278d1ca20
|
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
|
900a439c11
|
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
|
528c6f771a
|
Make AppVeyor installer paths consistent with Travis installer paths(assets/deployer/installer -> assets/installer)
|
2019-01-01 11:51:17 -05:00 |
|
Digiku
|
bbd878e520
|
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 |
|
Digiku
|
ce7875b133
|
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
|
bd81c3190e
|
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
|
18b2f91aee
|
Use optional asset archive instead of file
|
2018-12-31 18:41:49 -05:00 |
|
Steel Titanium
|
d6178a3a40
|
Comment this out again.
How did this even get reverted...
|
2018-12-31 18:34:04 -05:00 |
|
Steel Titanium
|
6ad2c145d7
|
Better attempt at fixing this
|
2018-12-31 18:19:18 -05:00 |
|
SeventhSentinel
|
1987dec652
|
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
|
5cd6b58c44
|
Remove accidental DEVELOP commit
|
2018-12-31 17:55:27 -05:00 |
|
mazmazz
|
f00cfb7b3f
|
Use optional asset archive instead of file
|
2018-12-31 17:31:25 -05:00 |
|
SeventhSentinel
|
23d54095d9
|
Merge remote-tracking branch 'kartinternal/mobj-scale-global' into mobjscale-global
|
2018-12-31 16:18:33 -05:00 |
|
SeventhSentinel
|
5b4faa4ddb
|
Merge remote-tracking branch 'kartinternal/master' into next
|
2018-12-31 15:16:39 -05:00 |
|
SeventhSentinel
|
7be6dab8a6
|
Merge branch 'master' into revert-master
|
2018-12-31 15:08:43 -05:00 |
|
Steel Titanium
|
749bc65caa
|
Attempt 1 to properly fix
|
2018-12-31 14:18:00 -05:00 |
|
Steel Titanium
|
18fea4f3b1
|
Revert "Fix per-map palette not being reset properly on title"
This reverts commit 1bb6ff27c8.
|
2018-12-31 13:35:38 -05:00 |
|
mazmazz
|
d61eb7edee
|
Increase ChangeControl text buffer to resolve buffer overflow with System Menu/GIF control config
|
2018-12-31 01:43:47 -05:00 |
|
Steel Titanium
|
1bb6ff27c8
|
Fix per-map palette not being reset properly on title
|
2018-12-30 23:38:38 -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 |
|
mazmazz
|
e1300d5173
|
Rename ASSET_PATCH_DLL_GET to PACKAGE_PATCH_DLL_GET
|
2018-12-30 10:43:17 -05:00 |
|
mazmazz
|
941e29780c
|
Implement install building for appveyor (deployer)
|
2018-12-30 03:42:55 -05:00 |
|
mazmazz
|
bef0bc82e4
|
Merge branch 'mingw-64bit-cpu-target-revise' into appveyor-64
|
2018-12-29 23:46:16 -05:00 |
|
mazmazz
|
e7165444b4
|
Add 64-bit DD buildbot
|
2018-12-29 23:16:08 -05:00 |
|
mazmazz
|
0fc07ebaae
|
Consolidate [%CONFIGURATION%] == [SDL64] into %X86_64%
|
2018-12-29 23:15:09 -05:00 |
|
mazmazz
|
2aa7ee70fe
|
Disable UPX by default in appveyor
|
2018-12-29 22:51:10 -05:00 |