mazmazz
b3d29fb713
* Add homebrew tap mazmazz/srb2
...
* Use sdl2_mixer from mazmazz/srb2 due to removed options from homebrew-core
* Use `brew install --build-bottle` to build compatible libraries for old Macs
2019-01-05 19:30:58 -05:00
mazmazz
061b1e406b
Don't terminate in after_success because it halts the log abruptly
2019-01-05 19:30:57 -05:00
mazmazz
963d6c85bc
Revised comments
2019-01-05 19:30:54 -05:00
SeventhSentinel
daec4f9f7e
Merge remote-tracking branch 'srb2public/master' into merge-srb2
2019-01-05 18:42:58 -05:00
SeventhSentinel
73542c008c
merge srb2 next
2019-01-05 15:59:23 -05:00
SeventhSentinel
a10ac14462
turn these signed before abs-ing em
2019-01-05 00:42:36 -05:00
SeventhSentinel
4de91cfea5
Load sounds.kart after patch.kart
2019-01-05 00:33:24 -05:00
Sal
9e09d8cb8c
Merge branch 'mainwads-fix' into 'next'
...
Don't increment mainwads for sounds or music.kart
See merge request KartKrew/Kart-Public!12
2019-01-04 20:01:57 -05:00
Steel Titanium
888b5056d7
Clean up the comments a bit
2019-01-04 19:55:05 -05:00
Digiku
d5870e6f8a
Merge branch 'changecontrol-text-overflow-fix' into 'master'
...
Resolve buffer overflow crash when configuring System Menu and GIF controls
See merge request STJr/SRB2!445
2019-01-04 19:39:17 -05:00
Digiku
c97dc5d3c4
Increase M_ChangecontrolResponse message buffer by 25 chars
2019-01-04 19:38:36 -05:00
SeventhSentinel
3e37d131ed
Minor touchups/cleanup
2019-01-04 16:47:03 -05:00
SeventhSentinel
5d51754936
In-game music credits
2019-01-04 04:44:55 -05:00
Steel Titanium
a69239bfa8
Don't increment mainwads for sounds or music.kart
2019-01-04 00:32:01 -05:00
mazmazz
788c75ecdf
Merge remote-tracking branch 'kart-public-gl/next' into kart-public-travis-deployer
2019-01-03 12:31:26 -05:00
Sal
e52d5fd2fd
Merge branch 'bump-fixes' into 'next'
...
Push bouncing players backwards if they get stuck in a wall
See merge request KartKrew/Kart-Public!3
2019-01-03 12:27:14 -05:00
mazmazz
5f632d9b3c
Updated Kart icons to higher res
2019-01-03 12:26:25 -05:00
Sal
0b0cbcabb7
Merge branch 'map-palette-titlefix' into 'next'
...
Fix per-map palette not being reset properly when it should.
See merge request KartKrew/Kart-Public!9
2019-01-03 01:08:42 -05:00
Sal
220ef1a490
Merge branch 'waypoint-lap-option' into 'next'
...
Add waypoint lap field via Parameter field
See merge request KartKrew/Kart-Public!4
2019-01-03 00:58:09 -05:00
mazmazz
e7ffd86c6e
Fixx GCC 4.4 array-bounds compile errors
2019-01-02 20:58:52 -05:00
mazmazz
b8fe77b6e2
Add __DPL_ACTIVE condition to optional asset download
2019-01-02 20:49:00 -05:00
mazmazz
3a0217c8c8
Dummy out unused functions (OSX xcode errors)
2019-01-02 20:10:53 -05:00
mazmazz
b08e522aca
Better rewrite for addons draw adjustment [Kart]
2019-01-02 20:03:53 -05:00
mazmazz
4ea7c53d8e
Remove FIXUPO0 GCC pragma
2019-01-02 20:03:52 -05:00
mazmazz
6166b78c87
Fix gcc 8 compile by using strcpy instead of memcpy for PM
2019-01-02 19:23:59 -05:00
mazmazz
963819c81d
Initialize skinnum for MD2 star colors (fix CLANG error)
2019-01-02 19:23:57 -05:00
mazmazz
c338115ebc
Fix strncpy nodenum length overflow
2019-01-02 19:23:56 -05:00
mazmazz
503c75576b
Correct asset directory for travis
2019-01-02 19:23:54 -05:00
mazmazz
908869e15b
Re-enable Werror CFLAG in travis
2019-01-02 17:33:57 -05:00
mazmazz
9b24fd9337
Add HISTORY.txt to assets; correct default lists for capitalization
2019-01-02 17:31:04 -05:00
mazmazz
cf2b93d8ab
Corrected CMake hashed assets; add kart to assets/gitignore
2019-01-02 17:27:15 -05:00
wolfy852
15b0e3ab51
Fix a randomly changed comment (?)
2019-01-02 15:45:04 -06:00
wolfy852
80390fdfa7
Whitespace fixes
2019-01-02 15:43:07 -06:00
wolfy852
ad7dc11b79
Revert CMake/Appveyor changes
2019-01-02 15:39:57 -06:00
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