Commit Graph

2351 Commits

Author SHA1 Message Date
Alam Ed Arias fe22fdc5a3 P_SuperDamage() is too big for inlining 2019-03-25 15:30:25 -04:00
James R ed0f8fd967 Actually allow connecting to "localhost"
Because IPv6 doesn't seem to work anyway.
2019-03-20 20:37:00 -07:00
James R f139ffd1dc Let localhost connections 2019-03-20 20:37:00 -07:00
Monster Iestyn ecb6322a52 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
Steel Titanium 6d751ff302 Remove the define. 2019-03-15 18:46:25 -04:00
Steel Titanium 5a170b9e4e Merge branch 'master' into errorifpng 2019-03-15 16:40:47 -04:00
Alam Ed Arias 60ca6ae06b TravisCI: add option for GCC 8.1 2019-03-09 19:41:56 -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
Steel Titanium 9542a47f7f New -noxinput and -nohidapi command line parameters. 2019-03-03 22:57:09 -05:00
Steel Titanium 15323328c5 Check using memcmp() 2019-03-03 22:43:21 -05:00
Steel Titanium 3d5d02fc15 Error if the lump is a PNG lump 2019-03-03 19:58:01 -05:00
Alam Ed Arias f823768699 Fix building without BLUA support 2019-03-01 17:31:32 -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
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
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
Steel Titanium c1deea0714 Disable multi statement macros errors. 2019-02-21 18:48:42 -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
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 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
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 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 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
james 0b857f127f Update capslock state on window re-focus 2018-12-26 15:49:57 -08:00
Digiku da9447342c Merge branch '2123-version' into 'master'
Update code versions to 2.1.23

See merge request STJr/SRB2!435
2018-12-26 17:14:58 -05:00
Digiku ebb4c65d92 Merge branch 'srb2-chat-nonet' into 'master'
Hide SRB2-CHAT behind #ifndef NONET

See merge request STJr/SRB2!434
2018-12-26 17:13:23 -05:00
mazmazz 60bdc056f8 Also hide Chat Options if NONET 2018-12-26 16:41:39 -05:00
mazmazz 894c139bf1 Update code versions to 2.1.23 2018-12-26 16:31:43 -05:00
mazmazz 814db7e371 Hide SRB2-CHAT behind #ifndef NONET 2018-12-26 16:20:17 -05:00
Steel Titanium 4f18ec60bc Fix saving progress on vanilia 2018-12-26 15:47:12 -05:00
mazmazz fa6f791ec3 Fix -ANGLE_180 because MSVC complains
-ANGLE_180 evaluates equal to ANGLE_180.
2018-12-25 01:14:05 -05:00
mazmazz 73a67fc9f5 Merge branch 'ctf-enemy-flag-sound' into 2122-version 2018-12-25 00:27:08 -05:00
mazmazz 842bcfc8a0 Merge remote-tracking branch 'public-gl/master' into 2122-version 2018-12-25 00:19:45 -05:00
mazmazz a626660564 Merge remote-tracking branch 'public-gl/next' into 2122-version 2018-12-25 00:19:42 -05:00
mazmazz 0b81debf94 Merge remote-tracking branch 'public-gl/master' into undo-old-side-discolor-fix 2018-12-25 00:09:24 -05:00
mazmazz 82a40f0dba Support Look Up/Down keys for NiGHTS movement 2018-12-24 23:48:03 -05:00
mazmazz b7edc7f870 Revert "Merge branch 'side-discolor-fix' into 'master'"
This reverts commit e721a3d882, reversing
changes made to 4656a0d02c.
2018-12-24 20:58:26 -05:00