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
ebe16a66d9
Merge branch 'udmf-next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-multitag
...
# Conflicts:
# src/hardware/hw_main.c
# src/p_ceilng.c
# src/p_floor.c
# src/p_mobj.c
# src/p_mobj.h
# src/p_polyobj.c
# src/p_saveg.c
# src/p_setup.c
# src/p_spec.c
# src/p_spec.h
# src/p_user.c
# src/r_bsp.c
# src/r_defs.h
2020-07-10 18:18:07 +02: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
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
James R
3162a203be
Merge remote-tracking branch 'pub/master' into wtf
2020-06-03 15:57:09 -07: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
Hannu Hanhi
5f6e3b0e0f
Fix wrong orientation some boost pads in ogl
2020-05-16 13:47:21 +03:00
Sally Coolatta
ff756ae35c
OGL sprite support
2020-05-15 23:49:17 -04:00
Jaime Passos
c69a4f9ced
Merge remote-tracking branch 'origin/next' into pictureformats
2020-05-15 01:34:54 -03:00
MascaraSnake
c2037391d2
Merge branch 'next' into udmf-next
2020-05-13 10:01:12 +02:00
Sally Coolatta
15d18640de
Merge remote-tracking branch 'public/master' into merge-12
2020-05-12 03:16:14 -04: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
Wolfy
aabd65cbff
Don't use models for signposts
...
based james
2020-05-03 23:51:30 -05: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
