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 |
|
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 |
|
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 |
|
lachwright
|
3b4df4657a
|
Move drop shadows to the ceiling for objects in reverse gravity
|
2020-05-31 01:21:26 +08: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 |
|
MascaraSnake
|
c2037391d2
|
Merge branch 'next' into udmf-next
|
2020-05-13 10:01:12 +02:00 |
|
Monster Iestyn
|
1ea3a031da
|
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 |
|
Monster Iestyn
|
c06fbf4fe7
|
Merge branch 'master' into next
|
2020-05-06 21:51:36 +01:00 |
|
MascaraSnake
|
8c22834b46
|
Merge branch 'next' into udmf-next
|
2020-05-04 20:32:56 +02:00 |
|
Hannu Hanhi
|
cfafe90e78
|
Render stats cleanup
|
2020-05-02 23:14:08 +03:00 |
|
Hannu Hanhi
|
1350b89a06
|
More render stats for software mode, renamed and relocated some render stats variables
|
2020-05-02 23:13:53 +03:00 |
|
Hannu Hanhi
|
1a741f8883
|
Move some render stats variables to better locations, add I_FinishUpdate timing
|
2020-05-02 23:13:32 +03:00 |
|
Hannu Hanhi
|
e5531714df
|
Render stats
|
2020-05-02 23:13:08 +03:00 |
|
Monster Iestyn
|
145b7d8f66
|
Fix drop shadow and rotsprite code to use SHORT()
|
2020-05-02 17:13:16 +01:00 |
|
MascaraSnake
|
8efec04051
|
Remove POLYOBJECTS and POLYOBJECTS_PLANES defines
|
2020-05-02 12:08:31 +02:00 |
|
Hannu Hanhi
|
5287303a5e
|
More HWR_ProcessSeg sky code from master
|
2020-04-30 19:57:28 +03:00 |
|
Hannu Hanhi
|
e3edf5e3a2
|
HWR_ProcessSeg skywall processing from master
|
2020-04-30 19:57:15 +03:00 |
|
James R
|
eb0ba37dce
|
Merge remote-tracking branch 'origin/master' into HEAD
|
2020-04-24 22:10:59 -07:00 |
|