Commit graph

1299 commits

Author SHA1 Message Date
Sally Coolatta
e296e1309a YAY, round 2 2020-08-09 21:02:56 -04:00
Sally Coolatta
737f5c35c4 Merge r_opengl.c/h 2020-08-09 20:45:29 -04:00
James R
66d36d4fdf 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
Sally Coolatta
aeeedac1ea Merge hw_md2.c 2020-08-09 19:35:13 -04:00
James R
36210abee8 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
8ff4410102 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
6222c39d42 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
69cdd00be6 Fix gl_linedef renaming which went off radars on the udmf branch 2020-07-28 20:39:11 +02:00
Nev3r
3d90a6aebe 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
c5ac318cd7 Fix sector flat alignment issues in OpenGL 2020-07-26 21:25:11 +03:00
Hannu Hanhi
470d19727b Use 64-bit R_PointToAngle in OpenGL culling to fix some big room issues 2020-07-25 21:50:24 +03:00
James R
50479ffb74 Compiler error :V 2020-07-24 02:58:05 -07:00
James R
45c8f3a6cb 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
dd0c85b1ca 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
b7f26c7f94 Fix OpenGL polyobject texture distortion 2020-07-23 20:51:05 +03:00
Hannu Hanhi
5e60111b9b Clamp light level for shaders. Fixes #194. 2020-07-23 19:05:17 +03:00
Hannu Hanhi
6fd250117a Don't discard zero alpha fog block fragments. Fixes #198. 2020-07-23 18:24:41 +03:00
Hannu Hanhi
1c4d605b51 Fix shader comment 2020-07-19 16:07:53 +03:00
Hannu Hanhi
e575676887 Don't override custom shaders with model lighting shader 2020-07-18 15:48:37 +03:00
Hannu Hanhi
5b8c41fffd Add capability to use model lighting with shaders enabled 2020-07-18 15:08:59 +03:00
Jaime Passos
16c4ba672a Move the sky dome code out of r_opengl.c, fix issues with shaders 2020-07-17 02:48:05 -03:00
James R
16ce826caf A few more instances of "gr" to purge 2020-07-12 16:09:43 -07:00
James R
e09a430804 Merge remote-tracking branch 'origin/next' into remove-glide-2 2020-07-12 16:05:15 -07:00
Hannu Hanhi
107391f81c Fix translucency comparison from previous commit 2020-07-12 22:23:15 +03:00
Hannu Hanhi
3b46ffb422 Fix crash by handling precip mobjs correctly in ogl sprite sorting 2020-07-12 21:50:00 +03:00
Nev3r
d57d2959e0 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next 2020-07-12 14:59:38 +02:00
James R
1a10b098bb 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
6938812640 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
33176f3787 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next 2020-07-11 08:47:32 +02:00
Jaime Passos
fec258ccb8 Fix GL y-shearing ignoring a Y-flipped transform 2020-07-10 19:19:51 -03:00
Hannu Hanhi
2ae0980d62 Adjust model uvs to power of two texture if sprite texture is used 2020-07-10 23:05:21 +03:00
Hannu Hanhi
e63ad7d2bd Merge remote-tracking branch 'upstream/next' into ogl-linkdraw 2020-07-10 21:14:57 +03:00
Nev3r
9210b2ba0b Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next 2020-07-10 11:47:16 +02:00
Jaime Passos
a9da775dd9 Merge remote-tracking branch 'origin/next' into opengl-blending-fix 2020-07-06 19:48:13 -03:00
Nev3r
e361663eb8 Fix erroneous merge conflict resolution. 2020-07-06 11:54:55 +02:00
Nev3r
6b38fe4b2c Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next 2020-07-06 11:13:27 +02:00
Jaime Passos
9788afa820 Remove Software tricks 2020-07-06 01:26:56 -03:00
Jaime Passos
615c7121ed gr_ -> gl_ 2020-07-06 01:15:08 -03:00
Jaime Passos
ff7b9a5b5c Remove unused texture formats 2020-07-06 00:58:09 -03:00
Jaime Passos
d283cc1d2a Rename structs, turn GrTextureFormat_t into an enum 2020-07-06 00:52:10 -03:00
Jaime Passos
146da28f88 Remove GrTexInfo 2020-07-06 00:35:48 -03:00
Jaime Passos
abc4f22a3e Delete hw_glide.h 2020-07-06 00:27:34 -03:00
Hannu Hanhi
c03f5a0706 Merge remote-tracking branch 'upstream/next' into ogl-linkdraw 2020-07-05 13:27:51 +03:00
LJ Sonic
ac070380c1 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
080a5acd0f 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
ff9848befb Better MF2_LINKDRAW support for OpenGL 2020-07-03 00:28:52 +03:00
Nev3r
e301d268ec 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
f2f68ca732 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
1a9b74a57c 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
a3f9b9c302 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