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 |
|
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 |
|
Hannu Hanhi
|
4f20a20165
|
Performance stats
|
2020-10-10 22:12:34 +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 |
|
Hannu Hanhi
|
bda1d1e725
|
Convince the compiler that I know what I'm doing, I think
|
2020-08-18 23:21:26 +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
|
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
|
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
|
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
|
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 |
|