SeventhSentinel
|
74aba46823
|
In-game music credits
|
2019-01-04 04:44:55 -05:00 |
|
Steel Titanium
|
d2da1db6c8
|
Don't increment mainwads for sounds or music.kart
|
2019-01-04 00:32:01 -05:00 |
|
SeventhSentinel
|
57b25fd385
|
Actually, let's just do "1"
|
2019-01-03 16:43:01 -05:00 |
|
SeventhSentinel
|
b885005950
|
Update SOC version, make base SRB2 SOC throw a warning
|
2019-01-03 16:30:50 -05:00 |
|
mazmazz
|
34b415bdac
|
Merge remote-tracking branch 'kart-public-gl/next' into kart-public-travis-deployer
|
2019-01-03 12:31:26 -05:00 |
|
Sal
|
b69013a4f1
|
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
|
f0715d7af3
|
Updated Kart icons to higher res
|
2019-01-03 12:26:25 -05:00 |
|
Sal
|
1b02805445
|
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
|
5c1267d2e6
|
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
|
5347d5390f
|
Fixx GCC 4.4 array-bounds compile errors
|
2019-01-02 20:58:52 -05:00 |
|
mazmazz
|
1de758fcff
|
Add __DPL_ACTIVE condition to optional asset download
|
2019-01-02 20:49:00 -05:00 |
|
mazmazz
|
72ff758b07
|
Dummy out unused functions (OSX xcode errors)
|
2019-01-02 20:10:53 -05:00 |
|
mazmazz
|
93e8751938
|
Better rewrite for addons draw adjustment [Kart]
|
2019-01-02 20:03:53 -05:00 |
|
mazmazz
|
5b663bfd28
|
Remove FIXUPO0 GCC pragma
|
2019-01-02 20:03:52 -05:00 |
|
mazmazz
|
2fe8317103
|
Fix gcc 8 compile by using strcpy instead of memcpy for PM
|
2019-01-02 19:23:59 -05:00 |
|
mazmazz
|
08a788af74
|
Initialize skinnum for MD2 star colors (fix CLANG error)
|
2019-01-02 19:23:57 -05:00 |
|
mazmazz
|
238be26915
|
Fix strncpy nodenum length overflow
|
2019-01-02 19:23:56 -05:00 |
|
mazmazz
|
3d79264d9e
|
Correct asset directory for travis
|
2019-01-02 19:23:54 -05:00 |
|
mazmazz
|
99baa585c8
|
Re-enable Werror CFLAG in travis
|
2019-01-02 17:33:57 -05:00 |
|
mazmazz
|
1f0c7425f9
|
Add HISTORY.txt to assets; correct default lists for capitalization
|
2019-01-02 17:31:04 -05:00 |
|
mazmazz
|
a213898fdf
|
Corrected CMake hashed assets; add kart to assets/gitignore
|
2019-01-02 17:27:15 -05:00 |
|
wolfy852
|
b517b738c8
|
Fix a randomly changed comment (?)
|
2019-01-02 15:45:04 -06:00 |
|
wolfy852
|
916d87ead6
|
Whitespace fixes
|
2019-01-02 15:43:07 -06:00 |
|
wolfy852
|
1f1431ff5a
|
Revert CMake/Appveyor changes
|
2019-01-02 15:39:57 -06:00 |
|
wolfy852
|
b3cd4283e4
|
Fix a duped line
|
2019-01-02 15:03:13 -06:00 |
|
wolfy852
|
bf5d14c37f
|
Rebind the talk key by default, but move it to D-Pad Down
|
2019-01-02 14:50:36 -06:00 |
|
wolfy852
|
1c33146e95
|
Turns out we don't need this
|
2019-01-02 14:47:24 -06:00 |
|
mazmazz
|
eb910268a2
|
Merge remote-tracking branch 'kart-public-gl/next' into kart-public-appveyor-improvements
|
2019-01-02 14:59:00 -05:00 |
|
mazmazz
|
3ccdea433d
|
Flip back ERRORMODE=1 for AppVeyor and CircleCI
|
2019-01-02 14:58:50 -05:00 |
|
Latapostrophe
|
40140d4372
|
More cleanups and WANTED stuff
|
2019-01-02 20:36:13 +01:00 |
|
Steel Titanium
|
4e0f4ed709
|
Remove double brackets
|
2019-01-02 13:04:56 -05:00 |
|
Alam Ed Arias
|
13e3a975d8
|
Merge branch 'master' into next
|
2019-01-01 23:00:39 -05:00 |
|
Digiku
|
764e6e7659
|
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
|
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 |
|