Sally Coolatta
|
ef2579f2b3
|
Merge branch 'master' into draw-flags
|
2020-07-20 13:38:48 -04:00 |
|
Hannu Hanhi
|
1c4d605b51
|
Fix shader comment
|
2020-07-19 16:07:53 +03:00 |
|
Hannu Hanhi
|
e575676887
|
Don't override custom shaders with model lighting shader
|
2020-07-18 15:48:37 +03:00 |
|
Hannu Hanhi
|
5b8c41fffd
|
Add capability to use model lighting with shaders enabled
|
2020-07-18 15:08:59 +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 |
|
Hannu Hanhi
|
85b2ed594f
|
More work on sprite-texture model uv adjustment 2
|
2020-07-16 22:39:44 +03:00 |
|
Hannu Hanhi
|
edc479fd13
|
More work on sprite-texture model uv adjustment
|
2020-07-16 22:11:36 +03:00 |
|
Hannu Hanhi
|
73b8f9f131
|
Merge remote-tracking branch 'upstream/next' into ogl-model-uv-adjust
|
2020-07-14 20:30:56 +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 |
|
Hannu Hanhi
|
1f89e1cf42
|
Adjust model uvs when used sprite texture changes
|
2020-07-12 18:04:56 +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 |
|
James R
|
1a10b098bb
|
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
|
6938812640
|
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
|
fe87d0391c
|
Merge branch 'udmf-next' into udmf-multitag
|
2020-07-11 08:47:58 +02:00 |
|
Nev3r
|
33176f3787
|
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next
|
2020-07-11 08:47:32 +02:00 |
|
Jaime Passos
|
fec258ccb8
|
Fix GL y-shearing ignoring a Y-flipped transform
|
2020-07-10 19:19:51 -03:00 |
|
Hannu Hanhi
|
2ae0980d62
|
Adjust model uvs to power of two texture if sprite texture is used
|
2020-07-10 23:05:21 +03: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
|
a9da775dd9
|
Merge remote-tracking branch 'origin/next' into opengl-blending-fix
|
2020-07-06 19:48:13 -03: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
|
ff7b9a5b5c
|
Remove unused texture formats
|
2020-07-06 00:58:09 -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 |
|
Jaime Passos
|
abc4f22a3e
|
Delete hw_glide.h
|
2020-07-06 00:27:34 -03:00 |
|
Hannu Hanhi
|
c03f5a0706
|
Merge remote-tracking branch 'upstream/next' into ogl-linkdraw
|
2020-07-05 13:27:51 +03:00 |
|
LJ Sonic
|
ac070380c1
|
Merge branch 'cez3debris' into 'next'
New Debris for CEZ3
See merge request STJr/SRB2!1012
|
2020-07-04 07:00:20 -04: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
|
1a9b74a57c
|
Merge branch 'ogl-mdl-tex-repeat-search-fix' into 'next'
Don't repeatedly look for model texture files
See merge request STJr/SRB2!1009
|
2020-06-24 21:42:40 -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 |
|
Zippy_Zolton
|
f3a9ba447b
|
t_lspr
|
2020-06-20 14:16:22 -05:00 |
|
kaysrishaq
|
18281fd511
|
Whoops, switched these for no reason
|
2020-06-19 11:11:19 -04:00 |
|
kaysrishaq
|
6f859fd44d
|
FF_HORIZONTALFLIP and mobj->mirrored (sprite enhancements)
|
2020-06-19 11:11:18 -04:00 |
|
Hannu Hanhi
|
20447c68a5
|
Don't repeatedly look for model texture files
|
2020-06-19 16:18:04 +03: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 |
|
SteelT
|
dbd5198ac2
|
Merge branch 'marathonmode' into 'next'
MARATHON RUN
See merge request STJr/SRB2!941
|
2020-06-17 19:36:10 -04:00 |
|
Steel Titanium
|
12e85f54a1
|
A even more better fix for this
|
2020-06-17 18:40:56 -04:00 |
|