Alam Ed Arias
4cb71746a7
Revert "Update CMakeLists.txt, remove CMAKE_SIZEOF_VOID_P check"
...
This reverts commit 7d14342a8f
2019-03-18 23:58:31 -04:00
Alam Ed Arias
7d14342a8f
Update CMakeLists.txt, remove CMAKE_SIZEOF_VOID_P check
2019-03-18 16:50:17 -04:00
Steel Titanium
4757031929
Remove the define.
2019-03-15 18:46:25 -04:00
Steel Titanium
4837c1742b
Merge branch 'master' into errorifpng
2019-03-15 16:40:47 -04:00
Alam Ed Arias
a2c1b63864
partly Revert "TravisCI: remove WFLAGS"
...
This reverts commit a22c9a999e
2019-03-09 20:36:44 -05:00
Alam Ed Arias
a22c9a999e
TravisCI: remove WFLAGS
2019-03-09 20:17:14 -05:00
Alam Ed Arias
d386febf56
TravisCI: add option for GCC 8.1
2019-03-09 19:41:56 -05:00
Alam Ed Arias
ca407e2be7
CircleCi: we need SSH for buildbot
2019-03-04 16:51:39 -05:00
Alam Ed Arias
9dbdc6a3a5
No more errors for VC6 support
2019-03-04 16:46:14 -05:00
Alam Ed Arias
4b0e8db4c1
no more floating constants warnings, and disable bad array bounds warnings
2019-03-04 16:46:14 -05:00
Steel Titanium
3c1f0b5e3f
New -noxinput and -nohidapi command line parameters.
2019-03-03 22:57:09 -05:00
Steel Titanium
c6900b6c89
Check using memcmp()
2019-03-03 22:43:21 -05:00
Steel Titanium
0b11424e3d
Error if the lump is a PNG lump
2019-03-03 19:58:01 -05:00
Alam Ed Arias
2eb26bc68e
Fix building without BLUA support
2019-03-01 17:31:32 -05:00
Monster Iestyn
0bfcbca0a2
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
Monster Iestyn
8d124101f4
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
Monster Iestyn
351a5e28be
Merge branch 'apng-backport' into 'master'
...
aPNG backport from Kart
See merge request STJr/SRB2!464
2019-03-01 11:04:08 -05:00
wolfy852
cc7112eaf5
Stop Linux servers from hanging every 34 hours
2019-03-01 00:07:58 -06:00
Alam Ed Arias
3cbb1204ad
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
wolfs
8a6f4b6405
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
Alam Arias
0ea2177a4e
CircleCI: test build SRB2 without network support
2019-02-27 14:37:31 -05:00
Monster Iestyn
4933e1de51
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
Monster Iestyn
ea0c251a92
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
Alam Ed Arias
7a09161e69
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
Steel Titanium
45e9e3f7f9
Disable multi statement macros errors.
2019-02-21 18:48:42 -05:00
Monster Iestyn
38546ba6d1
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
Steel Titanium
31a884e542
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2 into polyobj_fix_vanilia
2019-01-26 00:51:39 -05:00
Alam Ed Arias
94748c3921
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
Sryder
517a32e96d
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
james
e4a1470116
Set modifiers in a non-reactive manner
2019-01-17 16:47:01 -08:00
fickleheart
81c73032e4
Fix rendering gaps on polys with upper/lower textures
2019-01-12 20:15:58 -05:00
Steel Titanium
d475bcb0b7
Some few changes
2019-01-05 23:42:25 -05:00
mazmazz
2b96983d16
Add libopenmpt to osx buildbot
2019-01-04 23:34:08 -05:00
mazmazz
159cc28e53
Enable libopenmpt for circleCI
2019-01-04 21:34:07 -05:00
mazmazz
9a8fa8331b
Enable libopenmpt for buildbots
2019-01-04 20:53:33 -05:00
Digiku
031e234d86
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
e42e1178ed
Increase M_ChangecontrolResponse message buffer by 25 chars
2019-01-04 19:38:36 -05:00
mazmazz
0f4ef53a09
FindOPENMPT cmake
2019-01-04 19:22:48 -05:00
mazmazz
281cdb5597
Notes for Ubuntu backporting libopenmpt
2019-01-04 18:43:48 -05:00
mazmazz
2c2a96b554
MUS_MODPLUG fix
2019-01-04 18:39:09 -05:00
mazmazz
98766ae50e
Disable OpenMPT for buildbots, for now
2019-01-04 01:48:20 -05:00
mazmazz
0efc1b968f
Flip HAVE_OPENMPT on by default for non-Windows makefile
2019-01-04 01:48:04 -05:00
mazmazz
deca1a14f6
DLL-README update for libopenmpt
2019-01-03 21:19:00 -05:00
mazmazz
c2687a4289
CMake fixes for OpenMPT
2019-01-03 21:17:18 -05:00
mazmazz
c0ca2c8980
Remove dynamic openmpt loading
2019-01-03 20:52:09 -05:00
Marco Z
51976778e2
Fix MSVC compile errors
2019-01-03 20:34:10 -05:00
Marco Z
213927b264
Add libopenmpt to VC10 project
2019-01-03 20:28:00 -05:00
mazmazz
c31abf458f
Add mingw-compiled libopenmpt 0.4.0 DLLs
2019-01-03 16:07:32 -05:00
mazmazz
91d0c090d6
Merge branch 'public-musicplus-core' into public-musicplus-libopenmpt
2019-01-02 05:06:09 -05:00
mazmazz
0724d042bc
Add safe lua music functions
...
S_MusicExists
S_SetInternalMusicVolume
S_StopFadingMusic
S_FadeMusic
S_FadeOutStopMusic
2019-01-02 04:58:03 -05:00
