Jaime Passos
|
b15bbd505c
|
Merge branch 'next' into patch-stuff-again-2
|
2020-10-10 17:01:10 -03:00 |
|
Hannu Hanhi
|
4f20a20165
|
Performance stats
|
2020-10-10 22:12:34 +03:00 |
|
Jaime Passos
|
0811f60b2a
|
Let the server or an admin toggle clients' custom shaders
|
2020-10-09 02:06:13 -03:00 |
|
Jaime Passos
|
63d4c1dffc
|
Merge remote-tracking branch 'origin' into slight-shader-cleanup
|
2020-10-08 22:45:39 -03:00 |
|
James R
|
dbd79a29a4
|
Replace C90's junk with a modest macro
|
2020-10-06 23:04:23 -07:00 |
|
SteelT
|
a033f482be
|
Merge branch 'pictureformats' into 'next'
PNG conversion refactoring
See merge request STJr/SRB2!675
|
2020-09-10 15:58:18 -04:00 |
|
Jaime Passos
|
dcaad758f4
|
Improved memory management for patches
|
2020-09-07 02:23:07 -03:00 |
|
Jaime Passos
|
9b426b474c
|
Merge branch 'pictureformats' into patch-stuff-again-2
|
2020-08-15 20:48:28 -03:00 |
|
Nev3r
|
b15c760dc2
|
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-multitag
|
2020-08-15 13:44:59 +02:00 |
|
Jaime Passos
|
78cc4a78d0
|
Refactor renderer switching
|
2020-08-14 22:27:16 -03:00 |
|
James R
|
8394bf6055
|
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
|
91ed56ef40
|
Refactor patch loading
|
2020-08-08 05:16:47 -03:00 |
|
Jaime Passos
|
74dfa9f700
|
Shader code cleanup
|
2020-08-07 18:17:05 -03:00 |
|
James R
|
d8834143cb
|
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
|
f5d9029d2a
|
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
|
ba5d09eb2e
|
Fix smooth brain bruhments.
|
2020-07-31 22:38:37 +02:00 |
|
Nev3r
|
0520725069
|
Fix the OpenGL FOF issue with a different approach. Not fond of it either but at least it works.
|
2020-07-31 14:55:26 +02:00 |
|
Nev3r
|
729c8b2ec6
|
Fix FOF intersections with multitags for the OpenGL in a kind of hacky way.
|
2020-07-29 14:53:27 +02:00 |
|
Nev3r
|
c65ada7dd7
|
Merge branch 'next' into udmf-multitag
# Conflicts:
# src/hardware/hw_main.c
|
2020-07-29 13:55:14 +02:00 |
|
Nev3r
|
f791c1b4ec
|
Fix gl_linedef renaming which went off radars on the udmf branch
|
2020-07-28 20:39:11 +02:00 |
|
Nev3r
|
6dfe236602
|
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
|
85f5cb20e6
|
Fix sector flat alignment issues in OpenGL
|
2020-07-26 21:25:11 +03:00 |
|
Hannu Hanhi
|
24b828b362
|
Use 64-bit R_PointToAngle in OpenGL culling to fix some big room issues
|
2020-07-25 21:50:24 +03:00 |
|
James R
|
e47fbe7dd9
|
Compiler error :V
|
2020-07-24 02:58:05 -07:00 |
|
James R
|
28931b90dc
|
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
|
e331c9d18e
|
Fix OpenGL polyobject texture distortion
|
2020-07-23 20:51:05 +03:00 |
|
Hannu Hanhi
|
e4d6e92f37
|
Clamp light level for shaders. Fixes #194.
|
2020-07-23 19:05:17 +03:00 |
|
Jaime Passos
|
ca060a4372
|
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into pictureformats
|
2020-07-21 22:25:00 -03:00 |
|
Jaime Passos
|
48a6652973
|
Move the sky dome code out of r_opengl.c, fix issues with shaders
|
2020-07-17 02:48:05 -03:00 |
|
James R
|
839f086216
|
A few more instances of "gr" to purge
|
2020-07-12 16:09:43 -07:00 |
|
James R
|
b9a24001d8
|
Merge remote-tracking branch 'origin/next' into remove-glide-2
|
2020-07-12 16:05:15 -07:00 |
|
Hannu Hanhi
|
3a488c243f
|
Fix translucency comparison from previous commit
|
2020-07-12 22:23:15 +03:00 |
|
Hannu Hanhi
|
9909746718
|
Fix crash by handling precip mobjs correctly in ogl sprite sorting
|
2020-07-12 21:50:00 +03:00 |
|
Nev3r
|
2cdfb8ffc6
|
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next
|
2020-07-12 14:59:38 +02:00 |
|
Hannu Hanhi
|
5fdc4578db
|
Merge remote-tracking branch 'upstream/next' into ogl-linkdraw
|
2020-07-10 21:14:57 +03:00 |
|
Nev3r
|
ad55f5f872
|
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
|
710097a0ca
|
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next
|
2020-07-10 11:47:16 +02:00 |
|
Jaime Passos
|
7911deebf8
|
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into pictureformats
|
2020-07-06 19:29:14 -03:00 |
|
Nev3r
|
42d92eab2c
|
Fix erroneous merge conflict resolution.
|
2020-07-06 11:54:55 +02:00 |
|
Nev3r
|
fd5b05cafc
|
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next
|
2020-07-06 11:13:27 +02:00 |
|
Jaime Passos
|
4f6420274f
|
Remove Software tricks
|
2020-07-06 01:26:56 -03:00 |
|
Jaime Passos
|
5c5d907251
|
gr_ -> gl_
|
2020-07-06 01:15:08 -03:00 |
|
Jaime Passos
|
3d50bef0e5
|
Rename structs, turn GrTextureFormat_t into an enum
|
2020-07-06 00:52:10 -03:00 |
|
Jaime Passos
|
ac04853f8c
|
Remove GrTexInfo
|
2020-07-06 00:35:48 -03:00 |
|
Hannu Hanhi
|
b4aa5cecc1
|
Merge remote-tracking branch 'upstream/next' into ogl-linkdraw
|
2020-07-05 13:27:51 +03:00 |
|
LJ Sonic
|
6e7446dea3
|
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
|
b29873ce1c
|
Better MF2_LINKDRAW support for OpenGL
|
2020-07-03 00:28:52 +03:00 |
|
Nev3r
|
ff8759e507
|
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
|
7317bbb692
|
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
|
2e827705b4
|
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
|
cad1f57b1e
|
FF_HORIZONTALFLIP and mobj->mirrored (sprite enhancements)
|
2020-06-19 11:11:18 -04:00 |
|
Hannu Hanhi
|
6f9b9aacf4
|
Faster OGL sprite sorting algorithm
|
2020-06-19 14:32:34 +03:00 |
|
Hannu Hanhi
|
ffaffdf3e1
|
Faster and more correct OGL transparent surface sorting
|
2020-06-18 20:27:19 +03:00 |
|
Hannu Hanhi
|
9477d372b9
|
Backwards compatibility for shaderless hardware
|
2020-06-18 17:39:34 +03:00 |
|
MascaraSnake
|
4a0206b38d
|
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
|
abe13651d0
|
OpenGL draw call batching system
|
2020-06-07 21:20:52 +03:00 |
|
Hannu Hanhi
|
da98ea242e
|
Merge remote-tracking branch 'upstream/next' into shaders-224-next-merge
|
2020-06-07 20:01:05 +03:00 |
|
SteelT
|
db32b01222
|
Merge branch 'renderstats' into 'sal-oglshaderport'
Render stats
See merge request STJr/SRB2!914
|
2020-06-07 12:29:58 -04:00 |
|
lachwright
|
a7f73bfa85
|
Move drop shadows to the ceiling for objects in reverse gravity
|
2020-05-31 01:21:26 +08:00 |
|
Louis-Antoine
|
d40a8efce2
|
I forgot to test OpenGL :slight_smile:
|
2020-05-18 20:35:30 +02:00 |
|
Louis-Antoine
|
d0abd6e86c
|
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
|
a06c4a8c98
|
Rename P_GetZAt to P_GetSlopeZAt and P_GetZAt2 to P_GetZAt
|
2020-05-18 15:23:56 +02:00 |
|
Jaime Passos
|
1a79f6246d
|
Merge remote-tracking branch 'origin/next' into pictureformats
|
2020-05-15 01:34:54 -03:00 |
|
MascaraSnake
|
1ccda0b85c
|
Merge branch 'next' into udmf-next
|
2020-05-13 10:01:12 +02:00 |
|
Monster Iestyn
|
197da95a23
|
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
|
30105621d4
|
Merge branch 'master' into next
|
2020-05-06 21:51:36 +01:00 |
|
MascaraSnake
|
6e7373a475
|
Merge branch 'next' into udmf-next
|
2020-05-04 20:32:56 +02:00 |
|
Hannu Hanhi
|
724e093ce8
|
Render stats cleanup
|
2020-05-02 23:14:08 +03:00 |
|
Hannu Hanhi
|
7e8543a408
|
More render stats for software mode, renamed and relocated some render stats variables
|
2020-05-02 23:13:53 +03:00 |
|
Hannu Hanhi
|
8dcc2fe20d
|
Move some render stats variables to better locations, add I_FinishUpdate timing
|
2020-05-02 23:13:32 +03:00 |
|
Hannu Hanhi
|
64a153fdee
|
Render stats
|
2020-05-02 23:13:08 +03:00 |
|
Monster Iestyn
|
1528f2aef8
|
Fix drop shadow and rotsprite code to use SHORT()
|
2020-05-02 17:13:16 +01:00 |
|
MascaraSnake
|
485a4e5035
|
Remove POLYOBJECTS and POLYOBJECTS_PLANES defines
|
2020-05-02 12:08:31 +02:00 |
|
Hannu Hanhi
|
be99670a39
|
More HWR_ProcessSeg sky code from master
|
2020-04-30 19:57:28 +03:00 |
|
Hannu Hanhi
|
ff8f48647b
|
HWR_ProcessSeg skywall processing from master
|
2020-04-30 19:57:15 +03:00 |
|
James R
|
fe9b933b97
|
Merge remote-tracking branch 'origin/master' into HEAD
|
2020-04-24 22:10:59 -07:00 |
|
Nev3r
|
5c605a8a39
|
Merge branch 'udmf-next' into udmf-multitag
|
2020-04-20 09:05:55 +02:00 |
|
Nev3r
|
efb81fc526
|
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next
|
2020-04-20 09:05:21 +02:00 |
|
James R
|
536fb1ef2a
|
Merge remote-tracking branch 'origin/master' into next
|
2020-04-18 17:20:33 -07:00 |
|
Nev3r
|
38e92aecfd
|
Fix Tags_Compare() typo to Tag_Compare().
|
2020-04-12 15:03:14 +02:00 |
|
Nev3r
|
64e2e7c12f
|
Use Tags_Compare wrapper in the OpenGL renderer, as well.
|
2020-04-12 13:16:33 +02:00 |
|
Nev3r
|
4128f826b7
|
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next
# Conflicts:
# src/lua_hooklib.c
|
2020-04-12 09:57:19 +02:00 |
|
James R
|
0313213c59
|
Merge branch 'hw-horizon' into 'master'
OGL horizon lines
See merge request STJr/SRB2!861
|
2020-04-09 21:24:41 -04:00 |
|
James R
|
aca39d6210
|
Merge remote-tracking branch 'origin/master' into next
|
2020-04-09 17:04:04 -07:00 |
|
James R
|
5f7bd9a947
|
Merge branch 'fix-256-brightness' into 'master'
Florida man fixes sectors with light level 256 blacking out OpenGL objects; mappers riot.
See merge request STJr/SRB2!840
|
2020-04-09 19:53:40 -04:00 |
|
James R
|
2dfe276a73
|
Merge branch 'sdlglcontext' into 'master'
Only initialise OpenGL if the user intends to load it (for real this time)
See merge request STJr/SRB2!796
|
2020-04-09 19:51:20 -04:00 |
|
MascaraSnake
|
92c74814cf
|
Standardize the behavior of FF_INVERTSIDES and FF_INVERTPLANES
|
2020-03-25 08:34:52 +01:00 |
|
fickleheart
|
719f29d27e
|
Reduce near renderdist to lessen visible texture distortion
|
2020-03-23 08:23:36 -05:00 |
|
fickleheart
|
f9027ccaeb
|
Split horizon lines for minimal distortion
|
2020-03-22 12:52:17 -05:00 |
|
fickleheart
|
14d6a01292
|
Distort far edges to viewz for a flat horizon line
|
2020-03-22 12:28:49 -05:00 |
|
fickleheart
|
deff1565dc
|
GL horizon lines
|
2020-03-22 12:13:59 -05:00 |
|
Louis-Antoine
|
6f9422d380
|
Encapsulate plane height checks
|
2020-03-22 17:28:50 +01:00 |
|
MascaraSnake
|
1580e14cbc
|
Merge branch 'next' into udmf-next
# Conflicts:
# extras/conf/Includes/SRB222_linedefs.cfg
# extras/conf/Includes/SRB222_misc.cfg
# src/p_spec.c
|
2020-03-21 20:04:31 +01:00 |
|
Louis-Antoine
|
892a8dd6e7
|
Make SRB2 flat like Earth
|
2020-03-20 18:55:29 +01:00 |
|
fickleheart
|
b9d7b3e5c5
|
Merge remote-tracking branch 'upstream/master' into shaders-222
# Conflicts:
# src/hardware/r_opengl/r_opengl.c
# src/i_video.h
# src/r_main.c
# src/r_main.h
# src/screen.c
# src/sdl/i_video.c
# src/sdl/ogl_sdl.c
# src/w_wad.c
|
2020-03-14 12:52:15 -05:00 |
|
GoldenTails
|
cdba9ba033
|
Fix spaces before someone yells at me for it
|
2020-03-07 21:48:40 -06:00 |
|
GoldenTails
|
0d92bf3dd0
|
Florida man fixes sectors with light level 256 blacking out OpenGL objects; mappers riot.
Disclaimer: I'm not actually from Florida.
|
2020-03-07 21:41:52 -06:00 |
|
Jaime Passos
|
2893803c68
|
Merge remote-tracking branch 'origin/next' into pictureformats
|
2020-02-19 02:25:36 -03:00 |
|
MascaraSnake
|
cae99654be
|
Merge branch 'next' into udmf-next
|
2020-02-18 18:39:11 +01:00 |
|
Jaime Passos
|
bef6cb532b
|
Fix what !785 tried to fix, but correctly
|
2020-02-17 21:58:32 -03:00 |
|