Commit graph

2304 commits

Author SHA1 Message Date
Steel Titanium
7cdb0441dd Add example sql file 2018-11-15 17:31:42 -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
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
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
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
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
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
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
c7e58b7cd5 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
51df32dd3d 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
323c89dbaf fix using abs() on unsigned 2018-11-10 17:40:09 +00:00
Monster Iestyn
dd83652b71 Whoops, this broke my non-NEWCLIP test build 2018-11-10 16:10:25 +00:00
Monster Iestyn
3608f73d39 Updated SRB2.cbp for hw_clip.c/h 2018-11-10 16:10:08 +00:00
Monster Iestyn
8ba0f2a177 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
c4569e61a8 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
1e98e3b4f2 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
a733a29f4c 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
925a56ad98 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
de6cb124cb Merge branch 'readme-update' into 'master'
Update readme

See merge request STJr/SRB2!313
2018-11-10 08:39:02 -05:00
Monster Iestyn
e01c7ae743 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
038dfb4aff Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2 into readme-update 2018-11-09 18:24:42 -05:00
Alam Arias
1c22c6a1f9
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
e937d1bacb Update readme 2018-11-09 16:01:29 -05:00
Monster Iestyn
f974bb96ac 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
7cc5caf69c 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
f50f10ef30 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
Monster Iestyn
fa80d61799 byteptr.h: include endian.h to help define WRITE/READ macros correctly according to endianness 2018-11-08 17:16:54 +00:00
Monster Iestyn
fd20bbb54e More doomtype.h cleaning up:
* Move the misc types in the file to bottom, so that ATTRPACK at least is usable for RGBA_t
* Include endian.h, so that UINT2RGBA can be defined correctly for big endian builds
* Add more comments to make clear the main sections of the file
2018-11-08 17:05:35 +00:00
Monster Iestyn
5c61c40551 Clean up doomtype.h a bit, add indenting and comments to make some preprocessor code more readable 2018-11-08 16:31:20 +00:00
Monster Iestyn
0bdbdd1b1e Remove FUNCMATH from functions with a void return value or args, or examine variables other than their args (which could be modified) 2018-11-08 16:26:55 +00:00
Monster Iestyn
c47f0045d6 ST_Ticker also should not have FUNCMATH, as it also has side effects 2018-11-07 21:45:27 +00:00
Monster Iestyn
b3e8a1ed88 HU_Start should not have FUNCMATH, it has side effects 2018-11-07 21:37:42 +00:00
Monster Iestyn
4a4e07e138 D_PostEvent_end is only used by Allegro (used by the DOS port) to help timers work, so check for PC_DOS in preprocessor code. Also remove FUNCMATH from said function. 2018-11-07 21:21:36 +00:00
Monster Iestyn
f66979ba1a P_NullPrecipThinker no longer should have FUNCMATH (though I'm not sure if it should have had it in the first place anyway) 2018-11-07 21:00:38 +00:00