Commit Graph

1793 Commits

Author SHA1 Message Date
mazmazz 930835f1a2 Dummy out OpenGL loading screen; fix console toggle so it doesn't actually show 2018-11-25 21:47:56 -05:00
Digiku 40dfe89273 Merge branch '21-source-copyright' into 'master'
Update source copyrights to 2018

See merge request STJr/SRB2!346
2018-11-25 07:36:41 -05:00
mazmazz bd4743007e Update source copyrights to 2018, outdated targets 2018-11-25 07:35:53 -05:00
mazmazz ea7162a76a Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
Digiku 62443c9090 Merge branch '21-credits-update' into 'master'
Extra credits update .21

See merge request STJr/SRB2!345
2018-11-25 07:21:31 -05:00
mazmazz cf8b4a6cb1 Additional 2.1 credits update 2018-11-23 21:57:07 -05:00
Monster Iestyn d228e35fcb Merge branch 'responsefile-fix' into 'master'
Fix M_FindResponseFile returning garbage data

See merge request STJr/SRB2!254
2018-11-23 15:59:40 -05:00
Steel Titanium 97dd291f3f Merge branch 'master' into responsefile-fix 2018-11-23 15:29:52 -05:00
Alam Arias 30b9cef043
Merge pull request #326 from monster-psychic-cat/opengl_splitscreen_sky_fix
Render the skies correctly on splitscreen in OpenGL mode
2018-11-23 14:48:05 -05:00
Alam Arias b1587cb0a3
Merge pull request #325 from monster-psychic-cat/opengl_startup_screen
Render the startup screen on OpenGL mode
2018-11-23 14:47:56 -05:00
Alam Arias 3d0fd7ff2e
Merge pull request #258 from light2yellow/master
m_fixed: asm: cc is not a register
2018-11-23 14:47:36 -05:00
Monster Iestyn 08af33c51f Add myargmalloc boolean to detect whether we allocated myargv ourselves or not, so we don't free myargv if we didn't 2018-11-23 19:12:48 +00:00
Digiku 9a3d2d0ee5 Merge branch '21-credits-update' into 'master'
2.1.21 credits update

See merge request STJr/SRB2!339
2018-11-23 07:38:28 -05:00
Digiku 3c95a63fc2 Merge branch 'public-darker-credits' into 'master'
Make the credits pics darker

See merge request STJr/SRB2!336
2018-11-23 07:35:44 -05:00
mazmazz 2f7f472ca2 Update credits for 2.1.21 2018-11-23 07:34:23 -05:00
Steel Titanium fe43deacec Merge branch 'master' into responsefile-fix 2018-11-22 23:02:20 -05:00
Steel Titanium 933c1311cd Make the error less confusing 2018-11-22 22:59:46 -05:00
mazmazz 0d4cd35e13 Make the credits pics darker 2018-11-22 20:08:02 -05:00
Monster Iestyn 37c0e646e4 Merge branch 'ms-update-alert-fix' into 'master'
Master Server Update alert fix

See merge request STJr/SRB2!333
2018-11-22 13:34:43 -05:00
Monster Iestyn 3acc312923 Fix servers disappearing from the server list when you refresh, by forcefully closing connnections to the servers immediately after sending ASKINFO. Also force close connections to old server list when refreshing, because we don't need to hear from them anymore full stop. 2018-11-21 20:45:03 +00:00
Monster Iestyn 948466658f Merge branch 'fof-wall-rendering-fixes-and-cleanup' into 'master'
FOF wall rendering fixes and cleanup

See merge request STJr/SRB2!317
2018-11-20 08:54:09 -05:00
Monster Iestyn 2d1f927a17 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 418943acdc change return type of M_CheckMODVersion to boolean 2018-11-19 17:47:23 +00:00
Monster Iestyn 797f9d180e 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 a290c4727b Merge branch 'master' into Travis_CI-gcc8 2018-11-18 21:23:27 -05:00
Alam Ed Arias 0b5069f36c We need to include the NUL char 2018-11-18 20:21:32 -05:00
Alam Ed Arias 5a09d44fd2 Merge remote-tracking branch 'public/master' into Travis_CI-gcc8 2018-11-18 19:59:21 -05:00
Monster Iestyn ab39534ef6 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 a400bb9ef6 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 02c08a3e10 Some small changes 2018-11-14 21:01:54 -05:00
Steel Titanium f02105732e Fix up compiling on DD version 2018-11-14 18:00:10 -05:00
Steel Titanium c5a97dcfe6 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2 into mingw-64bit 2018-11-14 17:28:41 -05:00
Alam Ed Arias 4695841b8d fix format-truncation: need bigger string buffers 2018-11-14 16:50:52 -05:00
Monster Iestyn 3e6fcf1b8b 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 fb08950c19 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 4e9fc881a2 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
MonsterIestyn 772c072064
Merge branch 'master' into analog-flipcam-synch-fix 2018-11-14 19:36:39 +00:00
Alam Ed Arias f81d01edca 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 f73ea4f984 Clean up warnings 2018-11-14 10:52:16 -05:00
Marco Z 8777d5c6c9 Comment context for declaration changes; remove extern terms 2018-11-14 08:15:38 -05:00
Marco Z 51768e7dd1 Remove unnecessary SDLCALL from xpm declarations 2018-11-14 08:06:07 -05:00
Monster Iestyn f3b59c1731 Fix VC project files to include hw_clip.c/h 2018-11-14 12:11:57 +00:00
Marco Z 0b97b2a76c Missed #ifdef HAVE_LIBGME in win_snd 2018-11-13 22:50:08 -05:00
Steel Titanium 4836e711d3 Fix up 64-bit MINGW 2018-11-13 20:32:18 -05:00
Monster Iestyn 302358c403 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
mazmazz 2db2b6e6af Win32 boolean fixes 2018-11-13 17:24:19 -05:00
Steel Titanium 95ed3fcf7e Save current renderer to screenshots 2018-11-13 17:19:22 -05:00
mazmazz 894ee02f3f Fix x64 build issue 2018-11-13 17:12:18 -05:00
Monster Iestyn e9fe0ebae1 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 0d38061db8 Fix V_SNAPTOx code to consider dupx/dupy the same way as Software mode 2018-11-13 18:13:51 +00:00