Commit graph

160 commits

Author SHA1 Message Date
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
MPC
9372baf427 Software plane fixes 2018-12-14 14:08:25 -03:00
TehRealSalt
4507ee18fd Merge remote-tracking branch 'srb2public/next' into merge-next 2018-11-29 08:49:50 -05:00
Monster Iestyn
358e84f56d Merge branch 'mpc-software-yslope-fix' into 'master'
Fix glitches with flats visible when looking up/down in 1st person (software renderer fix)

See merge request STJr/SRB2!282
2018-11-25 11:51:54 -05:00
mazmazz
c91b2b4456 Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
toaster
880037c2e3 Revamp flat alignment to be consistent across all renderer functions except for the software slope renderer, which me and fickle tried our best at but couldn't get to work. (This is a backport of 2.2 code that slightly postdates the improved flat alignment Kart's had for a while.)
This fixes #11.
2018-09-27 18:11:43 +01:00
toaster
9ab42d91cb Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into encore
# Conflicts:
#	src/info.c
#	src/m_menu.c
#	src/y_inter.c
2018-09-21 20:54:38 +01:00
toaster
b87feaeceb Animated sky backport 2018-09-17 11:21:25 +01:00
Monster Iestyn
2d7263c7f1 Merge branch 'public_next'
# Conflicts:
#	src/r_things.c
#	src/v_video.c
2018-08-28 19:31:08 +01:00
toaster
44c33561b5 Merge branch 'sonicitems' into encore 2018-08-26 12:45:02 +01:00
toaster
6365e6b2f9 Undef SHITPLANESPARENCY downstream from vanilla, as promised. 2018-08-26 12:43:31 +01:00
toaster
41b7625fa7 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2.git into sonicitems
# Conflicts:
#	src/g_game.c
#	src/v_video.c
2018-08-26 12:42:55 +01:00
toaster
60177bba79 Introduce a temporary measure to enable the old stuff, minus one of the most obviously terrible bugbears of yesteryear. Let it be known that any downstream poirt will almost certainly toggle this ASAP. 2018-08-25 21:17:34 +01:00
toaster
6bd034e3dc Continuing my recent streak of making random lighting/colormap-related fixes to long-standing bugs:
* Fix that thing where ALL transparent FOF planes were continuously fullbright unless encased in a fog which disables sprite fullbrightness, which was long-hated by many people in the community!
	* For backwards compatibility, setting flag 1 in that fog field (which is probably the most common "in-the-wild" usage of this feature) will continue to make objects un-fullbright.
	* For situations where you desperately want the behaviour to be enabled, you can apply fog flag 2.
* Change the fadestart and fadeend range in which colormaps are generated.
	* The problem HERE was that the darkest light level reached by generated colormaps was actually slightly brighter than the darkest level reached by normal colormaps.
	* The typo I fixed does have SOME basis in fact - standard colormap lumps are 34 (33 in 0-indexing) long rather than 32 (31), but whoever wrote this didn't realise that the code for generating them didn't do it DooM style, just bright-to-dark with no extras on the end...
2018-08-25 16:46:45 +01:00
Monster Iestyn
04b4e1d93b Fix glitches with flats visible when looking up/down in 1st person 2018-08-18 23:31:20 +01:00
toaster
d582a9dd97 Encore mode - a fresh take on mirror mode!
* Palette remaps.
* Branding.

TODO:
* Doesn't work in GL. (Mostly.) I have SOME ideas on how to tackle this, but...
* Transmaps are broken in Encore for some reason.
* I tried to make in-level colormaps shimmy over, but it didn't quite work, so I commented it out and only semi-fixed it.
2018-07-23 23:50:41 +01:00
TehRealSalt
1399c64143 Internal sky improvement ports
Horizon lines, barrel sky distortion
2018-07-08 15:44:01 -04:00
Monster Iestyn
2692d6f9dc optimised R_ExpandPlane too 2018-02-07 18:11:32 +00:00
Monster Iestyn
aabf2b096f Fix skies in software being displayed backwards
(I'll get round to OpenGL later)
2018-01-27 19:29:41 +00:00
Monster Iestyn
2a75523be9 Move sky plane-drawing code from R_DrawPlanes to a new function called by R_DrawSinglePlane
This potentially allows FOFs and polyobjects to display sky flats on them properly, unless skyboxes are involved in which case they'd fail either way

I also updated or added comments to some places of the sky drawing code and related where useful
2018-01-27 19:18:17 +00:00
TehRealSalt
349b27e0de Change splitscreen into UINT8, fix HUD slightly more 2017-12-18 20:59:04 -05:00
TehRealSalt
80f62a057d SUCCESS 2017-12-17 22:27:26 -05:00
toasterbabe
1d11a14f64 Getting polyobject flats to the equivalent functionality BEFORE I changed up how floor offsets worked. (Doesn't touch OGL, since they work perfectly there.) 2017-08-08 15:32:12 +01:00
toasterbabe
48ed7835d7 Add a helpful comment in order to make people who look at this in future suffer less. 2017-04-10 11:41:26 +01:00
toasterbabe
e333dd62f0 I did it!!!!!!!!!!!!!!!!!!!!!! 2017-04-10 11:34:56 +01:00
toasterbabe
8ee8bd532b Got it rendering slopes far away from the origin properly at the expense of having weird offsets near it. Still experimenting, but closer than ever before. 2017-04-10 10:51:52 +01:00
toasterbabe
54e0a0c17d Reeeeeeeeeeeeeed fix ur slops
Recreated my previous code using floats in case the issue was overflowing that could be mitigated using floating point precision - but still doesn't work. Pulling my hair out.
2017-04-09 15:22:42 +01:00
toasterbabe
ab34bd231b No need for oldxoffs. 2017-04-01 16:25:20 +01:00
toasterbabe
0ff036c2e2 Some progress!
http://i.imgur.com/yVPJQpp.png

Previously, both were visual garbage. So it's gettin' there.
2017-04-01 16:20:20 +01:00
toasterbabe
d5ba29eb9b Get plane scrolling effects working the same on and off slopes in both renderers again. 2017-03-31 16:45:47 +01:00
toasterbabe
79ec8fbf29 Minor refactor. 2017-03-31 16:29:50 +01:00
toasterbabe
b924a7d902 Interesting consideration: flat angle wasn't used to determine seperate visplanes. This is obviously incorrect behaviour. Enabling this restriction makes flat alignment on slopes ALMOST work identically to normal, but not quite.
Also, made the fudge a const, since it may as well be one.
2017-03-30 23:56:14 +01:00
toasterbabe
d62a628346 Consistency between software off-slope and GL on+off-slope flat alignment! (Software slopes are now MORE broken with respect to this, but that comes later.) 2017-03-30 22:48:13 +01:00
Monster Iestyn
12ae6bb22a Merge branch 'public_next'
# Conflicts:
#	src/d_clisrv.c
#	src/r_things.c
2017-01-07 15:03:59 +00:00
Monster Iestyn
b66925e467 R_FindPlane now has a polyobj argument, R_DrawPlanes now skips polyobj planes, like it does with FOF planes 2016-10-09 21:48:25 +01:00
Monster Iestyn
f3efebe889 Merge branch 'vertical-sky-distort2' into 'master'
Proper barrel sky distortion

Skies now use proper barrel distortion in both axes, rather than just the x-axis (i.e. just horizontally) as in all previous SRB2 versions. Credit goes to Nev3r for the original change and idea.

Was going to make an option for a non-barrel distorted sky, assuming barrel distortion is the default, but I just can't quite get it to work in a way that is pleasing to the eyes. So I've not bothered with it here for now, unless someone objects to barrel distorted skies for any reason?

See merge request !35
2016-10-07 17:30:15 -04:00
Monster Iestyn
f465de8f8c Nev3r's vertical sky distortion 2016-08-01 21:07:01 +01:00
Monster Iestyn
fe5b8c58af Add basic support for animated sky textures 2016-07-31 20:51:39 +01:00
Alam Ed Arias
57091261d9 MSVC: fixed up MSVC project 2016-05-21 23:53:04 -04:00
Inuyasha
f07585191b copyright dates/statements updated and such
(no actual SLOC changes)
2016-05-17 17:42:11 -07:00
Monster Iestyn
48e3b5e37d Corrected botch-up with plane viewangles, slope planes probably broke because of the last commit 2016-04-05 10:43:56 +01:00
Monster Iestyn
44fe6e0533 Fix sky rendering when visportals are on-screen.
They now render the same way they would if you were actually at the other side of each portal. Why didn't they do this before?
2016-04-04 21:46:51 +01:00
Monster Iestyn
3c5a8b806d Fix slope planes rendering at wrong heights when visportals are visible on-screen 2016-04-04 20:49:01 +01:00
Monster Iestyn
1e131d2786 Partial undo of what I did last commit to make Inu happy again.
Note: polyobj_t's "translucency" is apparently a SIGNED integer, so in theory it's possible to get polyobj flats to use the "spanfunc = splatfunc" line using negative values. If this is not meant to happen, this should probably be fixed asap

Conflicts:
	src/f_wipe.c
2016-01-14 16:40:55 +00:00
Monster Iestyn
734419d549 FF_TRANSSHIFT is meant for transmaps linked to states, not anything else!
I'm surprised how the source code flew in the face of this fact for so long and just used it everywhere, that's just silly.

Conflicts:
	src/f_wipe.c
2016-01-14 16:39:31 +00:00
Monster Iestyn
8cad9a6dc8 We can compile the slopes code now, yay! My brain hurts.
Compiling errors fixed in this commit:
* Various cases of mixed declaration and statement code
* Implicit declaration of slope functions (read: you forgot to put "include "p_slopes.h" in MORE than a few places)
* an odd case of a bad fixed_t to float typecase, cause by using P_GetZAt directly inside FIXED_TO_FLOAT
* a few minor cases of bad unsigned-signed comparisons
* no prototypes for some of the new slope functions. For goodness sake Red, this is basic stuff!
2016-01-03 10:30:36 -06:00
RedEnchilada
6026fa42eb Add masked FOF slopes (+other rendering tweaks) 2015-08-03 14:47:05 -05:00
RedEnchilada
e0d97e4b1a Slope planes should now not turn into static in 99% of cases 2015-05-23 16:27:15 -05:00
RedEnchilada
109d379980 Fix conveyor slopes eventually turning to static 2015-05-23 15:44:53 -05:00