stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-02-11 02:30:56 +00:00
Code Issues Projects Releases Packages Wiki Activity
15414 commits 181 branches 42 tags 192 MiB
Commit graph

1434 commits

Author SHA1 Message Date
sphere
3802f601a9 blentran part 1: Flag changes & semibright support. 2021-12-05 00:48:21 +01:00
Radicalicious
1a6bcdbd64 Merge remote-tracking branch 'stjr/next' into blue-spring-balls 2021-12-03 22:00:39 -06:00
Radicalicious
cbb8269dec Merge remote-tracking branch 'stjr/next' into thokking-hell 2021-12-03 21:46:58 -06:00
MascaraSnake
aee4996eba Merge branch 'udmf-polyobjects' into udmf-lighting 2021-12-03 19:22:37 +01:00
Hannu Hanhi
2fb1c5f1ef Wireframe mode for OpenGL 2021-10-30 03:53:46 +03:00
Hannu Hanhi
77ecfb9cdc Perfstats averaging and refactor 2021-10-29 02:18:02 +03:00
Hannu Hanhi
1ebc8096a0 Some cleanup I forgot to do 2021-10-08 22:07:58 +03:00
Hannu Hanhi
89af6b10ad Prevent gl_FrontColor overflow in model lighting shader manually 
Some drivers don't clamp it for some reason.

Fixes overbright model lighting and broken colors when combined with palette rendering on affected drivers.
 2021-09-25 18:10:14 +03:00
MascaraSnake
e15c160773 Implement per-sector floor/ceiling lighting 2021-09-19 08:58:21 +02:00
Hannu Hanhi
386c4a95f3 Fix void that was accidentally removed earlier in hw_main.c 2021-09-19 00:27:02 +03:00
Hannu Hanhi
6c4cb3a025 Don't apply color cube in md2_loadTexture when in palette rendering mode 
Fixes brightness getting applied twice on models in palette rendering mode
 2021-09-19 00:17:56 +03:00
Hannu Hanhi
bbf23a5143 Add #line offsets in the shader preprocessor so error reports point to correct lines from the original shader file, move #version and preamble to top instead of inserting defines after the original #version 2021-09-18 22:52:13 +03:00
Hannu Hanhi
0c70ca9068 Add support for mixed line endings to the shader preprocessor 
Fixes CurveV3.pk3
 2021-09-17 23:16:53 +03:00
Hannu Hanhi
0894547d1a Use GL_LUMINANCE8 for 3d palette lookup texture on OpenGL versions older than 3.0 
Fixes white screen when the GL_R8 format is not available
 2021-09-17 22:19:51 +03:00
Hannu Hanhi
f7a8bedec1 Fix palette rendering brightness issues on wipes, add timedemo support to gif recording 2021-09-14 00:17:34 +03:00
Tatsuru
033c661431 Merge branch 'folder' into 'next' 
Implement folder loading

See merge request STJr/SRB2!1568
 2021-09-10 17:10:26 +00:00
Tatsuru
eec765749b Merge branch 'drawcroppedpatch-improvements' into 'next' 
V_DrawCroppedPatch(...) Lua exposure and improvements

See merge request STJr/SRB2!1316
 2021-09-10 16:14:38 +00:00
Hannu Hanhi
913bbb3fc0 Fix brightness issues with 2d drawing functions and palette rendering 2021-09-08 03:18:13 +03:00
Jaime Ita Passos
1a84f1bcba Minor changes and fixes 2021-08-10 15:17:22 -03:00
Jaime Ita Passos
2aa9bb59ef Memory management fixes 
Date:      Mon Aug 9 15:57:07 2021 -0300
 2021-08-09 15:57:35 -03:00
lachablock
f2472d88b8 Fix some crashes 2021-08-09 17:30:05 +10:00
lachablock
f9723a567c Merge remote-tracking branch 'origin/next' into raise-skin-limit 2021-08-09 14:19:09 +10:00
sphere
1d92456ad5 Merge branch 'gl-texfmt-p8-ap88-a8-ai8-fix' into 'next' 
Fix #492

Closes #492

See merge request STJr/SRB2!1431
 2021-08-02 13:10:32 +00:00
lachablock
2e7141b54a Use tracer's color for uncolored objects flagged with MF2_LINKDRAW 2021-07-06 18:56:45 +10:00
lachablock
7ea73bf817 Add a color field to vissprites and use that instead of referencing its mobj 2021-07-06 18:36:05 +10:00
LJ Sonic
4af3b860fd Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2.git into folder-next 2021-06-25 00:30:30 +02:00
James R
fa7a674113 Merge remote-tracking branch 'origin/master' into next 2021-06-19 19:39:15 -07:00
Radicalicious
44bdfd8eaf Update hw_light.c 2021-06-18 02:40:44 -04:00
Hannu Hanhi
725a8195ab Decrease the amount of texture clearing when switching palette rendering state 2021-06-14 00:57:20 +03:00
Hannu Hanhi
cf16fd2938 Fix custom shaders that define only one stage, like footfix 2021-06-13 17:56:11 +03:00
James R
c325306ddf Merge remote-tracking branch 'origin/master' into makefile-revision-final 2021-06-07 18:36:01 -07:00
Monster Iestyn
090e5384d5 Merge branch 'blendmode-rangecheck' into 'next' 
Handle invalid blend modes

See merge request STJr/SRB2!1486
 2021-06-05 09:02:31 -04:00
sphere
fb453491dd Merge branch 'models-spr2endstate' into 'next' 
Fix models interpolating to frame 0 from a same-sprite2 FF_SPR2ENDSTATE state

See merge request STJr/SRB2!1515
 2021-06-02 06:28:51 -04:00
Nev3r
ab06ff011e Merge branch 'colorfret' into 'next' 
Respect mobj->color while enemies & bosses flash (resolves #531)

Closes #531

See merge request STJr/SRB2!1513
 2021-06-01 02:31:22 -04:00
GoldenTails
88a9b76cc5 renderthings 2021-05-30 21:37:43 -05:00
GoldenTails
35fbddffe4 renderfloors 2021-05-30 21:37:43 -05:00
GoldenTails
a1ce35b780 renderwalls 2021-05-30 21:36:57 -05:00
sphere
fb4b3b8130 Merge branch 'ogl-fof-wall-slope-fix2' into 'next' 
Take slopes into account in FOF wall cutoff in HWR_ProcessSeg

Closes #192

See merge request STJr/SRB2!1361
 2021-05-30 11:32:30 -04:00
sphere
75938e2dfa Merge branch 'software-slope-plane-uv-fix-attempt' into 'next' 
Fix slope plane rotation and alignment (resolves #508)

Closes #508

See merge request STJr/SRB2!1464
 2021-05-27 16:56:16 -04:00
Jaime Ita Passos
a1553c4623 Update r_opengl.c 2021-05-22 20:08:11 -03:00
Jaime Ita Passos
75ebdda31b Merge remote-tracking branch 'origin' into gl-texfmt-p8-ap88-a8-ai8-fix 2021-05-22 19:44:57 -03:00
Hannu Hanhi
ac1b5ae546 OpenGL palette rendering and related things 2021-05-22 17:40:34 +03:00
lachablock
750bdd9d60 Respect mobj->color while enemies & bosses flash, but in OpenGL 2021-05-22 23:25:36 +10:00
lachablock
99ad188263 Fix models interpolating to frame 0 from a same-sprite2 FF_SPR2ENDSTATE state 2021-05-22 18:17:48 +10:00
SteelT
695722269b Merge branch 'warnings' into 'master' 
Fix some compiler warnings

See merge request STJr/SRB2!1504
 2021-05-19 22:54:48 -04:00
Jaime Ita Passos
7500d12eeb Merge remote-tracking branch 'origin' into software-slope-plane-uv-fix-attempt 2021-05-16 20:56:53 -03:00
Hannu Hanhi
118fc58192 Some stuff I forgot from ogl-shader-preprocessor 2021-05-11 01:30:53 +03:00
Hannu Hanhi
de37df1be0 OpenGL shader code rearrangement and shader pre-preprocessor 2021-05-11 01:13:28 +03:00
James R
35244fa736 Clang: fix -Wimplicit-const-int-float-conversion 
Some of these integers exceed the precision of float. In
that case the number is rounded. The rounding shouldn't
matter too much anyway, so just shut the compiler up.
 2021-05-08 16:49:23 -07:00
James R
ee72312dea Merge remote-tracking branch 'origin/master' into makefile-revision-final 2021-05-07 13:32:19 -07:00
LJ Sonic
07e69c5eb3 Add copyright date ranges for files created in 2020 2021-05-07 18:04:30 +02:00
LJ Sonic
d325c7e6d3 The year is 2021 2021-05-07 17:45:56 +02:00
James R
f9813844e7 Update CMakeLists.txt to use Sourcefiles 
This establishes (near) parity of source code file lists
between the Makefile and CMakeLists.txt

To make that change I messed around CMakeLists.txt a bit.
It now uses target_sources and target_compile_definitions.
I also removed some MSVC stuff since we don't actually
care about MSVC--it made things easier.

CMake minimum version 3.0 -> 3.13 for target_sources.
 2021-05-05 04:00:44 -07:00
James R
b31056c7d9 Rewrite Makefile to be modular as well as more automated 
Some key points for programmers:
- Source code files are mostly listed in a 'Sourcefile'.
  So you no longer directly edit the object list. There
  can be multiple Sourcefiles and they can even live in
  subdirectories--the directory name will be prepended to
  every filename in the list. Of course, the Makefile
  still needs to be edited to read from each Sourcefile.
- Different rules are no longer required for source code
  files that live in subdirectories (such as sdl/ or
  hardware/). Subdirectories Just Work so go ham!

In addition to those points, another important change is
that the bin directory is no longer divided into platform
subdirectories (Linux64, Mingw, etc). Executables now go
directly into bin. If you use DEBUGMODE or target 64-bit,
then subdirectories for 'debug' and '64' will be made
though.

Oh by the way, I don't think make clean actually removed
files before on Windows. It should now. I also fixed as
many little inconsistencies like that as I noticed.

And now just an overview of the technical aspects that
shouldn't affect anyone who doesn't REALLY care about the
Makefile...

objs and dep directories have been moved to a make
directory. Makefile.cfg and its variants have been moved
out of their various subdirectories to src/Makefile.d
make distclean removes the bin and make directories
entirely, but make clean and cleandep still only affect
the current build target.

When I say automation, I mean that a lot of copy pasting
in the Makefile has been reduced.
 2021-05-04 04:22:37 -07:00
Jaime Ita Passos
e4b8dc6584 Fix sloped plane offsets in Software, and fix rotated flat alignment in OpenGL. 
+ unrelated slope plane optimizations in Software
 2021-04-27 19:01:09 -03:00
Zwip-Zwap Zapony
21da6ce704 Auto-crop at splitscreen borders 
V_DrawCroppedPatch will no longer go beyond splitscreen borders when V_PERPLAYER is used
 2021-04-27 21:30:00 +02:00
Jaime Ita Passos
548554431b Handle invalid blend modes properly 2021-04-27 00:20:41 -03:00
LJ Sonic
02ee480abe Merge branch 'gl-colormapped-epolyflag' into 'next' 
Fix uninitialized reads in PreparePolygon

See merge request STJr/SRB2!1392
 2021-04-25 14:19:24 -04:00
sphere
a90642bfa9 Merge branch 'ogl-midtexture-zfighting-fix' into 'next' 
Render midtextures on two-sided lines with a z-buffer offset

See merge request STJr/SRB2!1376
 2021-04-25 14:02:02 -04:00
Zwip-Zwap Zapony
acff5c1ada Merge branch 'next' into drawcroppedpatch-improvements 2021-04-25 10:15:16 +02:00
sphere
d71b99a56b Merge branch 'comparepolygons-fix' into 'next' 
Remove bad pointer arithmetic in polygon comparators (fixes #295)

Closes #295

See merge request STJr/SRB2!1462
 2021-04-19 14:33:41 -04:00
sphere
d871612a72 Merge branch 'openglol' into 'next' 
Fix HWR_DrawSprite sigsegv

See merge request STJr/SRB2!1454
 2021-04-19 14:33:03 -04:00
Jaime Ita Passos
f93b1b8d7b Raise the skin limit to 256. 2021-04-19 04:01:49 -03:00
Hannu Hanhi
ee578b68f4 Remove bad pointer arithmetic in polygon comparators, that was causing glitches 2021-04-17 03:11:29 +03:00
katsy
23759c67aa move HWR_GetMappedPatch earlier 2021-04-12 21:26:29 -05:00
sphere
bcd3245b76 Merge branch 'blendmode-revision' into 'next' 
Blending changes

See merge request STJr/SRB2!1446
 2021-04-11 08:18:12 -04:00
Hannu Hanhi
e9213b2b41 Fix a OpenGL backend DeleteTexture crash 2021-04-04 21:29:15 +03:00
Jaime Ita Passos
59be35e533 Rename functions, make more efficient, fix subtractive in Software 2021-03-30 22:12:31 -03:00
Jaime Ita Passos
eece82c481 Blend modes revision 
This changes how blend modes render, and includes fixes.
 2021-03-30 17:03:05 -03:00
Monster Iestyn
91187f91be Merge branch 'fix-opengl-drawcroppedpatch' into 'next' 
Fix OpenGL V_DrawCroppedPatch (Fixes #452)

Closes #452

See merge request STJr/SRB2!1412
 2021-03-24 11:34:58 -04:00
Jaime Ita Passos
08937f892a Allocate a buffer for non-RGBA to RGBA texture conversions. 
UpdateTexture will I_Error (from AllocTextureBuffer) if the allocation fails.
 2021-03-23 01:18:28 -03:00
Jaime Ita Passos
dca158096d Experimental implementation 2021-03-22 23:56:55 -03:00
Monster Iestyn
b882aea2e4 Fix clobbering error in hw_md2.c by adding "volatile" to png_FILE. 
(Apparently Kart made this exact fix 2 years ago and it was never backported?)
 2021-03-21 19:49:32 +00:00
Lach
6ab5432713 Merge branch 'opengl-renderflags-fix' into 'next' 
Fix a few renderflags oversights in OpenGL

See merge request STJr/SRB2!1422
 2021-03-14 20:51:57 -04:00
Hannu Hanhi
746c84e0b5 Fix wrong color on player models' first frame by updating variable after loading blend texture 2021-03-13 23:07:51 +02:00
Hannu Hanhi
caab4e96cd Remove misplaced SetShader call in CompileShaders 2021-03-06 19:38:17 +02:00
Jaime Ita Passos
f6cb1798cc Fix a few renderflags oversights in OpenGL 2021-03-02 02:27:14 -03:00
Zwip-Zwap Zapony
308ab0e079 Fix OpenGL V_DrawCroppedPatch 2021-02-21 22:16:38 +01:00
Jaime Ita Passos
8318935811 Remove GLMipmap_t.nextmipmap 2021-01-27 21:23:20 -03:00
Jaime Ita Passos
d4044a4f82 Add PF_ColorMapped 
Not all surfaces have tint and fade colors. Checking for a specific surface flag, that tells the backend those colors are present, avoids uninitialized reads.
 2021-01-27 18:54:33 -03:00
Jaime Ita Passos
5501d495c7 OpenGL backend: Manage uploaded GPU textures with an internal list 
Indirectly fixes the game doing whatever after freeing a patch.
This commit implements a FTextureInfo struct type, instead of it being a typedef to the GLMipmap_s struct type.
 2021-01-27 17:48:57 -03:00
LJ Sonic
14ee92ef67 Merge branch 'gl-levelflat-fix' into 'next' 
Fix a misuse of levelflat_t.picture in OpenGL

See merge request STJr/SRB2!1327
 2021-01-25 16:40:02 -05:00
Hannu Hanhi
d252f074b7 Render midtextures on two-sided lines with a z-buffer offset 
This will fix z-fighting issues when they overlap with FOFs.
 2021-01-10 21:33:54 +02:00
Hannu Hanhi
eb1e7eff8f Take slopes into account even more in FOF wall cutoff in HWR_ProcessSeg 2021-01-10 20:52:03 +02:00
Hannu Hanhi
ed82b94e64 Take slopes into account in FOF wall cutoff in HWR_ProcessSeg 2020-12-29 23:29:00 +02:00
James R
cab089c5b1 Merge branch 'gl-colormap-update' into 'next' 
Fix animated skincolors in OpenGL (resolves #187, #247, #301, #370)

Closes #187, #247, #301, and #370

See merge request STJr/SRB2!1301
 2020-12-15 20:50:45 -05:00
James R
14c6d93c0c Merge branch 'team-elementalfire' into 'next' 
Player-Colored Elemental Fire for competitive gametypes

See merge request STJr/SRB2!1312
 2020-12-15 20:47:45 -05:00
Jaime Ita Passos
6160a2d0fe Fix a misuse of levelflat_t.picture in OpenGL (Kitchen Sink SRB2 port) 2020-12-14 02:07:12 -03:00
James R
c8cc9c7a6f Remove trailing whitespace 2020-12-12 02:40:46 -08:00
Zwip-Zwap Zapony
029e79024b V_DrawCroppedPatch Lua exposure and improvements 
Separated X and Y scale, and added colormap argument
Added V_*SCALEPATCH and V_PERPLAYER flags support
Made sx,sy,w,h into fixed-point values
Exposed to Lua as "v.drawCropped(...)"
(Also fix HWR_DrawStretchyFixedPatch ignoring vscale without pscale)
 2020-12-11 23:43:38 +01:00
Zippy_Zolton
f2095b57fd Player-Colored Elemental Fire for competitive gametypes 2020-12-10 20:37:50 -06:00
James R
e05433f282 Merge branch 'fix-gl-draw-cropped' into 'next' 
Fix HWR_DrawCroppedPatch scaling a patch when cropping the top and left sides.

See merge request STJr/SRB2!1297
 2020-12-10 15:44:51 -05:00
James R
2ab71571aa Merge branch 'high-resolution-timer-2' into next 2020-12-10 02:55:02 -08:00
Jaime Ita Passos
18ee97c583 Fix animated skincolors in OpenGL 2020-12-06 20:17:14 -03:00
GoldenTails
6546fc8ce7 Fix HWR_DrawCroppedPatch scaling a patch when cropping the top and left sides. 2020-12-06 12:01:31 -06:00
Radicalicious
c98108df27 Revert "Update hw_light.c" 
This reverts commit b254439592
 2020-12-03 00:46:28 +00:00
Radicalicious
b0fe3b6b5a Update hw_light.c 2020-12-02 00:36:41 -05:00
Radicalicious
b254439592 Update hw_light.c 2020-12-02 00:17:57 -05:00
Jaime Ita Passos
5293c52bca Remove SHORT macros for referencing patch width/height/offsets 2020-11-22 20:02:47 -03:00
Jaime Ita Passos
0645c642d2 Improve GPU texture management. 2020-11-22 18:18:26 -03:00
Jaime Ita Passos
152c540c1e Fix sprite textures in models 2020-11-22 17:10:10 -03:00
Jaime Ita Passos
9ab3acae2d Change how texture deletion works in OpenGL 2020-11-22 17:03:04 -03:00
Jaime Ita Passos
5e890ee6f8 Merge branch 'next' into spritestuff2 2020-11-19 00:52:43 -03:00
James R
50e15840fb Merge branch 'udmf-multitag' into 'next' 
UDMF: Multitag support

See merge request STJr/SRB2!1097
 2020-11-14 19:18:14 -05:00
James R
e3c8415627 OpenGL: don't access field that doesn't exist in precipmobj_t 2020-11-13 00:46:03 -08:00
Nev3r
fb9432ae57 Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into udmf-multitag 2020-11-10 11:46:53 +01:00
James R
876aeb6a31 Merge branch 'allowshaders' into 'next' 
Let the server or an admin toggle clients' custom shaders

See merge request STJr/SRB2!1181
 2020-11-08 21:09:56 -05:00
Jaime Passos
b8f668b2e0 rename 2020-11-08 23:02:05 -03:00
James R
b72789b0c9 Huge perfstats refactor 
I needed to update it to make it functional with the precise timer. But I also
got sick of looking at the mess of sprintf followed by draw call.
 2020-11-07 01:32:59 -08:00
Hannu Hanhi
c44120eb87 Fix some copyright statements in new files 2020-10-29 16:04:25 +02:00
Jaime Passos
0f9d85694d Implement an "ignore colormaps" sprite rendering flag 2020-10-27 19:54:50 -03:00
Jaime Passos
b03d95c5c6 Bug fixes 2020-10-27 17:02:35 -03:00
Nev3r
c62ef355ef Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into udmf-multitag 
# Conflicts:
#	src/lua_baselib.c
#	src/lua_maplib.c
 2020-10-27 20:48:25 +01:00
Jaime Passos
b872222b50 Implement blend modes 2020-10-27 00:03:41 -03:00
James R
1cd73315f1 Merge branch 'model-fallback' into 'next' 
Model fallback

See merge request STJr/SRB2!1167
 2020-10-18 16:52:42 -04:00
James R
d279489753 Merge branch 'perfstats' into 'next' 
Performance stats

See merge request STJr/SRB2!1186
 2020-10-18 15:33:20 -04:00
Jaime Passos
3ac175660c Don't render sprites with negative xscale or yscale in OpenGL 2020-10-17 22:40:49 -03:00
Jaime Passos
70ada935ec Don't free PU_HWRCACHE and PU_HWRCACHE_UNLOCKED memory tags in HWR_ClearAllTextures. 
Probably fixes a random annoying crash around that function.
(I was also suspecting renderer switching was doing other slightly weird stuff.)
 2020-10-15 14:31:16 -03:00
Jaime Passos
8294479a5f Merge branch 'next' into allowshaders 2020-10-15 01:25:11 -03:00
Jaime Passos
ab526e47cc Implement object-defined floor sprite slopes. 2020-10-14 00:57:13 -03:00
Jaime Passos
4273896311 Implement relative and absolute sprite offsets for objects (mobjs) 
Added RF_ABSOLUTEOFFSETS and RF_FLIPOFFSETS
 2020-10-13 12:57:36 -03:00
Jaime Passos
1ea3bd8fff Fix uninitialized variable warning 2020-10-12 22:08:45 -03:00
Jaime Passos
831ccccdd6 OpenGL support for splats, fix some shadow draw bugs in Software 2020-10-12 19:53:21 -03:00
James R
d73fbd8616 Merge branch 'slight-shader-cleanup' into 'next' 
Shader code cleanup

See merge request STJr/SRB2!1103
 2020-10-12 18:22:08 -04:00
Jaime Passos
b620f4835a Support spritexscale and spriteyscale in OpenGL 
Fix papersprite scaling with spritexscale and spriteyscale in Software
 2020-10-12 17:25:18 -03:00
Jaime Passos
cc97e22e2f Changes to sprite rendering: 
- Added render flags (see r_defs.h)
- Implemented floor splats
- Drop shadow sprite rendering through render flags
 2020-10-12 00:13:22 -03:00
Jaime Passos
6e5f71dd45 Refactor patch rotation 2020-10-10 18:43:26 -03:00
Jaime Passos
b15bbd505c Merge branch 'next' into patch-stuff-again-2 2020-10-10 17:01:10 -03:00
Hannu Hanhi
4f20a20165 Performance stats 2020-10-10 22:12:34 +03:00
Jaime Passos
0811f60b2a Let the server or an admin toggle clients' custom shaders 2020-10-09 02:06:13 -03:00
Jaime Passos
63d4c1dffc Merge remote-tracking branch 'origin' into slight-shader-cleanup 2020-10-08 22:45:39 -03:00
James R
dbd79a29a4 Replace C90's junk with a modest macro 2020-10-06 23:04:23 -07:00
Jaime Passos
aaa9cff6ac Fix PNG issue in OpenGL + optimize PNG sprite loading 2020-10-02 19:48:13 -03:00
Steel Titanium
386db4b7a1 Model fallback 2020-10-02 15:45:43 -04:00
SteelT
060f46653d Merge branch 'ogl-model-uv-adjust' into 'next' 
Re-adjust model UVs when sprite texture dimensions change

See merge request STJr/SRB2!1068
 2020-09-25 21:19:59 -04:00
SteelT
a033f482be Merge branch 'pictureformats' into 'next' 
PNG conversion refactoring

See merge request STJr/SRB2!675
 2020-09-10 15:58:18 -04:00
Jaime Passos
dcaad758f4 Improved memory management for patches 2020-09-07 02:23:07 -03:00
Hannu Hanhi
bda1d1e725 Convince the compiler that I know what I'm doing, I think 2020-08-18 23:21:26 +03:00
Jaime Passos
92c4993d67 Introduce Doom patch format into picture formats 
Fixes sprite rotation
 2020-08-15 21:52:01 -03:00
Jaime Passos
9b426b474c Merge branch 'pictureformats' into patch-stuff-again-2 2020-08-15 20:48:28 -03:00
Nev3r
b15c760dc2 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-multitag 2020-08-15 13:44:59 +02:00
Jaime Passos
78cc4a78d0 Refactor renderer switching 2020-08-14 22:27:16 -03:00
James R
8394bf6055 Merge branch 'opengl-skydome-fixes' into 'next' 
Move the sky dome code out of r_opengl.c, fix issues with shaders

See merge request STJr/SRB2!1071
 2020-08-09 20:45:01 -04:00
Jaime Passos
91ed56ef40 Refactor patch loading 2020-08-08 05:16:47 -03:00
Jaime Passos
74dfa9f700 Shader code cleanup 2020-08-07 18:17:05 -03:00
James R
cc508d0ba3 Merge branch 'ogl-model-lighting-shader' into 'next' 
Add capability to use model lighting with shaders enabled

See merge request STJr/SRB2!1073
 2020-08-05 19:50:31 -04:00
James R
d8834143cb Merge branch 'ogl-sector-alignment-fix' into 'next' 
Fix sector flat alignment issues in OpenGL

See merge request STJr/SRB2!1094
 2020-08-03 12:47:29 -04:00
James R
f5d9029d2a Merge branch 'ogl-big-room-fix' into 'next' 
Big room fix for OpenGL

See merge request STJr/SRB2!1089
 2020-08-03 12:44:09 -04:00
Nev3r
ba5d09eb2e Fix smooth brain bruhments. 2020-07-31 22:38:37 +02:00
Nev3r
0520725069 Fix the OpenGL FOF issue with a different approach. Not fond of it either but at least it works. 2020-07-31 14:55:26 +02:00
Nev3r
729c8b2ec6 Fix FOF intersections with multitags for the OpenGL in a kind of hacky way. 2020-07-29 14:53:27 +02:00
Nev3r
c65ada7dd7 Merge branch 'next' into udmf-multitag 
# Conflicts:
#	src/hardware/hw_main.c
 2020-07-29 13:55:14 +02:00
Nev3r
f791c1b4ec Fix gl_linedef renaming which went off radars on the udmf branch 2020-07-28 20:39:11 +02:00
Nev3r
6dfe236602 Merge branch 'udmf-next' into 'next' 
Merge udmf-next into next

See merge request STJr/SRB2!1075
 2020-07-28 14:03:59 -04:00
Hannu Hanhi
85f5cb20e6 Fix sector flat alignment issues in OpenGL 2020-07-26 21:25:11 +03:00
Hannu Hanhi
24b828b362 Use 64-bit R_PointToAngle in OpenGL culling to fix some big room issues 2020-07-25 21:50:24 +03:00
James R
e47fbe7dd9 Compiler error :V 2020-07-24 02:58:05 -07:00
James R
28931b90dc Merge branch 'ogl-polyobject-tex-fix' into 'next' 
Fix OpenGL polyobject texture distortion

See merge request STJr/SRB2!1086
 2020-07-24 04:49:25 -04:00
James R
932bf9b20e Merge branch 'ogl-shader-light-clamp' into 'next' 
Clamp light level for shaders. Fixes #194.

Closes #194

See merge request STJr/SRB2!1085
 2020-07-24 04:47:57 -04:00
Hannu Hanhi
e331c9d18e Fix OpenGL polyobject texture distortion 2020-07-23 20:51:05 +03:00
Hannu Hanhi
e4d6e92f37 Clamp light level for shaders. Fixes #194. 2020-07-23 19:05:17 +03:00
Hannu Hanhi
80172ee932 Don't discard zero alpha fog block fragments. Fixes #198. 2020-07-23 18:24:41 +03:00
Jaime Passos
ca060a4372 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into pictureformats 2020-07-21 22:25:00 -03:00
Hannu Hanhi
b03e7f63c5 Fix shader comment 2020-07-19 16:07:53 +03:00
Hannu Hanhi
92ebbdfc10 Don't override custom shaders with model lighting shader 2020-07-18 15:48:37 +03:00
Hannu Hanhi
c1cf41fb0c Add capability to use model lighting with shaders enabled 2020-07-18 15:08:59 +03:00
Jaime Passos
48a6652973 Move the sky dome code out of r_opengl.c, fix issues with shaders 2020-07-17 02:48:05 -03:00
Hannu Hanhi
0e5631fe66 More work on sprite-texture model uv adjustment 2 2020-07-16 22:39:44 +03:00
Hannu Hanhi
afd0858b4d More work on sprite-texture model uv adjustment 2020-07-16 22:11:36 +03:00
Hannu Hanhi
893ff0fa19 Merge remote-tracking branch 'upstream/next' into ogl-model-uv-adjust 2020-07-14 20:30:56 +03:00
James R
839f086216 A few more instances of "gr" to purge 2020-07-12 16:09:43 -07:00
James R
b9a24001d8 Merge remote-tracking branch 'origin/next' into remove-glide-2 2020-07-12 16:05:15 -07:00
Hannu Hanhi
3a488c243f Fix translucency comparison from previous commit 2020-07-12 22:23:15 +03:00
Hannu Hanhi
9909746718 Fix crash by handling precip mobjs correctly in ogl sprite sorting 2020-07-12 21:50:00 +03:00
Hannu Hanhi
ec13272d8c Adjust model uvs when used sprite texture changes 2020-07-12 18:04:56 +03:00
Nev3r
2cdfb8ffc6 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next 2020-07-12 14:59:38 +02:00
James R
84373b1726 Merge branch 'opengl-blending-fix' into 'next' 
Fix ASTBlendPixel outputting empty pixels sometimes

See merge request STJr/SRB2!945
 2020-07-11 20:57:30 -04:00
James R
6c3663812b Merge branch 'ogl-linkdraw' into 'next' 
MF2_LINKDRAW support for OpenGL

See merge request STJr/SRB2!1031
 2020-07-11 20:52:11 -04:00
Nev3r
4013c0e0a1 Merge branch 'udmf-next' into udmf-multitag 2020-07-11 08:47:58 +02:00
Nev3r
a9dbf6daf6 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next 2020-07-11 08:47:32 +02:00
Jaime Passos
d87c874559 Fix GL y-shearing ignoring a Y-flipped transform 2020-07-10 19:19:51 -03:00
Hannu Hanhi
ad57426713 Adjust model uvs to power of two texture if sprite texture is used 2020-07-10 23:05:21 +03:00
Hannu Hanhi
5fdc4578db Merge remote-tracking branch 'upstream/next' into ogl-linkdraw 2020-07-10 21:14:57 +03:00
Nev3r
ad55f5f872 Merge branch 'udmf-next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-multitag 
# Conflicts:
#	src/hardware/hw_main.c
#	src/p_ceilng.c
#	src/p_floor.c
#	src/p_mobj.c
#	src/p_mobj.h
#	src/p_polyobj.c
#	src/p_saveg.c
#	src/p_setup.c
#	src/p_spec.c
#	src/p_spec.h
#	src/p_user.c
#	src/r_bsp.c
#	src/r_defs.h
 2020-07-10 18:18:07 +02:00
Nev3r
710097a0ca Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next 2020-07-10 11:47:16 +02:00
Jaime Passos
3a4ce6aea3 Merge remote-tracking branch 'origin/next' into opengl-blending-fix 2020-07-06 19:48:13 -03:00
Jaime Passos
7911deebf8 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into pictureformats 2020-07-06 19:29:14 -03:00
Nev3r
42d92eab2c Fix erroneous merge conflict resolution. 2020-07-06 11:54:55 +02:00
Nev3r
fd5b05cafc Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next 2020-07-06 11:13:27 +02:00
Jaime Passos
4f6420274f Remove Software tricks 2020-07-06 01:26:56 -03:00
Jaime Passos
5c5d907251 gr_ -> gl_ 2020-07-06 01:15:08 -03:00
Jaime Passos
a739cb0da9 Remove unused texture formats 2020-07-06 00:58:09 -03:00
Jaime Passos
3d50bef0e5 Rename structs, turn GrTextureFormat_t into an enum 2020-07-06 00:52:10 -03:00
Jaime Passos
ac04853f8c Remove GrTexInfo 2020-07-06 00:35:48 -03:00
Jaime Passos
abeedc4b65 Delete hw_glide.h 2020-07-06 00:27:34 -03:00
Hannu Hanhi
b4aa5cecc1 Merge remote-tracking branch 'upstream/next' into ogl-linkdraw 2020-07-05 13:27:51 +03:00
LJ Sonic
8d511ed565 Merge branch 'cez3debris' into 'next' 
New Debris for CEZ3

See merge request STJr/SRB2!1012
 2020-07-04 07:00:20 -04:00
LJ Sonic
6e7446dea3 Merge branch 'ff_horizontalflip' into 'next' 
FF_HORIZONTALFLIP and mobj->mirrored (sprite enhancements)

See merge request STJr/SRB2!987
 2020-07-03 16:56:32 -04:00
Hannu Hanhi
b29873ce1c Better MF2_LINKDRAW support for OpenGL 2020-07-03 00:28:52 +03:00
Nev3r
ff8759e507 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next 
# Conflicts:
#	src/hardware/hw_main.c
 2020-06-30 20:29:48 +02:00
James R
7317bbb692 Merge branch 'ogl-sprite-qsort' into 'next' 
Faster OGL sprite sorting algorithm

See merge request STJr/SRB2!1008
 2020-06-24 23:22:06 -04:00
James R
95cc10d735 Merge branch 'ogl-mdl-tex-repeat-search-fix' into 'next' 
Don't repeatedly look for model texture files

See merge request STJr/SRB2!1009
 2020-06-24 21:42:40 -04:00
James R
2e827705b4 Merge branch 'ogl-drawnode-fix' into 'next' 
Faster and more correct OGL transparent surface sorting

See merge request STJr/SRB2!1005
 2020-06-24 21:42:01 -04:00
Zippy_Zolton
ca7fc22388 t_lspr 2020-06-20 14:16:22 -05:00
kaysrishaq
c74a607c54 Whoops, switched these for no reason 2020-06-19 11:11:19 -04:00
kaysrishaq
cad1f57b1e FF_HORIZONTALFLIP and mobj->mirrored (sprite enhancements) 2020-06-19 11:11:18 -04:00
Hannu Hanhi
f3212746d2 Don't repeatedly look for model texture files 2020-06-19 16:18:04 +03:00
Hannu Hanhi
6f9b9aacf4 Faster OGL sprite sorting algorithm 2020-06-19 14:32:34 +03:00
Hannu Hanhi
ffaffdf3e1 Faster and more correct OGL transparent surface sorting 2020-06-18 20:27:19 +03:00
Hannu Hanhi
9477d372b9 Backwards compatibility for shaderless hardware 2020-06-18 17:39:34 +03:00
SteelT
bff6b19056 Merge branch 'marathonmode' into 'next' 
MARATHON RUN

See merge request STJr/SRB2!941
 2020-06-17 19:36:10 -04:00
Steel Titanium
8365d975d3 A even more better fix for this 2020-06-17 18:40:56 -04:00
Steel Titanium
1e655fb2c1 Better fix for may be used uninitialized, maybe fixes GCC 4.x 2020-06-17 18:23:54 -04:00
Steel Titanium
3946309ece Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into sal-oglshaderport 
# Conflicts:
#	src/hardware/r_opengl/r_opengl.c
 2020-06-17 18:15:07 -04:00
Steel Titanium
b056bf1d6c Merge branch 'master' into next 2020-06-11 20:11:26 -04:00
MascaraSnake
4a0206b38d Merge branch 'next' into udmf-next 
# Conflicts:
#	src/p_mobj.c
#	src/p_polyobj.c
 2020-06-09 09:38:01 +02:00
Steel Titanium
2abdc86537 Fix these "may be used uninitialized in this function" errors with batching 2020-06-08 20:18:32 -04:00
mazmazz
2cefe82950 Fix OSX null-pointer-arithmetic error 2020-06-08 00:08:07 -04:00
Hannu Hanhi
0e521922c6 Change some unsigned ints to UINT32 2020-06-07 21:32:52 +03:00
Hannu Hanhi
abe13651d0 OpenGL draw call batching system 2020-06-07 21:20:52 +03:00
Hannu Hanhi
da98ea242e Merge remote-tracking branch 'upstream/next' into shaders-224-next-merge 2020-06-07 20:01:05 +03:00
SteelT
db32b01222 Merge branch 'renderstats' into 'sal-oglshaderport' 
Render stats

See merge request STJr/SRB2!914
 2020-06-07 12:29:58 -04:00
lachwright
a7f73bfa85 Move drop shadows to the ceiling for objects in reverse gravity 2020-05-31 01:21:26 +08:00
SwitchKaze
b37c73b008 Make colors UINT16, increase color freeslots to 1024 2020-05-23 19:35:36 -05:00
SwitchKaze
46191cade7 Update to 2.2.4 2020-05-22 16:47:51 -05:00
Louis-Antoine
d40a8efce2 I forgot to test OpenGL :slight_smile: 2020-05-18 20:35:30 +02:00
Louis-Antoine
d0abd6e86c Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into slope-cleanup 
# Conflicts:
#	src/hardware/hw_main.c
#	src/p_spec.c
 2020-05-18 16:14:05 +02:00
Louis-Antoine
a06c4a8c98 Rename P_GetZAt to P_GetSlopeZAt and P_GetZAt2 to P_GetZAt 2020-05-18 15:23:56 +02:00
Jaime Passos
c64e231b2b Attempt to properly match Software texture blending 
without messing with the original ASTBlendPixel function
 2020-05-16 13:51:10 -03:00
Jaime Passos
1a79f6246d Merge remote-tracking branch 'origin/next' into pictureformats 2020-05-15 01:34:54 -03:00
toaster
d593e2e1bb Introducing Marathon Run. (I was going to call it Marathon Mode, but NiGHTS Mode being right next to it on the menu looked terrible.) 
Basically a dedicated Record Attack-like experience for speedrunning the game as a continuous chunk rather than ILs. Has several quality of life features.

Benefits include:
* An unambiguous real-time bar across the bottom of the screen, always displaying the current time, ticking up until you reach the ending.
* Disable the console (pausing is still allowed, but the timer will still increment).
* Automatically skip intermissions as if you're holding down the spin button.
* Show centiseconds on HUD automatically, like record attack.
* "Live Event Backups" - a category of run fit for major events like GDQ, where recovery from crashes or chokes makes for better entertainment. Essentially a modified SP savefile, down to using the same basic functions, but has its own filename and tweaked internal layout.
* "spmarathon_start" MainCfg block parameter and "marathonnext" mapheader parameter, allowing for a customised flow (makes this fit for purpose for an eventual SUGOI port).
* Disabling inter-level custom cutscenes by default with a menu option to toggle this (won't show up if the mod doesn't *have* any custom cutscenes), although either way ending cutscenes (vanilla or custom) remain intact since is time is called before them.
* Won't show up if you have a mod that consists of only one level (determined by spmarathon_start's nextlevel; this won't trip if you manually set its marathonnext).
* Unconditional gratitude on the evaluation screen, instead of a negging "Try again..." if you didn't get all the emeralds (which you may not have been aiming for).
* Gorgeous new menu (no new assets required, unless you wanna give it a header later).

Changes which were required for the above but affect other areas of the game include:
* "useBlackRock" MainCFG block parameter, which can be used to disable the presence of the Black Rock or Egg Rock in both the Evaluation screen and the Marathon Run menu (for total conversions with different stories).
* Disabling Continues in NiGHTS mode, to match the most common singleplayer experience post 2.2.4's release (is reverted if useContinues is set to true).
* Hiding the exitmove "powerup" outside of multiplayer. (Okay, this isn't really related, I just saw this bug in action a lot while doing test runs and got annoyed enough to fix it here.)
* The ability to use V_DrawPromptBack (in hardcode only at the moment, but) to draw in terms of pixels rather than rows of text, by providing negative instead of positive inputs).
* A refactoring of redundant game saves smattered across the ending, credits, and evaluation - in addition to saving the game slightly earlier.
* Minor m_menu.c touchups and refactorings here and there.

Built using feedback from the official server's #speedruns channel, among other places.
 2020-05-14 23:10:00 +01:00
MascaraSnake
1ccda0b85c Merge branch 'next' into udmf-next 2020-05-13 10:01:12 +02:00
Monster Iestyn
197da95a23 Last minute OpenGL fix: don't check flippedness in HWR_RotateSpritePolyToAim if the mobj is actually a precipmobj! 
precipmobj_t does not have eflags, so P_MobjFlip checking it would actually be accessing memory addresses beyond the end of the struct
 2020-05-10 20:09:08 +01:00
lachwright
51a5ece294 Merge remote-tracking branch 'origin/next' into gfz3laser-mkii 2020-05-07 22:34:44 +08:00
Monster Iestyn
30105621d4 Merge branch 'master' into next 2020-05-06 21:51:36 +01:00
lachwright
63cb58a10a Update new GFZ3 laser 2020-05-06 09:03:03 +08:00
MascaraSnake
6e7373a475 Merge branch 'next' into udmf-next 2020-05-04 20:32:56 +02:00
Hannu Hanhi
724e093ce8 Render stats cleanup 2020-05-02 23:14:08 +03:00
Hannu Hanhi
7e8543a408 More render stats for software mode, renamed and relocated some render stats variables 2020-05-02 23:13:53 +03:00
Hannu Hanhi
8dcc2fe20d Move some render stats variables to better locations, add I_FinishUpdate timing 2020-05-02 23:13:32 +03:00
Hannu Hanhi
64a153fdee Render stats 2020-05-02 23:13:08 +03:00
Monster Iestyn
1528f2aef8 Fix drop shadow and rotsprite code to use SHORT() 2020-05-02 17:13:16 +01:00
MascaraSnake
485a4e5035 Remove POLYOBJECTS and POLYOBJECTS_PLANES defines 2020-05-02 12:08:31 +02:00
Hannu Hanhi
be99670a39 More HWR_ProcessSeg sky code from master 2020-04-30 19:57:28 +03:00
Hannu Hanhi
ff8f48647b HWR_ProcessSeg skywall processing from master 2020-04-30 19:57:15 +03:00
Hannu Hanhi
78c2928b8b Optimization: also don't reset shader on models 2020-04-25 16:32:44 +03:00
Hannu Hanhi
c0c095e1d1 Optimization: only call pglUseProgram if shader actually needs changing 2020-04-25 16:32:32 +03:00
Hannu Hanhi
0758a8caec Optimization: Don't reset shader program at end of DrawPolygon, instead reset it in UnSetShader 2020-04-25 16:32:21 +03:00
James R
fe9b933b97 Merge remote-tracking branch 'origin/master' into HEAD 2020-04-24 22:10:59 -07:00
Nev3r
5c605a8a39 Merge branch 'udmf-next' into udmf-multitag 2020-04-20 09:05:55 +02:00
Nev3r
efb81fc526 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next 2020-04-20 09:05:21 +02:00
James R
536fb1ef2a Merge remote-tracking branch 'origin/master' into next 2020-04-18 17:20:33 -07:00
Nev3r
38e92aecfd Fix Tags_Compare() typo to Tag_Compare(). 2020-04-12 15:03:14 +02:00
Nev3r
64e2e7c12f Use Tags_Compare wrapper in the OpenGL renderer, as well. 2020-04-12 13:16:33 +02:00
Nev3r
4128f826b7 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next 
# Conflicts:
#	src/lua_hooklib.c
 2020-04-12 09:57:19 +02:00
James R
efe74cfd8f Merge branch 'md2-rollangle' into 'master' 
Fix MD2 rollangle in reverse gravity

See merge request STJr/SRB2!818
 2020-04-09 21:25:02 -04:00
James R
0313213c59 Merge branch 'hw-horizon' into 'master' 
OGL horizon lines

See merge request STJr/SRB2!861
 2020-04-09 21:24:41 -04:00
James R
aca39d6210 Merge remote-tracking branch 'origin/master' into next 2020-04-09 17:04:04 -07:00
James R
5f7bd9a947 Merge branch 'fix-256-brightness' into 'master' 
Florida man fixes sectors with light level 256 blacking out OpenGL objects; mappers riot.

See merge request STJr/SRB2!840
 2020-04-09 19:53:40 -04:00
James R
2dfe276a73 Merge branch 'sdlglcontext' into 'master' 
Only initialise OpenGL if the user intends to load it (for real this time)

See merge request STJr/SRB2!796
 2020-04-09 19:51:20 -04:00
MascaraSnake
92c74814cf Standardize the behavior of FF_INVERTSIDES and FF_INVERTPLANES 2020-03-25 08:34:52 +01:00
fickleheart
719f29d27e Reduce near renderdist to lessen visible texture distortion 2020-03-23 08:23:36 -05:00
fickleheart
f9027ccaeb Split horizon lines for minimal distortion 2020-03-22 12:52:17 -05:00
fickleheart
14d6a01292 Distort far edges to viewz for a flat horizon line 2020-03-22 12:28:49 -05:00
fickleheart
deff1565dc GL horizon lines 2020-03-22 12:13:59 -05:00
Louis-Antoine
6f9422d380 Encapsulate plane height checks 2020-03-22 17:28:50 +01:00
MascaraSnake
1580e14cbc Merge branch 'next' into udmf-next 
# Conflicts:
#	extras/conf/Includes/SRB222_linedefs.cfg
#	extras/conf/Includes/SRB222_misc.cfg
#	src/p_spec.c
 2020-03-21 20:04:31 +01:00
Louis-Antoine
892a8dd6e7 Make SRB2 flat like Earth 2020-03-20 18:55:29 +01:00
Jaime Passos
1904e3b5e9 Fix OpenGL 2020-03-17 15:23:13 -03:00
Monster Iestyn
3f43dd22f9 Merge branch 'skins-refactor' into 'master' 
Skins refactor

See merge request STJr/SRB2!843
 2020-03-15 15:31:49 -04:00
MascaraSnake
3c294b5e3d Merge branch 'next' into udmf-next 2020-03-15 09:57:42 +01:00
SteelT
88fff119ea Merge branch 'hwrflipcolchromakey' into 'master' 
Fix HWR_DrawFlippedColumnInCache ignoring chroma key TF

See merge request STJr/SRB2!826
 2020-03-14 22:13:19 -04:00
fickleheart
e3b17cd82b Use po2 patches to fix mipmaps 2020-03-14 15:52:25 -05:00
fickleheart
b9d7b3e5c5 Merge remote-tracking branch 'upstream/master' into shaders-222 
# Conflicts:
#	src/hardware/r_opengl/r_opengl.c
#	src/i_video.h
#	src/r_main.c
#	src/r_main.h
#	src/screen.c
#	src/sdl/i_video.c
#	src/sdl/ogl_sdl.c
#	src/w_wad.c
 2020-03-14 12:52:15 -05:00
Nev3r
68f60f3c29 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next 2020-03-11 09:31:31 +01:00
Monster Iestyn
f4cb6e1f5e Include r_skins.h instead of r_things.h in many files where all they wanted from it was skins stuff 
(oddly enough, this actually revealed some secret file dependencies previously included via r_things.h! I also needed to include d_player.h in r_skins.h itself it seems)
 2020-03-09 13:54:56 +00:00
GoldenTails
cdba9ba033 Fix spaces before someone yells at me for it 2020-03-07 21:48:40 -06:00
GoldenTails
0d92bf3dd0 Florida man fixes sectors with light level 256 blacking out OpenGL objects; mappers riot. 
Disclaimer: I'm not actually from Florida.
 2020-03-07 21:41:52 -06:00
Jaime Passos
26e367eb9b Merge remote-tracking branch 'origin/next' into pictureformats 2020-03-07 20:43:16 -03:00
Jaime Passos
4a489c4d95 Fix NOTEXTURE_NUM 2020-02-28 18:57:34 -03:00
Jaime Passos
9b88edc458 Same deal for screen textures 2020-02-28 18:57:15 -03:00
Jaime Passos
48b352049f Stop using NextTexAvail 2020-02-28 18:56:41 -03:00
Jaime Passos
7f32a53233 Fix HWR_DrawFlippedColumnInCache ignoring chroma key TF 2020-02-28 17:31:41 -03:00
fickleheart
d1dcdf88c7 Fix MD2 rollangle in reverse gravity 2020-02-23 18:44:22 -06:00
SwitchKaze
6415e10216 Merge branch 'next' of https://github.com/STJr/SRB2 into next-luacolors 2020-02-23 11:50:13 -05:00
James Hale
56b67a3b4f Custom skincolors 2020-02-21 21:56:39 -05:00
Steel Titanium
76f26cda24 Merge branch 'master' into next 2020-02-21 21:01:29 -05:00
SteelT
a1cf58cf7f Merge branch 'update-copyright-year' into 'master' 
Update copyright year

See merge request STJr/SRB2!801
 2020-02-21 20:59:56 -05:00
James R
93046c5e59 Merge remote-tracking branch 'origin/master' into next 2020-02-20 17:30:50 -08:00
James R
fb0bedf02c Merge branch 'ogl-colorbug' into 'master' 
Fix OpenGL "color bug"

See merge request STJr/SRB2!795
 2020-02-20 19:32:34 -05:00
James R
7060083db5 Update copyright year to 2020 2020-02-19 14:08:45 -08:00
Jaime Passos
2893803c68 Merge remote-tracking branch 'origin/next' into pictureformats 2020-02-19 02:25:36 -03:00
James R
92f65fd822 Merge branch 'exitmove-tweaks' into 'next' 
Exitmove tweaks

See merge request STJr/SRB2!709
 2020-02-18 21:58:18 -05:00
MascaraSnake
cae99654be Merge branch 'next' into udmf-next 2020-02-18 18:39:11 +01:00
Monster Iestyn
2b3034a7af Merge branch 'master' into next 2020-02-18 17:38:05 +00:00
Jaime Passos
bef6cb532b Fix what !785 tried to fix, but correctly 2020-02-17 21:58:32 -03:00
Jaime Passos
d0ee4ad440 Change the default setting of cv_grshearing to Off 2020-02-17 12:30:02 -03:00
Jaime Passos
00bdb41640 Merge remote-tracking branch 'origin/master' into sal-oglshaderport 2020-02-17 12:28:16 -03:00
James R
d0b9027d0a Merge branch 'viewroll' into 'next' 
Rolling

See merge request STJr/SRB2!690
 2020-02-17 00:10:57 -05:00
James R
94aec0101f Merge branch 'grfang' into 'master' 
Allow models for skin/sprites with same name

See merge request STJr/SRB2!767
 2020-02-16 23:21:07 -05:00