Commit graph

1881 commits

Author SHA1 Message Date
TehRealSalt
26065e9983 Bubble Shield updatin's
- Bigger hitbox
- Waves start smaller, grow up the old size near the end of the inflation
- Waves follow the shield slightly better
- Bubble Shield gives more base weight (this may not actually impact anything)
- Reduced slowdown from bubble trap
- Recoded bubble reflecting to ignore player held shield items
- Added more sound effects
- Increased Bubble max size
2019-05-21 18:02:21 -04:00
TehRealSalt
02bd05ff2b Bubble Shield waves 2019-05-21 15:46:42 -04:00
TehRealSalt
99ed66ac46 Bubble Shield, Flame Shield changes 2019-05-21 01:01:29 -04:00
TehRealSalt
4e5fdc1fa2 Merge branch 'rings' into new-items 2019-05-14 23:12:49 -04:00
TehRealSalt
bb6fe9fc54 Merge branch 'master' into rings 2019-05-14 22:26:22 -04:00
TehRealSalt
ddaf5658d5 Finish skincolors
The only thing remaining is super colors, but I'm not too fussed about that for a merge request because
2019-05-13 23:21:07 -04:00
TehRealSalt
5c3cac52e6 Merge branch 'master' into rings 2019-05-12 15:28:15 -04:00
TehRealSalt
933ca5c3a4 Add an array for unsynced, HUD animation variables
Reduces the size of kartstuff_t, and makes it easy to add even more HUD animations. Fixes viewpoints being wonky for rings.
2019-05-12 14:33:18 -04:00
Latapostrophe
c83127293b resolve conflict in m_menu 2019-05-12 10:48:54 +02:00
TehRealSalt
c2a07b486b Add Flame Shield 2019-05-11 15:20:06 -04:00
TehRealSalt
ecaf14a76b Grow no longer has a speed boost, but no longer holds the item box hostage
It can now be moved over to "mid-tier" instead of the end. Flame Shield will be taking its place as the "situational but powerful speed-up/offense combo item"
2019-05-10 17:04:30 -04:00
TehRealSalt
41a66ac50a Use IsDisplayPlayer for more things
Makes viewpoints in spectating/demos do client-side effects a little better
2019-05-10 15:28:39 -04:00
TehRealSalt
3d129ad4ca Merge branch 'v1' into rings 2019-05-06 23:54:20 -04:00
TehRealSalt
4006045f12 Merge branch 'v1' 2019-05-06 22:06:59 -04:00
TehRealSalt
f48a08cd53 Merge v1 2019-05-06 21:23:29 -04:00
Monster Iestyn
c209377d42 Hardcoded MT_FSGNA's MobjThinker hook function 2019-05-05 16:42:50 +01:00
Monster Iestyn
4ad410dc0b Hardcode the boss thinker function 2019-05-05 15:34:06 +01:00
TehRealSalt
e087d18402 Cooler afterimages
Players afterimages have been colorized & flicker, ala Sonic Advance 2. The number of afterimages you get extends with how many boosts you have stacked.

Item afterimages have also been given a basic colorization.
2019-05-04 21:04:06 -04:00
Monster Iestyn
d159cddde6 hardcode MT_FBOMB's MobjSpawn hook function 2019-05-04 22:46:27 +01:00
TehRealSalt
5c55201b08 Scale draft distances based on game speed 2019-05-02 14:14:54 -04:00
TehRealSalt
9314a0d9a9 Fix normalspeed
Alright fuck this branch it's misery
2019-05-02 02:58:34 -04:00
Nev3r
c0665acad3 Merge branch 'further-mace-advancements' into 'master'
Further Mace Advancements

See merge request STJr/SRB2Internal!147
2019-04-30 15:15:35 -04:00
Nev3r
09ff071656 Fixed more mobj thinker iterator oversights and removed all mobj thinker function checks
Mobjs got their own thinker list after all, and disappearing thinkers are automatically purged from their lists and sent to the limbo list.
So it's safe to assume all thinkers inside the mobj list must be mobjs.

Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-21 16:39:57 +02:00
Nev3r
721c866895 Give precip. its own thinker list
Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-21 14:58:18 +02:00
Nev3r
345984a396 Fix mobj list iteration oversights.
Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-21 12:58:22 +02:00
Nev3r
5a4eded7af Added a mobj-only list entry for mobj thinkers
Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 23:29:20 +02:00
Nev3r
baeda5060c Basic multiple thinker list implementation
Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well.

Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 22:39:22 +02: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
TehRealSalt
6733a485cf wip ring sparkles 2019-04-12 23:29:32 -04:00
TehRealSalt
3dd89eb7c8 Extra touches
- Re-enable ring respawn
- Make Attraction Shield chasing rings faster
- Combi-band is invisible to non-affected players
- Used rings animate faster
- Sync ring animation to a global timer
2019-04-07 14:49:51 -04:00
Wolfy
2c21b62f65 Merge remote-tracking branch 'remotes/public/master' into followme 2019-04-06 13:48:46 -05:00
Monster Iestyn
453f673219 Spinning/swinging maces/chains can now use P_FindSpecialLineFromTag!
# Conflicts:
#	src/p_mobj.c
2019-04-03 19:51:08 +01: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
TehRealSalt
e3434cf724 Merge branch 'doubled-boost' into draft 2019-03-14 19:45:33 -04:00
TehRealSalt
40093a9213 Merge branch 'master' into rings 2019-03-12 01:27:11 -04:00
TehRealSalt
47df41aa86 Dither barrier 2019-03-12 01:24:43 -04:00
fickleheart
e536252a8a Merge remote-tracking branch 'remotes/internal/upsidedown-brain' into HEAD
# Conflicts:
#	src/k_kart.c
#	src/p_mobj.c
2019-03-11 21:59:45 -05:00
wolfs
f4947820e4 Merge branch 'maxskins-bump' into 'next'
Bump MAXSKINS to 128 + Clean up skin struct

See merge request KartKrew/Kart-Public!82
2019-03-11 19:28:16 -04:00
TehRealSalt
6aa55bdbe2 Merge remote-tracking branch 'kartpublic/next' into fortnite 2019-03-11 13:49:12 -04:00
TehRealSalt
0f4fd73533 Try out boost stacking 2019-03-11 12:00:39 -04:00
wolfy852
82d93a95fd Remove P_CanRunOnWater 2019-03-11 00:28:30 -05:00
wolfy852
19e515d439 Kill all skin flags but SF_HIRES 2019-03-09 23:18:55 -06:00
TehRealSalt
955e5d9c80 Nope, disable ring respawn again 2019-03-09 16:21:51 -05:00
TehRealSalt
d6d5d44153 Fix misc mistakes 2019-03-09 16:05:39 -05:00
TehRealSalt
db8f23561d Minor (but important!) polishing
- Thunder Shield now attracts rings
- Colorize the ring counter at max yellow
- Rings in the collecting animation are considered for determining if you can't pick up rings anymore, preventing a LOT of rings being deleted from the map over time.
- Flung rings don't lose speed over time anymore
- Flund rings last way longer
- Using rings is much less touchy (holding the button from before an item roulette will let you continue using them until you let go, using certain items won't make you use a couple rings afterwards)
- 0 rings is now counted as debt when getting hit, making debt easier to get out of (getting hit by a spike now would put you at -2 instead of -5)
- Move Super Ring toward the end of the item (so I don't have to modify gfx.kart to fix dropped items)
2019-03-09 04:33:46 -05:00
wolfy852
2dc5dde769 Merge remote-tracking branch 'remotes/origin/master' into waypoints
# Conflicts:
#	src/k_kart.c
2019-03-08 12:24:03 -06:00
wolfy852
b19d9f69f1 Merge remote-tracking branch 'remotes/pub/next' into followme
# Conflicts:
#	src/dehacked.c
#	src/info.c
#	src/info.h
2019-03-08 02:34:04 -06:00