Commit graph

2369 commits

Author SHA1 Message Date
Monster Iestyn
8da74cb193 Fix the nonsense going on here regarding dc_colormap, this makes FOF walls appear strange if they were for a fog block with colormap adjacent to a normal sector with a colormap and no FOFs.
...that was a mouthful
2018-11-19 22:12:26 +00:00
Monster Iestyn
cfa4bbd75b change return type of M_CheckMODVersion to boolean 2018-11-19 17:47:23 +00:00
Monster Iestyn
1fa80d57dd Make sure GetMODVersion and its console equiv properly detect failing to get a reply from the MS, also added extra console/menu messages 2018-11-19 17:46:38 +00:00
Alam Ed Arias
674d31e808 Merge branch 'master' into Travis_CI-gcc8 2018-11-18 21:23:27 -05:00
Alam Ed Arias
6b3616aee6 Merge branch 'master' into next 2018-11-18 20:22:40 -05:00
Alam Ed Arias
dbf6884b37 We need to include the NUL char 2018-11-18 20:21:32 -05:00
Alam Ed Arias
913e6aeeb7 Merge remote-tracking branch 'public/master' into Travis_CI-gcc8 2018-11-18 19:59:21 -05:00
Monster Iestyn
07fc73dbad Merge branch 'mingw-64bit' into 'master'
MinGW: Fix compiling on 64-bit Windows.

See merge request STJr/SRB2!329
2018-11-18 19:49:18 -05:00
Monster Iestyn
b912008c41 Merge branch 'master' into next 2018-11-18 17:11:57 +00:00
Monster Iestyn
dbb308e284 Merge branch 'camera-subsector-crash-fix' into 'master'
Camera subsector crash fix

See merge request STJr/SRB2!318
2018-11-18 08:28:38 -05:00
Steel Titanium
a84c49d7d6 Some small changes 2018-11-14 21:01:54 -05:00
Steel Titanium
ae2b331a11 Fix up compiling on DD version 2018-11-14 18:00:10 -05:00
Steel Titanium
a817c84836 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2 into mingw-64bit 2018-11-14 17:28:41 -05:00
Alam Ed Arias
8277f32b67 fix format-truncation: need bigger string buffers 2018-11-14 16:50:52 -05:00
Monster Iestyn
d366ee76b6 Merge branch 'master' into next 2018-11-14 21:49:11 +00:00
Monster Iestyn
9e3e9a3248 Merge branch 'opengl-hud-scale-fix' into 'master'
OpenGL HUD scaling fix

See merge request STJr/SRB2!320
2018-11-14 16:48:13 -05:00
Alam Ed Arias
270ec5e2b9 Fix stringop-truncation: ‘strncpy’ output truncated before terminating nul copying 8 bytes from a string of the same length 2018-11-14 16:32:57 -05:00
Alam Ed Arias
e2249b3f08 Fix =sizeof-pointer-memaccess: argument to ‘sizeof’ in ‘strncpy’ call is the same expression as the source; did you mean to use the size of the destination? 2018-11-14 16:26:46 -05:00
Steel Titanium
b82c2bffde Properly check if cmake is running on wwindows
Thanks Monster Iestyn for informing me this is the correct way.
2018-11-14 15:58:45 -05:00
Alam Ed Arias
aef0d9a421 Merge branch 'master' into next 2018-11-14 15:45:29 -05:00
MonsterIestyn
44646db6af Merge branch 'master' into analog-flipcam-synch-fix 2018-11-14 19:36:39 +00:00
Alam Ed Arias
525bd219b6 Merge branch 'master' into next 2018-11-14 11:07:12 -05:00
Alam Ed Arias
05afaa586e Fix misleading indentation 2018-11-14 11:06:45 -05:00
Alam Ed Arias
3bd88acf25 Merge branch 'vc-xpm-fix' into 'master'
Remove unnecessary SDLCALL from IMG_xpm.c declarations

See merge request STJr/SRB2!327
2018-11-14 11:00:20 -05:00
Alam Ed Arias
fbb28ba1b5 Cleanup whitespace 2018-11-14 10:54:33 -05:00
Alam Ed Arias
a4726ee0b7 Merge branch 'master' into next 2018-11-14 10:52:49 -05:00
Alam Ed Arias
45c8920bb1 Clean up warnings 2018-11-14 10:52:16 -05:00
Marco Z
999a03aada Comment context for declaration changes; remove extern terms 2018-11-14 08:15:38 -05:00
Marco Z
f5fe8c46fa Remove unnecessary SDLCALL from xpm declarations 2018-11-14 08:06:07 -05:00
Monster Iestyn
3350096b2f Fix VC project files to include hw_clip.c/h 2018-11-14 12:11:57 +00:00
Marco Z
af0fdfe6e5 Missed #ifdef HAVE_LIBGME in win_snd 2018-11-13 22:50:08 -05:00
Steel Titanium
1a35fbbd53 Make sure the new option only works on Windows.
Is this how you do it? I'm not really sure.
2018-11-13 20:37:14 -05:00
Steel Titanium
be3fac2908 Fix up 64-bit MINGW 2018-11-13 20:32:18 -05:00
Steel Titanium
6eec21f49d Merge branch 'master' into cmake-use-internal-libs 2018-11-13 19:46:43 -05:00
Monster Iestyn
0c0cbb3b00 Merge branch 'mixer-sound-x64-fix' into 'master'
mixer_sound fix x64 build issue

See merge request STJr/SRB2!323
2018-11-13 17:42:23 -05:00
Steel Titanium
924594e6c6 Fix skybox disappearing after using objectplace command 2018-11-13 17:25:42 -05:00
mazmazz
86f48304ba Win32 boolean fixes 2018-11-13 17:24:19 -05:00
Steel Titanium
792d42ebd9 Save current renderer to screenshots 2018-11-13 17:19:22 -05:00
mazmazz
366aeadac4 Fix x64 build issue 2018-11-13 17:12:18 -05:00
Monster Iestyn
f114f8cd26 Fix OpenGL's HUD not being scaled the same way as Software's, by removing an old OpenGL-specific hack for fdupx/fdupy 2018-11-13 18:14:59 +00:00
Monster Iestyn
0ed4efdb58 Fix V_SNAPTOx code to consider dupx/dupy the same way as Software mode 2018-11-13 18:13:51 +00:00
Monster Iestyn
ad8f789935 Split camera initialisation code from P_SetupLevel, make sure the camera has an initial subsector set! 2018-11-12 20:07:45 +00:00
Monster Iestyn
59b309be0f Fix monitors (and other objects) on a floating, bobbing FOF being stuck slightly above said FOF after it has finished bobbing 2018-11-12 16:23:59 +00:00
MPC
1fcf3c8863 Render the skies correctly on splitscreen in OpenGL mode 2018-11-10 16:19:41 -03:00
Monster Iestyn
f3d129e1a6 Merge branch 'master' into next 2018-11-10 19:05:33 +00:00
Monster Iestyn
d3271c5797 Merge branch 'opengl-new-clipping-backport' into 'master'
OpenGL new clipping backport

See merge request STJr/SRB2!315
2018-11-10 13:57:16 -05:00
Monster Iestyn
8cacd3f876 Merge branch 'alias-recursion-hotfix' into 'next'
Alias recursion hotfix

See merge request STJr/SRB2!314
2018-11-10 13:56:43 -05:00
Monster Iestyn
51ee510b85 Merge branch 'gcc-compiling-cleanup' into 'master'
Compiling cleanup and fixes

See merge request STJr/SRB2!311
2018-11-10 13:56:17 -05:00
MPC
7c18702f84 Render the startup screen on OpenGL mode 2018-11-10 15:56:13 -03:00
Monster Iestyn
2373a6d209 fix using abs() on unsigned 2018-11-10 17:40:09 +00:00