Hannu Hanhi
6cdb8c3320
Change some unsigned ints to UINT32
2020-06-07 21:32:52 +03: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
lachwright
3b4df4657a
Move drop shadows to the ceiling for objects in reverse gravity
2020-05-31 01:21:26 +08:00
SwitchKaze
58cac1fd73
Make colors UINT16, increase color freeslots to 1024
2020-05-23 19:35:36 -05:00
SwitchKaze
afe56667b8
Update to 2.2.4
2020-05-22 16:47:51 -05: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
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
lachwright
d3208568ee
Merge remote-tracking branch 'origin/next' into gfz3laser-mkii
2020-05-07 22:34:44 +08:00
Monster Iestyn
c06fbf4fe7
Merge branch 'master' into next
2020-05-06 21:51:36 +01:00
lachwright
645c324d51
Update new GFZ3 laser
2020-05-06 09:03:03 +08: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
Hannu Hanhi
9daa78554d
Optimization: also don't reset shader on models
2020-04-25 16:32:44 +03:00
Hannu Hanhi
cb62882e5a
Optimization: only call pglUseProgram if shader actually needs changing
2020-04-25 16:32:32 +03:00
Hannu Hanhi
44c420a671
Optimization: Don't reset shader program at end of DrawPolygon, instead reset it in UnSetShader
2020-04-25 16:32:21 +03:00
James R
eb0ba37dce
Merge remote-tracking branch 'origin/master' into HEAD
2020-04-24 22:10:59 -07:00
James R
28b1e8de1c
Merge remote-tracking branch 'origin/master' into next
2020-04-18 17:20:33 -07:00
James R
8335a44864
Merge branch 'md2-rollangle' into 'master'
...
Fix MD2 rollangle in reverse gravity
See merge request STJr/SRB2!818
2020-04-09 21:25:02 -04: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
Louis-Antoine
4e7605f0e2
Make SRB2 flat like Earth
2020-03-20 18:55:29 +01:00
Jaime Passos
876d4cd02b
Fix OpenGL
2020-03-17 15:23:13 -03:00
Monster Iestyn
c0b85396e0
Merge branch 'skins-refactor' into 'master'
...
Skins refactor
See merge request STJr/SRB2!843
2020-03-15 15:31:49 -04:00
SteelT
f9912eaad5
Merge branch 'hwrflipcolchromakey' into 'master'
...
Fix HWR_DrawFlippedColumnInCache ignoring chroma key TF
See merge request STJr/SRB2!826
2020-03-14 22:13:19 -04:00
fickleheart
6b4a054973
Use po2 patches to fix mipmaps
2020-03-14 15:52:25 -05: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
Monster Iestyn
f186def0bf
Include r_skins.h instead of r_things.h in many files where all they wanted from it was skins stuff
...
(oddly enough, this actually revealed some secret file dependencies previously included via r_things.h! I also needed to include d_player.h in r_skins.h itself it seems)
2020-03-09 13:54:56 +00: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
86dd35c32b
Fix NOTEXTURE_NUM
2020-02-28 18:57:34 -03:00
Jaime Passos
623974bf88
Same deal for screen textures
2020-02-28 18:57:15 -03:00
Jaime Passos
0b63c2a3cc
Stop using NextTexAvail
2020-02-28 18:56:41 -03:00