Commit graph

688 commits

Author SHA1 Message Date
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
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
Sally Cochenour
f2aa2bb541 'sal-lighting' code ports from v2 2020-04-25 20:56:50 -04:00
James R
eb0ba37dce Merge remote-tracking branch 'origin/master' into HEAD 2020-04-24 22:10:59 -07:00
Wolfy
9305cf7129 Remove cv_grskydome
This is how GL should've been handling skies all along, no point having an option
2020-04-24 23:48:03 -05:00
Wolfy
98183fef6f Merge remote-tracking branch 'remotes/bird/isolatedbatching' into awful-mix
# Conflicts:
#	src/hardware/hw_main.c
#	src/hardware/r_opengl/r_opengl.c
2020-04-24 18:10:25 -05:00
Hannu Hanhi
e4bbe42eec Fix lighting breaking if trying to use unavailable shaders 2020-04-22 23:50:14 +03:00
Hannu Hanhi
74b846a6e3 Sky dome from SRB2 2020-04-22 00:18:58 +03:00
Hannu Hanhi
b388239410 Remove sometimes harmful NetUpdate call from HWR_RenderFrame 2020-04-21 23:32:31 +03:00
Hannu Hanhi
1345f50c3d Fix wrong behaviour and lack of animation in ogl sky background 2020-04-21 23:24:32 +03:00
Hannu Hanhi
960014d2b8 Fix race results screen showing wrong image on maps with skyboxes 2020-04-21 23:23:03 +03:00
Hannu Hanhi
e569129b55 Newer color tinting shaders ported from SRB2 shader branch 2020-04-21 23:15:44 +03:00
Hannu Hanhi
761bca88fc Make OpenGL texture filter config save 2020-04-21 22:38:46 +03:00
Hannu Hanhi
f783e42556 Faster sprite sorting algorithm 2020-04-21 22:08:52 +03: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
Hannu Hanhi
4dfe60ad46 Fixed and faster transparency sorting for OGL. For easy comparison, check Ethereal Crystal in Abstraction Pack 2020-04-19 18:42:03 +03:00
Hannu Hanhi
c2407368f6 Fix skywalls in ogl. Similar to 6a53837d in master. 2020-04-19 18:19:16 +03:00
James R
28b1e8de1c Merge remote-tracking branch 'origin/master' into next 2020-04-18 17:20:33 -07:00
Steel Titanium
71f21dd81b Fix compile errors 2020-04-13 23:07:38 -04:00
Nev3r
71d172a2af Fix Tags_Compare() typo to Tag_Compare(). 2020-04-12 15:03:14 +02:00
Wolfy
bf3b00f43a Fix self-comparison in hw_main.c 2020-04-12 06:47:12 -05: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
Wolfy
5e4ec61d82 Merge remote-tracking branch 'remotes/bird/isolatedbatching' into awful-mix
# Conflicts:
#	src/hardware/hw_cache.c
#	src/hardware/hw_draw.c
#	src/hardware/hw_glob.h
#	src/hardware/hw_main.c
#	src/r_bsp.h
#	src/r_data.c
2020-04-11 23:47:25 -05:00
Hannu Hanhi
6bf90fc441 Batching! 2020-04-12 03:09:07 +03: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
James R
61be09e6bf Merge remote-tracking branch 'origin/master' into gifs-port 2020-03-28 21:00:39 -07:00
Sally Cochenour
505b0176c0 Horizon line apply to FOFs backport 2020-03-25 22:30:52 -04:00
MascaraSnake
58e8ec6500 Standardize the behavior of FF_INVERTSIDES and FF_INVERTPLANES 2020-03-25 08:34:52 +01:00