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
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
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
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
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
Jaime Passos
146da28f88
Remove GrTexInfo
2020-07-06 00:35:48 -03:00
Hannu Hanhi
c03f5a0706
Merge remote-tracking branch 'upstream/next' into ogl-linkdraw
2020-07-05 13:27:51 +03: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
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
kaysrishaq
6f859fd44d
FF_HORIZONTALFLIP and mobj->mirrored (sprite enhancements)
2020-06-19 11:11:18 -04:00
Hannu Hanhi
75da8067dc
Faster OGL sprite sorting algorithm
2020-06-19 14:32:34 +03:00
Hannu Hanhi
b6ea242ba3
Faster and more correct OGL transparent surface sorting
2020-06-18 20:27:19 +03:00
Hannu Hanhi
a5f4c3eeb0
Backwards compatibility for shaderless hardware
2020-06-18 17:39:34 +03:00
MascaraSnake
3ce62d7780
Merge branch 'next' into udmf-next
...
# Conflicts:
# src/p_mobj.c
# src/p_polyobj.c
2020-06-09 09:38:01 +02:00
Hannu Hanhi
8ea66e3813
OpenGL draw call batching system
2020-06-07 21:20:52 +03:00
Hannu Hanhi
6961bba693
Merge remote-tracking branch 'upstream/next' into shaders-224-next-merge
2020-06-07 20:01:05 +03:00
SteelT
e6d6d65e05
Merge branch 'renderstats' into 'sal-oglshaderport'
...
Render stats
See merge request STJr/SRB2!914
2020-06-07 12:29:58 -04:00
Sryder
5b6ed47113
hw_main
...
I wouldn't be surprised if some vanilla changes haven't made it in here
I also wouldn't be too surprised if this broke a lot.
My recommendation for when Hannu finishes implementing his changes for vanilla is to take the files as-is from there and re-implement our changes.
2020-06-01 23:28:15 +01:00
lachwright
3b4df4657a
Move drop shadows to the ceiling for objects in reverse gravity
2020-05-31 01:21:26 +08:00
Sally Coolatta
63917ffccc
The start of the scary 2.2 merge
...
All conflicts are left in-tact. We should be collaborating on solving these files one at a time.
2020-05-29 13:43:38 -04:00
Sryder
d4080e94f7
Better fake contrast.
...
Fake contrast for the segs are calculated at map load.
OpenGL only has the options "Standard" and "Smooth" now. Standard is default and replicates software. Smooth changes the contrast more smoothly depending on angle.
2020-05-21 16:32:34 +01:00
Louis-Antoine
cce2ade8a5
I forgot to test OpenGL :slight_smile:
2020-05-18 20:35:30 +02:00
Louis-Antoine
74fa35221d
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
6af2871fa5
Rename P_GetZAt to P_GetSlopeZAt and P_GetZAt2 to P_GetZAt
2020-05-18 15:23:56 +02:00