Commit graph

218 commits

Author SHA1 Message Date
Nev3r
dbf2b9c0f0 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-multitag
# Conflicts:
#	src/p_floor.c
#	src/p_mobj.c
#	src/p_spec.c
#	src/r_segs.c
2020-04-25 10:47:45 +02:00
MascaraSnake
d2e21afaf1 Merge branch 'next' into udmf-next
# Conflicts:
#	src/p_mobj.c
#	src/r_segs.c
2020-04-24 21:15:53 +02:00
Monster Iestyn
e78a2fa297 Merge branch 'master' into next 2020-04-23 18:49:53 +01:00
Nev3r
71d172a2af Fix Tags_Compare() typo to Tag_Compare(). 2020-04-12 15:03:14 +02:00
Nev3r
d59016a18e Use Tags_Compare wrapper on software renderer to compare sector tags. 2020-04-12 13:14:39 +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
toaster
c74dde0f0f 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
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
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
Nev3r
63fb8f846b Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next 2020-03-11 09:31:31 +01:00
Steel Titanium
fc042e90f0 Merge branch 'master' into next 2020-02-21 21:01:29 -05:00
James R
2274129f57 Update copyright year to 2020 2020-02-19 14:08:45 -08:00
MascaraSnake
c2311dca45 Merge branch 'next' into udmf-next 2020-02-18 18:39:11 +01:00
James R
d6251a763b Merge branch 'viewroll' into 'next'
Rolling

See merge request STJr/SRB2!690
2020-02-17 00:10:57 -05:00
James R
b8e143d253 How many bruh moments can we have? 2020-02-16 20:45:09 -08:00
MascaraSnake
4c4596a45f Clean up the mess that is extracolormap_t::fog 2020-02-16 20:19:24 +01:00
MascaraSnake
9769748f99 R_GetLinedefTransTable: Calculate the transtable arithmetically instead of doing an if-else cascade 2020-02-11 19:18:31 +01:00
MascaraSnake
f4a7a5db11 Some fixes for the linedef alpha field 2020-02-10 20:26:29 +01:00
MascaraSnake
e22661e150 Implement linedef alpha field (replaces specials 900-908) 2020-01-26 12:24:52 +01:00
fickleheart
54a844a59e Fix lighting discrepancies between different FOVs 2020-01-18 00:16:18 -06:00
MascaraSnake
33c35230c2 Add missing glseg checks (and remove a superfluous one) 2020-01-06 14:40:59 +01:00
James R
67ca512120 Merge remote-tracking branch 'origin/master' into next 2019-12-30 13:16:53 -08:00
Nev3r
d689e06c6a Add XNOD, XGLN and XGL3 BSP formats recognition and support. 2019-12-29 14:17:51 +01:00
Jaime Passos
1002c47407 Merge remote-tracking branch 'origin/master' into renderswitch 2019-12-17 16:12:44 -03:00
Jaime Passos
9a5876f9d3 stuff 2019-12-13 12:26:47 -03:00
Jaime Passos
6976b9bf01 Merge remote-tracking branch 'origin/master' into renderswitch 2019-12-10 23:01:10 -03:00
Steel Titanium
a5cdb0a4b3 Update copyright date on source files 2019-12-06 13:49:42 -05:00
toaster
dbeec7dacc 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
398b320aec initial stuff 2019-09-08 18:27:35 -03:00
TehRealSalt
a6ef3c12b0 Seperate MF2_DONTDRAW and MF2_SHADOW into it's own varied set of flags -- drawflags.
- Split MF2_DONTDRAW into MFD_DONTDRAWP[1-4], also replaces MFE_DRAWONLYFORP[1-4].
- Split MF2_SHADOW into MFD_FULLBRIGHT and MFD_TRANS80. I also added an entire spectrum of options for transparency & brightness overrides, since I've found myself wishing for stuff like that before.
- Tethering was updated for it's client-sided drawing to apply to splitscreens too.
- Removed cv_transparency.

The transparency overrides don't seem to work yet (obvious on things using MFD_SHADOW), just running out of time to look into it so I'm pushing what I have.
2019-07-17 23:55:39 -04:00
Nev3r
d62268ffd0 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
da09a07e6e viewx/viewy also need to be stored/restored. 2019-06-06 13:31:48 +02:00
Nev3r
84a52a0f80 Moving away more portal-related global vars to r_portal. 2019-06-03 13:33:12 +02:00
wolfy852
2222738e1c Merge remote-tracking branch 'remotes/srb2pub/public_flatsprite' into next
# Conflicts:
#	src/d_netcmd.c
#	src/doomdef.h
#	src/doomstat.h
#	src/f_finale.c
#	src/g_game.c
#	src/hu_stuff.c
#	src/m_menu.c
#	src/p_spec.c
#	src/p_user.c
#	src/r_main.c
#	src/r_things.c
#	src/s_sound.c
#	src/v_video.c
#	src/y_inter.c
2019-05-06 22:40:12 -05:00
Monster Iestyn
055aeddb6f Merge branch 'public_next' 2019-05-03 16:42:42 +01:00
Monster Iestyn
5cd8ff01ba 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
257f31c1ba Merge branch 'public_next'
# Conflicts:
#	src/doomstat.h
#	src/g_game.c
2019-03-28 14:19:02 +00:00
Alam Arias
ef10d08db3 Merge commit 'upstream/master~1' 2019-03-26 09:48:13 -04:00
Monster Iestyn
fa3349a117 R_RenderThickSideRange: clamp lights that fail overflow test, rather than skipping them. 2019-03-25 18:54:47 +00:00
Nev3r
582aeee5e4 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
974e3aa4f2 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
81c73032e4 Fix rendering gaps on polys with upper/lower textures 2019-01-12 20:15:58 -05:00
fickleheart
3249851c3e Fix rendering gaps on polys with upper/lower textures 2019-01-11 21:21:56 -06:00
SeventhSentinel
1d58c6b8c2 merge srb2 next 2019-01-05 15:59:23 -05:00
mazmazz
81352aece1 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
818438d5d0 Merge remote-tracking branch 'public-gl/master' into 2122-version 2018-12-25 00:19:45 -05:00
mazmazz
a7ac8179f5 Revert "Merge branch 'side-discolor-fix' into 'master'"
This reverts commit f81144d7b1, reversing
changes made to c24d860eea.
2018-12-24 20:58:26 -05:00