Commit graph

764 commits

Author SHA1 Message Date
toaster
ed304a5b19 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into rvz-hardcode
# Conflicts:
#	src/p_mobj.c
2019-10-08 19:43:43 +01:00
James R
2a330f1976 Oops 2019-10-07 12:42:04 -07:00
James R
d337d96ffd Comment for clarification 2019-10-07 12:41:56 -07:00
James R
15dc57c4ba Allow name in kartdebugitem 2019-10-07 12:41:49 -07:00
MascaraSnake
ca9fdd4f0e Merge branch 'rvz-hardcode' of git.magicalgirl.moe:STJr/SRB2Internal into rvz-hardcode
# Conflicts:
#	src/d_player.h
#	src/dehacked.c
#	src/p_map.c
#	src/p_user.c
2019-09-29 18:49:53 +02:00
MascaraSnake
309d26069f Implemented the Pterabyte grabbing mechanic 2019-09-29 18:42:17 +02:00
lachwright
f67ef441b3 Hardcode pumice ball
Current known issues: players detached from the ball via any means other than jumping or pain do not have their ball reset properly
2019-09-29 20:18:40 +08:00
TehRealSalt
bc3f0568ee Merge master 2019-09-27 23:09:54 -04:00
TehRealSalt
06d27ae36e Merge branch 'master' into fortnite 2019-09-27 06:36:11 -04:00
TehRealSalt
9d8cb5247a Special effects!
Tire grease waves, colored stars
2019-09-23 03:15:08 -04:00
TehRealSalt
b8a752e40a Merge master 2019-09-18 21:47:11 -04:00
TehRealSalt
d3f1b4f82c Greased horizontals 2019-09-12 02:01:30 -04:00
toaster
09f7dc1350 * Store gravflip (resolves #206) and destscale in starposts. (Using the same field, taking advantage of the fact that object scale will always be positive!)
* Update the function signature of P_MixUp to accomodate both it and drawangle instead of doing it outside of the function.
* If the player is spawning from the start of the stage and it's from the ceiling, be in fall frames as requested (resolves #191).
2019-09-07 22:12:47 +01:00
James R
d51b516446 Show a negative number to indicate ammo penalty 2019-08-26 16:07:17 -07:00
toaster
e5918d629b Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into toast_cleanup
# Conflicts:
#	src/p_mobj.c
2019-06-26 20:43:37 +01:00
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
Sryder
49a8b0ac38 Add player's nextwaypoint to the player struct
Network synchronised(?) nextwaypoint in player struct
Make the waypointheap actually a heap and not allocate memory for every individual waypoint.
No need to store id in the waypoint struct, since it can be gotten from the waypointheap now.
2019-06-16 17:58:28 +01:00
Sryder
530214aa87 Remove now unused waypoint player variables. 2019-06-15 17:04:16 +01:00
Sryder
4dfd81568d Get distance to finish line using waypoints/pathfinding.
Update player position using distance from finish line.
Minor Bug: At the start of a race for a split second the leading players will be last.
Proposed Fix: Start on lap 0 and Force a lap count update when crossing the finish line
2019-06-14 23:55:10 +01:00
MascaraSnake
01adbfc495 Hardcoded the saloon door 2019-06-12 21:20:14 +02:00
TehRealSalt
189c2d06fd Merge branch 'rings' into new-items 2019-05-29 22:17:51 -04:00
TehRealSalt
e8edfb03fb Merge branch 'master' into rings 2019-05-29 22:15:05 -04:00
TehRealSalt
127935edc2 New papersprite sparkle effect 2019-05-27 00:03:02 -04:00
Latapostrophe
ccd0ec96a4 let angle be changed while spun out and boosting 2019-05-25 13:08:38 +02: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
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
3d129ad4ca Merge branch 'v1' into rings 2019-05-06 23:54:20 -04: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
TehRealSalt
e59a7175be Fix skin shit 2019-05-02 00:39:49 -04:00
TehRealSalt
3b352bceea Better SPB ring locking
Now triggers when locked on instead of when out, and has a temporary HUD colorize animation when ring pickup is locked.

also:
- SPB spawns rings more frequently
- There's only a chance for Super Ring while in debt if you mashed at all
- Added Battle fallback items when alone, for the future Break the Capsules
2019-04-09 13:11:55 -04:00
TehRealSalt
ed0267d7d8 Various more tweaks
- Ring attraction is now much more preformant. Instead of each ring checking for all players for a shield & then doing a distance check, players with an attraction shield already will do a blockmap check around them for rings.
- Draft leeway period is longer, from 10 tics to 1 second
- During the draft leeway period, your draft sparkles will still be attached to the last player you drafted, but transparent
- Scale drafting speed requirements, distances, and visuals with player scale instead of map scale. While shrunk, this will make it so you need to be closer to draft, but don't need to be moving as fast.
2019-04-08 14:30:27 -04:00
Wolfy
2c21b62f65 Merge remote-tracking branch 'remotes/public/master' into followme 2019-04-06 13:48:46 -05:00
TehRealSalt
e3434cf724 Merge branch 'doubled-boost' into draft 2019-03-14 19:45:33 -04:00
TehRealSalt
f2bbcbefa2 Drafting 2019-03-14 19:43:58 -04:00
TehRealSalt
40093a9213 Merge branch 'master' into rings 2019-03-12 01:27:11 -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
19e515d439 Kill all skin flags but SF_HIRES 2019-03-09 23:18:55 -06: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
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
TehRealSalt
74a757ad69 Merge remote-tracking branch 'kartpublic/next' into rings 2019-03-07 21:31:45 -05:00
TehRealSalt
129268121d Added rings. 2019-03-07 17:11:31 -05: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