Sally Coolatta
7c2bd0d1c2
Merge remote-tracking branch 'srb2/next' into the-scary-22-merge
2020-10-24 20:50:58 -04:00
Sally Coolatta
9b6aa946ea
Merge remote-tracking branch 'srb2/master' into the-scary-22-merge
2020-10-24 19:28:06 -04:00
James R
f34a761d48
Merge branch 'perfstats' into 'next'
...
Performance stats
See merge request STJr/SRB2!1186
2020-10-18 15:33:20 -04:00
James R
c04d08460a
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
24ff748c58
Performance stats
2020-10-10 22:12:34 +03:00
Jaime Passos
70cd48c9a2
Merge remote-tracking branch 'origin' into slight-shader-cleanup
2020-10-08 22:45:39 -03:00
James R
b7c4a82a0f
Replace C90's junk with a modest macro
2020-10-06 23:04:23 -07:00
James R
997d142cb5
SPLITSCREEN FOV
...
Object tracking is off, but it was off before so I don't know if I actually
broke it. Minor refactoring in HWR_RenderPlayerView and HWR_RenderSkyboxView.
2020-09-23 17:50:47 -07:00
James R
a32486b5b9
And fix opengl splitscreen
2020-09-23 17:50:47 -07:00
SteelT
6a168ac5e9
Merge branch 'pictureformats' into 'next'
...
PNG conversion refactoring
See merge request STJr/SRB2!675
2020-09-10 15:58:18 -04:00
Sally Coolatta
0dc21106e5
Lua stuff is done
2020-08-15 07:47:18 -04:00
Sally Coolatta
19016db338
Got through OGL
2020-08-15 06:20:22 -04:00
Sally Coolatta
dfd733eb80
Up to screen.o
...
Lots of renderer files I didn't need to touch at all here :)
2020-08-15 00:55:30 -04:00
Sally Coolatta
5a6263c36b
Make it past p_mobj
2020-08-14 20:48:06 -04:00
Sally Coolatta
2f2e813e52
m_anigif, m_cheat, m_cond, m_fixed
...
Up to m_menu, and it's screaming, so I'm going to take a break :V
2020-08-14 01:31:37 -04:00
Sally Coolatta
f9ca40e673
Merge branch 'master' into the-scary-22-merge
2020-08-12 20:59:09 -04:00
Sally Coolatta
135e9b9797
f_finale now compiles
2020-08-11 23:13:25 -04:00
Sryder
7f9850644b
A few opengl file build fixes
...
Also ogl_win.c had a merge conflict remaining apparently.
2020-08-12 00:12:42 +01:00
Sally Coolatta
a30d20590c
Merge hw_main.c
2020-08-10 16:23:48 -04:00
Sally Coolatta
e296e1309a
YAY, round 2
2020-08-09 21:02:56 -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
Jaime Passos
368e550ab1
Shader code cleanup
2020-08-07 18:17:05 -03: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
Sally Coolatta
1008dcce36
Vertical flip for shadows
2020-07-29 23:55:36 -04:00
Sally Coolatta
72bfbefad3
SHORT fixes from vanilla for shadows
2020-07-29 21:28: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
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
Jaime Passos
10189ecdc0
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into pictureformats
2020-07-21 22:25:00 -03:00
Sally Coolatta
ef2579f2b3
Merge branch 'master' into draw-flags
2020-07-20 13:38:48 -04: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
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
c385eca5d2
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into pictureformats
2020-07-06 19:29:14 -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
d283cc1d2a
Rename structs, turn GrTextureFormat_t into an enum
2020-07-06 00:52:10 -03:00