Commit Graph

3046 Commits

Author SHA1 Message Date
Alam Ed Arias cd39b951bb partly Revert "TravisCI: remove WFLAGS"
This reverts commit 8780800e8e.
2019-03-09 20:36:44 -05:00
Alam Ed Arias 8780800e8e TravisCI: remove WFLAGS 2019-03-09 20:17:14 -05:00
Alam Ed Arias 60ca6ae06b TravisCI: add option for GCC 8.1 2019-03-09 19:41:56 -05:00
Alam Ed Arias 3fa1751706 CircleCi: we need SSH for buildbot 2019-03-04 16:51:39 -05:00
Alam Ed Arias 67e246cd53 No more errors for VC6 support 2019-03-04 16:46:14 -05:00
Alam Ed Arias 145ccfd405 no more floating constants warnings, and disable bad array bounds warnings 2019-03-04 16:46:14 -05:00
Alam Ed Arias f823768699 Fix building without BLUA support 2019-03-01 17:31:32 -05:00
Monster Iestyn 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
Monster Iestyn 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
Monster Iestyn 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
wolfy852 97de2ae4f6 Stop Linux servers from hanging every 34 hours 2019-03-01 00:07:58 -06:00
Alam Ed Arias 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
wolfs 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
Alam Arias d865b5660a CircleCI: test build SRB2 without network support 2019-02-27 14:37:31 -05:00
Monster Iestyn 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
Monster Iestyn 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
Alam Ed Arias 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
Steel Titanium c1deea0714 Disable multi statement macros errors. 2019-02-21 18:48:42 -05:00
Monster Iestyn 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
Steel Titanium 74bf3164f8 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 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
Sryder 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
fickleheart 7e026824a4 Fix rendering gaps on polys with upper/lower textures 2019-01-12 20:15:58 -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
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
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 f00cfb7b3f Use optional asset archive instead of file 2018-12-31 17:31:25 -05:00
mazmazz d61eb7edee Increase ChangeControl text buffer to resolve buffer overflow with System Menu/GIF control config 2018-12-31 01:43:47 -05:00
Steel Titanium f73501fd11 Update libgme to 0.6.2 2018-12-30 22:49:11 -05:00
mazmazz e1300d5173 Rename ASSET_PATCH_DLL_GET to PACKAGE_PATCH_DLL_GET 2018-12-30 10:43:17 -05:00
mazmazz 941e29780c Implement install building for appveyor (deployer) 2018-12-30 03:42:55 -05:00
mazmazz bef0bc82e4 Merge branch 'mingw-64bit-cpu-target-revise' into appveyor-64 2018-12-29 23:46:16 -05:00
mazmazz e7165444b4 Add 64-bit DD buildbot 2018-12-29 23:16:08 -05:00
mazmazz 0fc07ebaae Consolidate [%CONFIGURATION%] == [SDL64] into %X86_64% 2018-12-29 23:15:09 -05:00
Steel Titanium 0ebe5b258c Inclue PNG file 2018-12-29 23:10:45 -05:00
Steel Titanium a7b96ab83d Update XPM icon 2018-12-29 22:52:04 -05:00
mazmazz 2aa7ee70fe Disable UPX by default in appveyor 2018-12-29 22:51:10 -05:00
mazmazz 34534428fd Add 64-bit SDL builds to appveyor config 2018-12-29 22:17:41 -05:00
mazmazz 3d2e58861d Rename M5 to ARCHOPTS; allow override by command line 2018-12-29 21:55:35 -05:00
mazmazz 4cfacf5cde Check for NONX86 in addition to X86_64; move MINGW64 subflags from win32/Makefile.cfg to Makefile 2018-12-29 21:14:50 -05:00
Digiku 80e30c6aaa Merge branch 'MSVC-ARM' into 'master'
ARM and ARM64 support with MSVC toolchain

See merge request STJr/SRB2!412
2018-12-28 01:05:40 -05:00
Steel Titanium d048e7cbec Don't set if LINUX64 is defined 2018-12-27 21:17:02 -05:00
Steel Titanium 5ba0863876 Stupid restrictions 2018-12-27 19:00:18 -05:00
Steel Titanium 4a05fd5f26 More explict check 2018-12-27 18:54:10 -05:00
Steel Titanium 6dddf61265 Target nocona for 64-bit builds 2018-12-27 00:56:33 -05:00