Commit graph

627 commits

Author SHA1 Message Date
toaster
6bcad784a9 PITY IN PINK!
* Smoothen Pity Shield animation to go with sphere's updates to Nev3r's sprites.
* Added LHRT object, designed to be summoned with CA2_MELEE.
    * Gives a pink Pity Shield (SH_PINK) on same-team player contact.
    * Deals damage to non-player enemies.
    * Harmlessly fades into nothing when touching an enemy player, players with SH_PINK already, and players capable of applying SH_PINK to others (through non-Lua methods).
* Basically, you-know-who is the Healer of the party whenever they're around. Fun consequences for the Co-op and CTF metas.
2019-06-19 23:20:24 +01:00
toaster
b745b4fe1b With permission from Kart Krew (Sal and Sryder specifically - they don't know WHY vanilla's using it):
* Port across the additional colour translation maps, including mobj-level support for "colorized" objects.
* Make Fangboss and both Metal Sonic objects greyscale if, on spawn, there is a player in the game who is not a spectator whose skin is that character.
* Allow bosses with MF_GRENADEBOUNCE to opt out of the MF2_FRET colour-flashing tomfoolery, and give this flag to Fang.
2019-06-18 17:55:57 +01:00
toaster
229cdf0e84 Improve rain/weather.
* Like Kart, remove cv_precipdensity.
* Like Kart, replace "Infinite" draw distance value with "None".
* Better thinker with more return optimisation.
* Better placement of thinking in rendering, to avoid ceiling-mounted sprite glitches.
2019-06-18 14:22:10 +01:00
Nev3r
52618bf895 Fix 1 extra column rendering on portal-clipped vissprites. 2019-06-10 17:59:12 +02:00
Nev3r
da09a07e6e viewx/viewy also need to be stored/restored. 2019-06-06 13:31:48 +02:00
Nev3r
819169f378 Vissprite clipping improvements.
Vissprites are now only clipped against their respective portal's geometry obtained from their BSP run.
Additionally, if a portal is provided, they're clipped to the portal's clip boundaries.
The work on this branch should conclude after a pair of remaining glitches are fixed.
2019-06-05 18:07:08 +02:00
Nev3r
906b366e1b Masked elements are now fully grouped individually for each portal/view; fixed viewz-related glitches,.
The drawnodes are now fully grouped in separate lists, and then sorted individually. This fixes sorting problems caused by portals belonging to differently perceived scales (skyboxes for example).

Drawsegs and vissprite/drawnode sorting require the viewz, so the viewz is stored for each portal/view, and then restored when needed; without this, the rendering process erroneously sorts the elements, and draws some at wrong positions.
2019-06-05 12:10:59 +02:00
Nev3r
96cfecc41a Created drawnode lists for each view/portal.
Each shall eventually have its specific vissprites/drawsegs; currently only drawsegs are stored in their correct list, vissprites are stored in the first list as a placeholder.
The idea is to sort each list individually, and then render their masked elements, starting from the last drawnode list.
This retains a non-recursive function calling method while still rendering things in order.
2019-06-04 20:15:42 +02:00
Nev3r
84a52a0f80 Moving away more portal-related global vars to r_portal. 2019-06-03 13:33:12 +02:00
Nev3r
7e1bb4a370 Code refactoring to turn portal struct into a more generalized shape.
Split portal-related code to its own source files.
Most of the 2-line-specific setup has been moved to the function which adds a 2-line case. The portals should render as they used to so far, anyway.
2019-06-01 13:07:23 +02:00
TehRealSalt
bb6fe9fc54 Merge branch 'master' into rings 2019-05-14 22:26:22 -04:00
TehRealSalt
e1c8ac77c1 Remove R_InitSkins
(Sonic's S_SKIN is now in chars.pk3)
2019-05-13 11:46:47 -04:00
TehRealSalt
dc41fe3d8d Port over only the relevant changes from the reduced-palette branch, update some of the Kart-specific stuff 2019-05-12 17:19:49 -04:00
Latapostrophe
a0e27c22e7 make followers work with replays 2019-05-12 13:41:46 +02:00
Latapostrophe
c83127293b resolve conflict in m_menu 2019-05-12 10:48:54 +02:00
wolfy852
e4af44956b Merge remote-tracking branch 'remotes/pub/next' into followme
# Conflicts:
#	src/r_things.h
2019-05-11 02:05:58 -05:00
TehRealSalt
3d129ad4ca Merge branch 'v1' into rings 2019-05-06 23:54:20 -04:00
TehRealSalt
8f4d93995b Merge v1 2019-05-02 17:51:54 -04:00
TehRealSalt
f1f664e9b1 Merge v1 2019-05-02 01:36:19 -04:00
wolfs
ce5b99cfe4 Merge branch 'forceskin-by-name' into 'next'
Allow names to be used with forceskin

See merge request KartKrew/Kart-Public!102
2019-04-26 06:42:09 -04:00
TehRealSalt
a3d2b48329 Fix up more stuff
Now in a mergable state
2019-04-18 12:20:13 -04:00
TehRealSalt
089be795a2 Huge splitscreen refactor
Did not get to finish all refactoring or even compile this, I'll continue later
2019-04-18 03:08:11 -04:00
toaster
e676cd89ea * Add FF_SEMIBRIGHT.
* Ranges between full brightness to half-brightness (50% of fullbright effect).
    * Has both software and GL support (I think - GL needs to be doublechecked, but I think it's just GL being murky in general).
    * Used by Rings.
* Backport FF_GLOBALANIM and FF_RANDOMANIM extensions to FF_ANIMATE from 2.2.
    * Rings use the former instead of their own hacky solution to the problem.
* Also backport FF_VERTICALFLIP, because why not.
    * Inverts sprite relative to gravity. I remember wanting this for the flipped death sprite for Jawz, but then Oni drew his own frame for that, so it doesn't matter.
* Refactor vissprite struct a tad, given I did so in internal where I pulled most of these improvements from.
    * Should be no in-game affect; let me know if you notice any regressions.
2019-04-17 18:46:35 +01:00
toaster
5a6722a5e9 Precipitation being drawn at infinite distance when set to zero is incorrect behaviour. This is likely the consequence of a bad merge, but I don't care enough to check for certain. 2019-04-14 14:41:39 +01:00
Wolfy
2c21b62f65 Merge remote-tracking branch 'remotes/public/master' into followme 2019-04-06 13:48:46 -05:00
fickleheart
f60e92aa70 Move public demo vars to a single struct 2019-03-24 21:32:15 -05:00
fickleheart
be458c1d05 Merge remote-tracking branch 'remotes/upstream/master' into new_netreplays
# Conflicts:
#	src/doomdef.h
#	src/g_game.c
#	src/p_user.c
2019-03-19 22:17:25 -05:00
Steel Titanium
df8a5ffc1e Change array size from MAXSKINS+1 to MAXSKINS+2
Also Set the values to 0/NULl, it will be overwritten later when a skin is assigned to the slot.
2019-03-11 22:11:36 -04:00
Steel Titanium
12d0d6ff77 Merge branch 'next' of git.magicalgirl.moe:KartKrew/Kart-Public into forceskin-by-name 2019-03-11 21:54:53 -04:00
wolfy852
19e515d439 Kill all skin flags but SF_HIRES 2019-03-09 23:18:55 -06:00
wolfy852
ddc296575f Fix my fuckups
Not fond of what I did in P_CanRunOnWater but it at least carries the desired effect...
2019-03-06 22:28:06 -06:00
wolfy852
2850ca17df Kill SF_RUNONWATER 2019-03-06 22:02:56 -06:00
wolfy852
33c85f4813 Clean up the skin_t struct 2019-03-06 21:18:01 -06:00
Steel Titanium
5b369ad21e Allow names to be used with forceskin 2019-03-05 19:04:15 -05:00
Alam Arias
c4c744d27a Merge branch 'next' into followme 2019-03-04 17:17:35 -05:00
Alam Arias
aaccb4edff fixed compiling for MSVC 2017 2019-03-04 16:33:06 -05:00
Latapostrophe
d8576b0bbc Add more customization options & fix some dumb things 2019-03-03 21:12:21 +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
wolfy852
6feeb1e1f0 Merge remote-tracking branch 'remotes/pub/next' into followme 2019-02-26 17:12:51 -06:00
fickleheart
e23f1e66b4 Hold on, this works. 2019-02-19 22:21:07 -06:00
fickleheart
69faafc375 Maybe this is a better way to work around the DrawMasked crash... 2019-02-19 19:27:08 -06:00
fickleheart
030428fc9e Maybe this is a better way to work around the DrawMasked crash... 2019-02-19 19:26:32 -06:00
fickleheart
16269007a6 Crash fix I think (CHERRY PICK INTO BASE) 2019-02-18 21:09:22 -06:00
fickleheart
35148c48c0 Crash fix I think (CHERRY PICK INTO BASE) 2019-02-18 21:08:11 -06:00
Latapostrophe
92ab2845c8 Followers but they crash when you join netgames 2019-02-14 03:56:28 +01:00
Latapostrophe
4721243ae5 I needed to commit here so I could switch branches to fix magnet hand xd 2019-02-13 10:06:52 +01:00
Latapostrophe
5077ee3ff3 Merge branch 'master' of git.magicalgirl.moe:KartKrew/Kart-Public into followme 2019-02-12 18:23:26 +01:00
Latapostrophe
335a86377e A start on followers 2019-02-12 18:22:58 +01:00
fickleheart
1c6046ac43 Merge remote-tracking branch 'remotes/upstream/master' into new_netreplays
# Conflicts:
#	src/g_game.c
#	src/k_kart.c
2019-02-06 20:47:35 -06:00
fickleheart
4116c11152 Write skin/color/name changes to replay 2019-01-27 19:07:30 -06:00