lifning/SRB2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
9962 commits 1 branch 29 tags 122 MiB
Commit graph

143 commits

Author SHA1 Message Date
MascaraSnake 485a4e5035 Remove POLYOBJECTS and POLYOBJECTS_PLANES defines 2020-05-02 12:08:31 +02:00
Monster Iestyn a71fe6445a Merge branch 'master' into next 2020-04-23 18:49:53 +01:00
toaster ce2a1aa3b2 Minor optimisations surrounding R_DrawFlippedMaskedColumn. 
* Replace the texheight parameter provided directly to it with a previously existing (now renamed) global used for the same purpose, so that it can be used as an interchangeable function pointer with R_DrawMaskedColumn.
* Using the above, optimise R_DrawVisSprite to call a function pointer in a tighter loop rather than check SC_VFLIP each time around.
* SHORT macro can involve repeated operations; calculate once and put in memory for both RANGECHECK and papersprite.
* Remove irrelevant range check (already covered by existing range check immediately above) from R_DrawFlippedMaskedColumn and R_DrawMaskedColumn.
* "Warning: avoiding a crash in %s %d" is a terrible error message, and it chips away at the tightness of the loop just for something most people will never see printed. Replace with a PARANOIA I_Error in case someone actively wants to go hunting for its cause.
 2020-03-26 16:09:19 +00:00
MascaraSnake 92c74814cf Standardize the behavior of FF_INVERTSIDES and FF_INVERTPLANES 2020-03-25 08:34:52 +01:00
Louis-Antoine 892a8dd6e7 Make SRB2 flat like Earth 2020-03-20 18:55:29 +01:00
Steel Titanium 76f26cda24 Merge branch 'master' into next 2020-02-21 21:01:29 -05:00
James R 7060083db5 Update copyright year to 2020 2020-02-19 14:08:45 -08:00
James R d0b9027d0a Merge branch 'viewroll' into 'next' 
Rolling

See merge request STJr/SRB2!690
 2020-02-17 00:10:57 -05:00
James R f4c2a4551b How many bruh moments can we have? 2020-02-16 20:45:09 -08:00
MascaraSnake 512c6f24a9 Clean up the mess that is extracolormap_t::fog 2020-02-16 20:19:24 +01:00
fickleheart 8868fc4d8a Fix lighting discrepancies between different FOVs 2020-01-18 00:16:18 -06:00
MascaraSnake 759b1c82e2 Add missing glseg checks (and remove a superfluous one) 2020-01-06 14:40:59 +01:00
James R fc8c0f8a9a Merge remote-tracking branch 'origin/master' into next 2019-12-30 13:16:53 -08:00
Nev3r 389b9e35c4 Add XNOD, XGLN and XGL3 BSP formats recognition and support. 2019-12-29 14:17:51 +01:00
Jaime Passos cc54163210 Merge remote-tracking branch 'origin/master' into renderswitch 2019-12-17 16:12:44 -03:00
Jaime Passos fa58c1fb26 stuff 2019-12-13 12:26:47 -03:00
Jaime Passos 9248f12d55 Merge remote-tracking branch 'origin/master' into renderswitch 2019-12-10 23:01:10 -03:00
Steel Titanium d415cd5c6d
Update copyright date on source files 2019-12-06 13:49:42 -05:00
toaster 95ed442d55 Prevent Knuckles latching onto horizon special linedefs. 
Also, update all references to the horizon special to use a #defined constant instead of a magic number.
 2019-11-23 14:20:41 +00:00
Jaime Passos 2863ede7bf initial stuff 2019-09-08 18:27:35 -03:00
Nev3r f536ab3467 Fixed crash regarding opening reallocating. A thousand thanks go for MonsterIestyn for figuring this out. 
I carelessly changed the line's drawsegs to curdrawsegs without researching what that piece of code did.
 2019-06-09 20:04:07 +02:00
Nev3r d2692ddd24 viewx/viewy also need to be stored/restored. 2019-06-06 13:31:48 +02:00
Nev3r 2aabf6ffd5 Moving away more portal-related global vars to r_portal. 2019-06-03 13:33:12 +02:00
Monster Iestyn 1b2afea091 Merge branch 'public_next' 2019-05-03 16:42:42 +01:00
Monster Iestyn a5dfbe7eff add parentheses around these conditions to fix sloped lights cutting out lights on FOF walls for apparently no reason 
not making a merge request because this is so laughably stupidly simple
 2019-05-03 16:38:59 +01:00
Monster Iestyn 7ae6d5ee8c Merge branch 'public_next' 
# Conflicts:
#	src/doomstat.h
#	src/g_game.c
 2019-03-28 14:19:02 +00:00
Monster Iestyn 147221cf6e R_RenderThickSideRange: clamp lights that fail overflow test, rather than skipping them. 2019-03-25 18:54:47 +00:00
Nev3r 83f953edb8 Make FOFs extend to infinity when in contact with a horizon line. 
Make FOFs extend to infinity when in contact with a horizon line.

Signed-off-by: Nev3r <apophycens@gmail.com>
 2019-03-07 19:01:02 +01:00
Monster Iestyn 7a0d8b408e Merge branch 'public_next' 
# Conflicts:
#	src/d_main.c
#	src/dehacked.c
#	src/m_menu.c
#	src/m_menu.h
 2019-02-27 22:36:01 +00:00
fickleheart 7e026824a4 Fix rendering gaps on polys with upper/lower textures 2019-01-12 20:15:58 -05:00
mazmazz 075f28b7c8 WIP 20190101 merge 
d_netcmd.c
filesrch.c
m_menu.c
p_setup.c
p_spec.c
r_data.c
r_main.c
r_things.c
w_wad.c
w_wad.h
 2019-01-02 01:09:15 -05:00
mazmazz 842bcfc8a0 Merge remote-tracking branch 'public-gl/master' into 2122-version 2018-12-25 00:19:45 -05:00
mazmazz b7edc7f870 Revert "Merge branch 'side-discolor-fix' into 'master'" 
This reverts commit e721a3d882, reversing
changes made to 4656a0d02c.
 2018-12-24 20:58:26 -05:00
Alam Ed Arias 4651eddc36 Merge branch 'master' into next 2018-12-24 20:15:45 -05:00
Jimita 4c6334f459 cleanup 2018-12-24 17:21:33 -05:00
Jimita 5b285a60a2
Update r_segs.c 2018-12-20 16:15:19 -03:00
Jimita ffd5061531
Merge branch 'next' into sw_largeroomfix 2018-12-20 16:56:05 -02:00
MPC 9c2197db17 Software plane fixes 2018-12-14 14:08:25 -03:00
MPC 348ed1e43f Large room fix 2018-12-09 19:34:17 -03:00
Monster Iestyn a71ca1d259 Merge branch 'fof-slope-skew-backport' into 'master' 
FOF wall slope skewing backport

See merge request STJr/SRB2!341
 2018-11-26 08:54:29 -05:00
mazmazz ea7162a76a Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
Monster Iestyn 0a0336a674 Merge branch 'master' into fof-slope-skew-backport 
# Conflicts:
#	src/r_segs.c
 2018-11-23 22:40:28 +00:00
Monster Iestyn 224c0fccdb Merge branch 'public_next' 
# Conflicts:
#	src/Makefile.cfg
#	src/d_clisrv.c
#	src/p_setup.c
#	src/r_segs.c
#	src/r_things.c
 2018-11-20 14:33:10 +00:00
Monster Iestyn 948466658f Merge branch 'fof-wall-rendering-fixes-and-cleanup' into 'master' 
FOF wall rendering fixes and cleanup

See merge request STJr/SRB2!317
 2018-11-20 08:54:09 -05:00
Monster Iestyn 2d1f927a17 Fix the nonsense going on here regarding dc_colormap, this makes FOF walls appear strange if they were for a fog block with colormap adjacent to a normal sector with a colormap and no FOFs. 
...that was a mouthful
 2018-11-19 22:12:26 +00:00
Monster Iestyn 80cbad61c0 Do lightlist height stepping *after* the heights are used by the FOF rendering code, not before (yes, I caught that they remove a heightstep beforehand for FOFs, but that wasn't done for midtextures it seems?) 
Additionally add some macros for repeated slope end assignments and overflow tests
 2018-10-13 18:57:40 +01:00
Monster Iestyn bedfed2f00 Move shared code here instead of duplicating it for both dc_numlights and non-dc_numlights rendering code 
Also added a few comments, and include the out of range check in the "shared code" above
 2018-10-13 15:37:11 +01:00
Monster Iestyn b9b0a8110c Add R_Draw2sMultiPatchTranslucentColumn_8, for columns of multi-patch textures used as midtextures on two-sided linedefs with both transparency AND translucency 
...that was a mouthful
 2018-10-11 17:05:13 +01:00
mazmazz 7d36aae7c4 Make lightlists react to control sector colormap changes (double pointer) 2018-09-12 16:06:56 -04:00
Nev3r f19b7bfacf Merge branch 'horizon-line-hom-fix' into 'master' 
Horizon line HOM fix

See merge request STJr/SRB2Internal!152
 2018-08-12 03:48:20 -04:00