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 |
|
mazmazz
|
ab308cd627
|
Correct ASSET_FILES_HASHED for kart assets
|
2019-01-01 10:49:10 -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
|
90eacd94cf
|
Don't download individual asset files; support only archives
|
2018-12-31 19:08:27 -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 |
|
mazmazz
|
97295bb285
|
Merge remote-tracking branch 'kart-public-gl/next' into kart-public-travis-deployer
|
2018-12-31 18:20: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
|
91f9168a01
|
Increase ChangeControl text buffer to resolve buffer overflow with System Menu/GIF control config
|
2018-12-31 01:45:03 -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 |
|
mazmazz
|
07e7dba730
|
Also change DEFAULTWADLOCATION to SRB2Kart in SDL2
|
2018-12-31 00:21:19 -05:00 |
|
Steel Titanium
|
1bb6ff27c8
|
Fix per-map palette not being reset properly on title
|
2018-12-30 23:38:38 -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 |
|
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 |
|