Alam Ed Arias
e47bf6274f
TravisCI: build custom sdl2_mixer build
2019-03-25 15:51:13 -04:00
Alam Ed Arias
d69d834c6a
use default osx image
2019-03-25 15:48:33 -04:00
Alam Ed Arias
45c641204b
TravisCI: move homebrew packages for all mac builds
2019-03-25 15:44:33 -04:00
Alam Ed Arias
042b30c6e5
CircleCI: rebuild depend file with BLUA
2019-03-25 15:34:25 -04:00
Alam Ed Arias
17768854e0
P_SuperDamage() is too big for inlining
2019-03-25 15:30:25 -04:00
Alam Ed Arias
0fbca9a84b
CircleCI: also test compiling without BLUA support
2019-03-25 15:21:52 -04:00
Alam Ed Arias
853855eb69
Travis-CI: use a new version of xcode and use homebrew add-on to install packages
2019-03-25 15:16:43 -04:00
Nev3r
64353bf373
Merge branch 'allow-localhost' into 'master'
...
Allow connecting to localhost / 127.0.0.1
See merge request STJr/SRB2!474
2019-03-23 05:16:44 -04:00
James R
6939dca52a
Actually allow connecting to "localhost"
...
Because IPv6 doesn't seem to work anyway.
2019-03-20 20:37:00 -07:00
James R
25bd4a0876
Let localhost connections
2019-03-20 20:37:00 -07:00
Monster Iestyn
ce37e4c9c8
Merge branch 'sdl-noxinput-nohidapi' into 'master'
...
-noxinput and -nohidapi command line parameters.
See merge request STJr/SRB2!468
2019-03-20 17:33:04 -04:00
Monster Iestyn
fa6f9062fe
Merge branch 'errorifpng' into 'master'
...
Error if the lump is a PNG lump
See merge request STJr/SRB2!466
2019-03-20 16:26:28 -04:00
Alam Ed Arias
94e29d1bb4
CMake: have funny check for empty CMAKE_SIZEOF_VOID_P
2019-03-19 09:10:25 -04:00
Alam Ed Arias
727d9cae23
CMake: check if CMAKE_SIZEOF_VOID_P is defined on Mac?
2019-03-19 00:04:14 -04:00
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
fickleheart
81c73032e4
Fix rendering gaps on polys with upper/lower textures
2019-01-12 20:15:58 -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
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