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
Steel Titanium
e1f7717f24
Statically link stdc++ and libgcc into libgme
...
Should fix libgme depending on two DLLs externally.
2018-11-18 18:09:34 -05: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
15a70109ae
Add missing 64-bit libgme dll
2018-11-15 13:30:59 -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
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
MonsterIestyn
0ea835058c
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
44646db6af
Merge branch 'master' into analog-flipcam-synch-fix
2018-11-14 19:36:39 +00:00
Monster Iestyn
a0bec73904
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
16451363b9
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
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
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
Monster Iestyn
fabcb3d842
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
af0fdfe6e5
Missed #ifdef HAVE_LIBGME in win_snd
2018-11-13 22:50:08 -05:00
mazmazz
98ba84f50d
Add SDL Mixer 2.0.4 VC package
2018-11-13 22:05:05 -05:00
mazmazz
b438361869
Add SDL 2.0.9 VC package
2018-11-13 22:02:18 -05:00
Steel Titanium
be3fac2908
Fix up 64-bit MINGW
2018-11-13 20:32:18 -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
Monster Iestyn
a09ee2729c
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
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
mazmazz
9086d880a3
Update SDL Mixer to 2.0.4; remove unnecessary extra lib and include folders
2018-11-13 16:43:16 -05:00
mazmazz
b4de5baa08
Update SDL2 to 2.0.9; remove unnecessary extra lib and include folders
2018-11-13 16:40:43 -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
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
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
Monster Iestyn
2373a6d209
fix using abs() on unsigned
2018-11-10 17:40:09 +00:00
Monster Iestyn
58c8cbf71d
Whoops, this broke my non-NEWCLIP test build
2018-11-10 16:10:25 +00:00
Monster Iestyn
5d558ffed9
Updated SRB2.cbp for hw_clip.c/h
2018-11-10 16:10:08 +00:00
Monster Iestyn
3e0ec0ed6e
clipping code didn't seem so bad this time (at least compared to without), let's enable it now?
2018-11-10 16:09:52 +00:00
Monster Iestyn
210ea25a1b
Made some efforts to improve efficiency of new code, hard to tell if I've made it better or worse though honestly
...
R_IsEmptyLine is now a thing too btw
2018-11-10 16:09:21 +00:00
Monster Iestyn
ad860e0d01
More progress, NEWCLIP added to doomdef.h, sadly it actually all lags the game so I've disabled it for now
...
Other notes:
* on second thought I'll keep the hw_clip functions' gld prefixes rather than HWR, not like it matters either way
* despite the extra lag it does fix the issues with translucent walls and such when displayed at different vertical angles, such as with the GFZ1 waterfall
2018-11-10 16:08:56 +00:00
Monster Iestyn
b7dc441e10
Starting work on porting hw_clip.c/h code, Makefiles and CMake can compile them at least
...
Other notes:
* Renamed all new functions to have HWR_ prefix instead of gld_, for consistency
* HWR_FrustrumSetup and HWR_SphereInFrustum are disabled and require HAVE_SPHEREFRUSTRUM. This is because 1) SRB2CB did not need the code, so presumably neither will we, and 2) there are some OpenGL API functions used there that due to our way of using OpenGL we don't use outside of r_opengl.c, which makes dealing with HWR_FrustrumSetup complicated in theory
* The new clipping functions are not added to OpenGL's "main" rendering code itself just yet, they're just available to use now once hw_clip.h is included
2018-11-10 16:08:26 +00:00
Monster Iestyn
24bc2a04fa
Merge branch 'opengl-improvements-backport' into 'master'
...
Opengl improvements backport
See merge request STJr/SRB2!304
2018-11-10 09:25:18 -05:00
Monster Iestyn
8e507f6e36
Merge branch 'readme-update' into 'master'
...
Update readme
See merge request STJr/SRB2!313
2018-11-10 08:39:02 -05:00
Monster Iestyn
3a926cff5a
Merge branch 'copyright-info-update' into 'master'
...
Update copyright info
See merge request STJr/SRB2!309
2018-11-10 08:33:09 -05:00
Steel Titanium
8d714f8522
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2 into readme-update
2018-11-09 18:24:42 -05:00
Alam Arias
cdf6ef7cc5
Merge pull request #320 from monster-psychic-cat/remote_view_fixes
...
Minor remote viewpoint bugfixes.
2018-11-09 16:09:20 -05:00
Steel Titanium
25bbfe0610
Update readme
2018-11-09 16:01:29 -05:00
Monster Iestyn
74f221d73f
Merge branch 'music-clean' into 'master'
...
Some code cleanup.
See merge request STJr/SRB2!298
2018-11-09 10:58:57 -05:00
Monster Iestyn
8c2a163f5d
Merge branch 'winsock-error-handling-fixes' into 'master'
...
Winsock error handling fixes
See merge request STJr/SRB2!303
2018-11-08 15:49:35 -05:00
Monster Iestyn
91a44addd9
d_main.c: remove the _MAX_PATH define, the file hasn't used it since v2.0
2018-11-08 20:09:00 +00:00