2c75d4da69
Fix custom fade source bug for Change Music linedef
2019-03-13 19:53:16 -04:00
aea18f36ba
Remove MP3 warning
2019-03-13 19:51:45 -04:00
93626c2293
Merge remote-tracking branch 'public-gl/next' into public-musicplus-core
2019-03-13 19:45:07 -04:00
08784ce58d
Merge branch 'master' into next
2019-03-09 20:37:17 -05:00
cd39b951bb
partly Revert "TravisCI: remove WFLAGS"
...
This reverts commit 8780800e8e
2019-03-09 20:36:44 -05:00
8780800e8e
TravisCI: remove WFLAGS
2019-03-09 20:17:14 -05:00
60ca6ae06b
TravisCI: add option for GCC 8.1
2019-03-09 19:41:56 -05:00
747995ae6a
Merge branch 'master' into next
2019-03-04 17:15:04 -05:00
3fa1751706
CircleCi: we need SSH for buildbot
2019-03-04 16:51:39 -05:00
67e246cd53
No more errors for VC6 support
2019-03-04 16:46:14 -05:00
145ccfd405
no more floating constants warnings, and disable bad array bounds warnings
2019-03-04 16:46:14 -05:00
c2618fd987
Merge branch 'master' into next
2019-03-01 17:32:17 -05:00
f823768699
Fix building without BLUA support
2019-03-01 17:31:32 -05:00
c9e8d34b9d
Merge branch 'master' into next
2019-03-01 18:59:32 +00:00
0051eb7039
Merge branch 'circleci' into 'master'
...
CircleCI: test build SRB2 without network support
See merge request STJr/SRB2!462
2019-03-01 12:56:52 -05:00
008b0bf560
Merge branch 'master' into next
2019-03-01 16:23:51 +00:00
67e721e983
Merge branch 'need-more-time' into 'master'
...
Stop Linux servers from hanging every 34 hours
See merge request STJr/SRB2!465
2019-03-01 11:22:32 -05:00
4459ecdd90
Merge branch 'master' into next
2019-03-01 16:05:49 +00:00
27adf300b2
Merge branch 'apng-backport' into 'master'
...
aPNG backport from Kart
See merge request STJr/SRB2!464
2019-03-01 11:04:08 -05:00
4247f47ad9
Merge branch 'higher-maxnodes' into 'next'
...
Upped MAXNETNODES
See merge request STJr/SRB2!463
2019-03-01 09:15:47 -05:00
97de2ae4f6
Stop Linux servers from hanging every 34 hours
2019-03-01 00:07:58 -06:00
7cd60a544a
Merge branch 'apng-oh-shit-fixes' into 'master'
...
Compiling errors for apng fixed
See merge request KartKrew/Kart-Public!69
2019-02-28 12:00:58 -08:00
5620d0188e
Merge branch 'apng' into 'master'
...
Support aPNG in new versions of libpng
See merge request KartKrew/Kart-Public!63
2019-02-28 12:00:58 -08:00
fa990e8603
Remove double define
2019-02-27 16:05:43 -05:00
15b27bb7d7
Upped MAXNETNODES
2019-02-27 15:59:50 -05:00
0340eb0b99
Merge branch 'master' into next
2019-02-27 20:35:07 +00:00
d865b5660a
CircleCI: test build SRB2 without network support
2019-02-27 14:37:31 -05:00
e86d0836a3
Merge branch 'updatelibgme' into 'master'
...
Update game-emu-music lib to 0.6.2
See merge request STJr/SRB2!444
2019-02-27 13:49:44 -05:00
d76e946b3e
Merge branch 'sdl-new-windowicon' into 'master'
...
SDL:Update XPM icon
See merge request STJr/SRB2!441
2019-02-27 13:34:24 -05:00
d44cb36d53
Merge branch 'tails-bot-dead-forever-fix' into 'next'
...
Tails bot dead forever fix
See merge request STJr/SRB2!461
2019-02-27 12:39:56 -05:00
a25f4b8194
Make sure that B_CheckRespawn can be called even if Tails is dead
2019-02-26 21:14:22 +00:00
e36193e44e
Merge branch 'hide-error-devmode' into 'next'
...
Show line number on error, also hide under devmode
See merge request STJr/SRB2!458
2019-02-21 23:05:09 -05:00
2f8eadd211
Merge branch 'master' into next
2019-02-21 22:42:26 -05:00
7667122912
Merge branch 'gcc8-statement-warning' into 'master'
...
GCC8: Disable multi statement macros errors.
See merge request STJr/SRB2!459
2019-02-21 22:32:38 -05:00
c1deea0714
Disable multi statement macros errors.
2019-02-21 18:48:42 -05:00
76724c9c13
Show line number on error, also hide under devmode
2019-02-11 16:39:58 -05:00
ca176b6225
Merge branch 'polyobj_fix_vanilia' into 'master'
...
Fix rendering gaps on polys with upper/lower textures
See merge request STJr/SRB2!453
2019-02-11 15:05:44 -05:00
e6cb47e2f2
Merge branch 'fix_skins_overflow' into 'next'
...
Fix skin overflow error
See merge request STJr/SRB2!455
2019-02-11 15:05:00 -05:00
0aa965c59f
How did I forget about this
2019-01-26 23:22:30 -05:00
bce093fd06
Setup the tables even eariler.
...
I really hate that PlayerMenu status hack, but that's really the only
way I could think off to show the entires for Tails, Knuckles and the
Sonic&Tails pair.
2019-01-26 23:16:49 -05:00
74bf3164f8
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2 into polyobj_fix_vanilia
2019-01-26 00:51:39 -05:00
0d1c501664
Update the SP menu stuff to use MAXSKINS
...
Co-authoered-by: Steel Titanium (steeltitanium1@gmail.com>
2019-01-26 00:22:05 -05:00
74850fea17
Merge branch 'master' into next
2019-01-20 17:01:01 -05:00
b8b605a9c7
Merge branch 'apng-conditional-disable' into 'master'
...
Disable the APNG code if the version of libpng is greater than 1.4.
See merge request STJr/SRB2!457
2019-01-20 17:00:50 -05:00
b18a8dbc8d
Disable the APNG code if the version of libpng is greater than 1.4.
...
Since supposedly the current code *can't* work with newer versions of libpng that have the apng patch, it won't compile if that's what people have.
It seems like some distros are adding the apng patch to libpng and that'll make things annoying to compile for people.
I think it goes without saying, but if there's ever a fix to make newer libpng versions work with the APNG code then this can be reverted.
2019-01-20 18:50:28 +00:00
fad341b0e9
Fix skins overflow
2019-01-15 14:29:43 -05:00
7e026824a4
Fix rendering gaps on polys with upper/lower textures
2019-01-12 20:15:58 -05:00
4f0be1b064
Update f_finale.c - Small credits update
2019-01-07 16:50:59 -05:00
1c1331199d
Update f_finale.c - Remove Torgo's real name by request
2019-01-07 03:41:25 -05:00
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
mazmazz