Commit graph

480 commits

Author SHA1 Message Date
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
Nev3r
d0340c864f Merge branch 'udmf-next' into udmf-multitag 2020-04-20 09:05:55 +02:00
Nev3r
2d15e953eb Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next 2020-04-20 09:05:21 +02:00
James R
28b1e8de1c Merge remote-tracking branch 'origin/master' into next 2020-04-18 17:20:33 -07:00
Nev3r
71d172a2af Fix Tags_Compare() typo to Tag_Compare(). 2020-04-12 15:03:14 +02:00
Nev3r
0ac224a325 Use Tags_Compare wrapper in the OpenGL renderer, as well. 2020-04-12 13:16:33 +02:00
Nev3r
860c44d953 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
d3a4647c3b 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
81a01041e8 Merge remote-tracking branch 'origin/master' into next 2020-04-09 17:04:04 -07:00
James R
b6b617cab7 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
0b91ef071f 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
58e8ec6500 Standardize the behavior of FF_INVERTSIDES and FF_INVERTPLANES 2020-03-25 08:34:52 +01:00
fickleheart
61c5005972 Reduce near renderdist to lessen visible texture distortion 2020-03-23 08:23:36 -05:00
fickleheart
09c2e4fe26 Split horizon lines for minimal distortion 2020-03-22 12:52:17 -05:00
fickleheart
6749cb89b5 Distort far edges to viewz for a flat horizon line 2020-03-22 12:28:49 -05:00
fickleheart
3bf609e819 GL horizon lines 2020-03-22 12:13:59 -05:00
Louis-Antoine
29294a53cc Encapsulate plane height checks 2020-03-22 17:28:50 +01:00
MascaraSnake
9b76d3af6f 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
4e7605f0e2 Make SRB2 flat like Earth 2020-03-20 18:55:29 +01:00
fickleheart
33a9e5aa83 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
69a9f44259 Fix spaces before someone yells at me for it 2020-03-07 21:48:40 -06:00
GoldenTails
e0f6559595 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
b0ce2e088f Merge remote-tracking branch 'origin/next' into pictureformats 2020-02-19 02:25:36 -03:00
MascaraSnake
c2311dca45 Merge branch 'next' into udmf-next 2020-02-18 18:39:11 +01:00
Jaime Passos
43abd53c55 Fix what !785 tried to fix, but correctly 2020-02-17 21:58:32 -03:00
Jaime Passos
96ab7afaca Change the default setting of cv_grshearing to Off 2020-02-17 12:30:02 -03:00
James R
d6251a763b Merge branch 'viewroll' into 'next'
Rolling

See merge request STJr/SRB2!690
2020-02-17 00:10:57 -05:00
fickleheart
51ef6b3684 Merge remote-tracking branch 'upstream/master' into viewroll 2020-02-16 21:32:57 -06:00
MascaraSnake
4c4596a45f Clean up the mess that is extracolormap_t::fog 2020-02-16 20:19:24 +01:00
MascaraSnake
f4a7a5db11 Some fixes for the linedef alpha field 2020-02-10 20:26:29 +01:00
Jaime Passos
622bf09908 i'm not paying too much attention, am i. 2020-02-08 18:08:56 -03:00
Jaime Passos
fa5957f785 add "third person only" option to gr_shearing. 2020-02-08 17:42:26 -03:00
Jaime Passos
402b63ed77 Merge remote-tracking branch 'tehrealsalt/oglshaderport' into sal-oglshaderport 2020-02-03 01:17:26 -03:00
Sally Cochenour
6b6c4ec517 Drop shadows closer to software 2020-02-02 07:28:31 -05:00
Jaime Passos
e56273f909 Merge remote-tracking branch 'origin/next' into sal-oglshaderport 2020-02-01 23:02:15 -03:00
James R
ff2ec925ee Merge remote-tracking branch 'origin/master' into next 2020-01-30 23:54:56 -08:00
Jaime Passos
933e690da3 i want to die 2020-01-28 00:41:41 -03:00
Jaime Passos
6f60fd2a64 Fix shader reading yet again 2020-01-27 02:15:34 -03:00
fickleheart
62c75c0c81 Merge remote-tracking branch 'upstream/next' into viewroll 2020-01-26 18:01:58 -06:00
MascaraSnake
e22661e150 Implement linedef alpha field (replaces specials 900-908) 2020-01-26 12:24:52 +01:00
Jaime Passos
3d97a0b73d Fix custom shader loading 2020-01-24 16:57:21 -03:00
Jaime Passos
6f2635d4c1 bye 2020-01-23 23:09:53 -03:00
Jaime Passos
33152ee6fa Restore some model lighting code that went gone in the shaders code 2020-01-23 22:02:18 -03:00
Jaime Passos
5d3d031db3 Fix the gl_leveltime problem, I guess.
This is probably superfluous.
2020-01-23 21:25:54 -03:00
Jaime Passos
2d4945d558 Update copyright text 2020-01-23 20:12:15 -03:00
Jaime Passos
4a8340cd4a Fix view aiming / shearing 2020-01-23 19:44:46 -03:00
Jaime Passos
5bda98764a towards 2020-01-23 19:17:05 -03:00
Jaime Passos
41840f6375 Merge remote-tracking branch 'origin/next' into pictureformats 2020-01-20 16:53:41 -03:00
James R
ef459ba647 Don't draw Tails' tails in first person (MF2_LINKDRAW) 2020-01-17 20:56:32 -08:00