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
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
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
mazmazz
61e8685713
Increase ChangeControl text buffer to resolve buffer overflow with System Menu/GIF control config
2018-12-31 01:43:47 -05:00
mazmazz
deec4550d3
Rename M5 to ARCHOPTS; allow override by command line
2018-12-29 21:55:35 -05:00
mazmazz
44d2340a5b
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
1517c16c4d
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
f61c8fa279
Don't set if LINUX64 is defined
2018-12-27 21:17:02 -05:00
Steel Titanium
46d3e06576
Stupid restrictions
2018-12-27 19:00:18 -05:00
Steel Titanium
3ca95acc56
More explict check
2018-12-27 18:54:10 -05:00
Steel Titanium
faaf298c4f
Target nocona for 64-bit builds
2018-12-27 00:56:33 -05:00
james
77a5a31135
Update capslock state on window re-focus
2018-12-26 15:49:57 -08:00
Digiku
1358a8dd8f
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
7e923333b9
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
a25c755a6b
Also hide Chat Options if NONET
2018-12-26 16:41:39 -05:00
mazmazz
7deac7e603
Update code versions to 2.1.23
2018-12-26 16:31:43 -05:00
mazmazz
bd4874aa53
Hide SRB2-CHAT behind #ifndef NONET
2018-12-26 16:20:17 -05:00
Steel Titanium
73dc40a0b1
Fix saving progress on vanilia
2018-12-26 15:47:12 -05:00
mazmazz
91abcd66b7
Fix -ANGLE_180 because MSVC complains
...
-ANGLE_180 evaluates equal to ANGLE_180.
2018-12-25 01:14:05 -05:00
mazmazz
7fe19c2f09
Merge branch 'ctf-enemy-flag-sound' into 2122-version
2018-12-25 00:27:08 -05:00
mazmazz
818438d5d0
Merge remote-tracking branch 'public-gl/master' into 2122-version
2018-12-25 00:19:45 -05:00
mazmazz
610d43cc84
Merge remote-tracking branch 'public-gl/next' into 2122-version
2018-12-25 00:19:42 -05:00
mazmazz
8586643467
Merge remote-tracking branch 'public-gl/master' into undo-old-side-discolor-fix
2018-12-25 00:09:24 -05:00
mazmazz
3e712b57c5
Support Look Up/Down keys for NiGHTS movement
2018-12-24 23:48:03 -05:00
mazmazz
a7ac8179f5
Revert "Merge branch 'side-discolor-fix' into 'master'"
...
This reverts commit f81144d7b1 , reversing
changes made to c24d860eea .
2018-12-24 20:58:26 -05:00
mazmazz
de0943352a
Revert default console backcolor to green; changed from CHAT commit
2018-12-24 20:57:11 -05:00
Digiku
90e673a487
Merge branch 'float-compare-colormap-fix' into 'master'
...
Fix float comparison for colormap maskamt
See merge request STJr/SRB2!428
2018-12-24 20:55:06 -05:00
mazmazz
59ac969594
Define EPSILONs only if not already defined
...
Fixes OSX buildbot
2018-12-24 20:36:28 -05:00
mazmazz
52b6810ee1
Remove log message
2018-12-24 20:33:59 -05:00
mazmazz
7c3dcd2bf9
Use DBL_EPSILON for colormap comparison
2018-12-24 20:22:10 -05:00
Alam Ed Arias
fa5ff9c0cf
Merge branch 'master' into next
2018-12-24 20:15:45 -05:00
mazmazz
732b9a66ca
Fix float comparison for colormap maskamt
2018-12-24 19:58:05 -05:00
mazmazz
34964a07a8
Fix gcc 8 compile by using strcpy instead of memcpy for PM
2018-12-24 18:51:11 -05:00
mazmazz
e40deb5443
Merge remote-tracking branch 'public-gl/master' into 2122-version
2018-12-24 17:31:03 -05:00
mazmazz
59cc9dbecf
Merge remote-tracking branch 'public-gl/next' into 2122-version
2018-12-24 17:30:59 -05:00
Jimita
23b27f5566
cleanup
2018-12-24 17:21:33 -05:00
Digiku
7067d47c41
Merge branch 'polyobject-crush-fix-waypoint' into 'next'
...
Polyobject crush fix by waypoints [by TehRealSalt]
See merge request STJr/SRB2!426
2018-12-24 17:01:06 -05:00
Alam Ed Arias
3942736e11
Merge branch 'master' into next
2018-12-24 16:56:29 -05:00
Digiku
e12ca787c4
Merge branch 'disablespeedadjust-fix' into 'next'
...
Disablespeedadjust fix
See merge request STJr/SRB2!425
2018-12-24 16:31:19 -05:00
TehRealSalt
55d300c4e2
Fix move by waypoints not checking for sector changes
...
It seemed weird at first, but the polyobject sector (backsector) itself DOESN'T need checked (although I still am doing it for safety). Rather, the in-level sector just needs checked.
If someone manually modifies the polyobject sector though, then this bug can still occur... but this fixes it for the most common use-case where this can happen. I'll try to tackle the rarer cases in my next commit.
2018-12-24 14:39:07 -05:00
Monster Iestyn
06e2da214e
remove these unnecessary typedefs for assignments to variables that are actually already boolean to begin with, since the rhs resolves to a boolean anyway
2018-12-24 19:37:52 +00:00
Monster Iestyn
e96a345fce
Fix disablespeedajdust in SOCs being set like an integer value instead of a boolean
2018-12-24 19:29:54 +00:00
Monster Iestyn
94f0eedb60
Fix bot players using the respawning code meant only for real players to use
2018-12-24 17:59:12 +00:00
mazmazz
8877d888cb
Do not increment mainwads for music.dta
2018-12-23 23:54:26 -05:00
mazmazz
96dadf64a7
Play flag-returned SFX for the opposing team
2018-12-23 22:57:14 -05:00
Steel Titanium
29308db913
Merge branch 'master' into sdl-autograb
2018-12-23 22:35:44 -05:00
mazmazz
fe836e6109
Only SetWindowGrab if !disable_mouse; toggle cursor visibility
2018-12-23 22:09:16 -05:00
Steel Titanium
f1c4f3c772
Another attempt to lock the mouse
2018-12-23 18:54:15 -05:00