Commit Graph

2778 Commits

Author SHA1 Message Date
Monster Iestyn 8c71cd0b90 Merge branch 'master' into next 2018-11-18 17:11:57 +00: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 7cdb0441dd Add example sql file 2018-11-15 17:31:42 -05:00
Steel Titanium c26c850f5d Add missing 64-bit libgme dll 2018-11-15 13:30:59 -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 09f9572a8f Merge branch 'master' into next 2018-11-14 21:49:11 +00: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
Steel Titanium 1b79b9527c 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 6fa063375d TravisCI: test build on GCC 8.x 2018-11-14 15:56:46 -05:00
Alam Ed Arias d4cb81cb28 Merge branch 'master' into next 2018-11-14 15:45:29 -05:00
MonsterIestyn a4f8411ae7
Merge pull request #313 from LJSonik/analog-flipcam-synch-fix
Fix desynch when toggling analog mode or flipcam
2018-11-14 19:57:47 +00:00
MonsterIestyn 772c072064
Merge branch 'master' into analog-flipcam-synch-fix 2018-11-14 19:36:39 +00:00
Monster Iestyn 9c70c87f8e Merge branch 'master' into next 2018-11-14 18:01:31 +00:00
Monster Iestyn 8c95ef8a1d Merge branch 'public-sdl2mixer-update' into 'master'
Update SDL Mixer to 2.0.4

See merge request STJr/SRB2!322
2018-11-14 12:58:07 -05:00
Monster Iestyn fc4bb83c3e Merge branch 'public-sdl2-update' into 'master'
Update SDL2 to 2.0.9

See merge request STJr/SRB2!321
2018-11-14 12:57:54 -05:00
Alam Ed Arias 97fd69951a Merge branch 'master' into next 2018-11-14 11:07:12 -05:00
Alam Ed Arias de5b626520 Fix misleading indentation 2018-11-14 11:06:45 -05: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 d14f87b8c6 Cleanup whitespace 2018-11-14 10:54:33 -05:00
Alam Ed Arias 938bf1605c Merge branch 'master' into next 2018-11-14 10:52:49 -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
Monster Iestyn 0625ffcf8a Merge branch 'public-winsnd-libgme-fix' into 'master'
Missed #ifdef HAVE_LIBGME in win_snd

See merge request STJr/SRB2!326
2018-11-14 06:40:07 -05:00
Marco Z 0b97b2a76c Missed #ifdef HAVE_LIBGME in win_snd 2018-11-13 22:50:08 -05:00
mazmazz b4c87d585e Add SDL Mixer 2.0.4 VC package 2018-11-13 22:05:05 -05:00
mazmazz 85fc8a1d47 Add SDL 2.0.9 VC package 2018-11-13 22:02:18 -05:00
Steel Titanium 2ca5e29110 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 4836e711d3 Fix up 64-bit MINGW 2018-11-13 20:32:18 -05:00
Steel Titanium d0b64222f7 Merge branch 'master' into cmake-use-internal-libs 2018-11-13 19:46:43 -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
Monster Iestyn 41b4ffd458 Merge branch 'extend-png-metadata' into 'master'
Save the current renderer to screenshots.

See merge request STJr/SRB2!324
2018-11-13 17:28:29 -05:00
Steel Titanium 9029cf5d9c Fix skybox disappearing after using objectplace command 2018-11-13 17:25:42 -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
mazmazz 2e39e5ffdd Update SDL Mixer to 2.0.4; remove unnecessary extra lib and include folders 2018-11-13 16:43:16 -05:00
mazmazz ba821056ce Update SDL2 to 2.0.9; remove unnecessary extra lib and include folders 2018-11-13 16:40:43 -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
Monster Iestyn 395a67196e Merge branch 'monitors-floatbob-fix' into 'next'
Fix for object z positions on floating, bobbing FOFs

See merge request STJr/SRB2!316
2018-11-13 08:58:08 -05:00
Monster Iestyn e85f73117c 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 63ba59341b 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 eb4a72440a Render the skies correctly on splitscreen in OpenGL mode 2018-11-10 16:19:41 -03:00