Commit graph

876 commits

Author SHA1 Message Date
Oni
2d38d0fbc6 Merge branch 'item-debris-final' into 'master'
Item Debris

See merge request KartKrew/Kart!683
2022-09-20 22:20:44 +00:00
James R
e7b0e223e1 Fix respawning item boxes with P_RespawnBattlesBoxes 2022-09-20 10:36:32 -07:00
James R
81eb513ef1 Fix item pop sfx not playing for eggman boxes and playing TWICE for everything else
The former is my bruh and the latter is probably not my
brew.
2022-09-20 06:10:52 -07:00
Sally Coolatta
fac7bb0627 Merge branch 'master' into item-bungus 2022-09-16 06:56:23 -04:00
Sal
94d7c497b0 Merge branch 'hooklib-port' into 'master'
Hooklib refactor ported and (mostly) squashed

See merge request KartKrew/Kart!662
2022-09-11 06:30:07 +00:00
toaster
975ed1f136 Merge branch 'master' of https://git.do.srb2.org/KartKrew/Kart into new-menus
# Conflicts:
#	src/d_main.c
2022-09-07 21:39:34 +01:00
Oni
ea3818d285 Merge branch 'hear-pain' into 'master'
Improved MKSC-style hit confirms

See merge request KartKrew/Kart!659
2022-09-07 04:44:03 +00:00
James R
37c3a55dda Fix conflicts 522467a88 2022-09-05 11:56:30 -07:00
Sally Coolatta
01af5127c8 Improved pain then hit confirm sound
- The pain + hit confirm delay is done for all players, instead of only the damaged player.
- The player who got the hit also gets to hear their pain sound at full volume.
- Changed the code so that your hit confirm sound effect will no longer be interrupted if the player who got hit left the game.
2022-09-04 14:23:51 -04:00
Ashnal
47ce32cfc9 Properly detach rocket sneakers when the player dies
This includes both death pits and spectating
2022-08-28 16:42:06 +01:00
Sally Coolatta
c292009ebd Fix human vs bot P_CheckRacers conditions 2022-08-28 08:04:50 -04:00
Sally Coolatta
429f61966e Merge branch 'master' into item-bungus 2022-08-23 23:42:21 -04:00
Sally Coolatta
0a5767b0b0 Merge branch 'master' into item-bungus 2022-08-14 20:49:40 -04:00
Sally Coolatta
ebb34ff9d4 Lap based power level 2022-08-14 06:00:37 -04:00
James R
eac2aea082 Add 2 seconds instead of 5 upon Invincibility hit, in Battle 2022-08-01 05:28:00 -07:00
Sal
9cb72a73d7 Merge branch 'line-460-animate-2' into 'master'
Play ring collect animation for line 460

Closes #235

See merge request KartKrew/Kart!627
2022-06-12 17:15:27 +00:00
James R
f6a445c281 Add K_AwardPlayerRings, adds to player->superring 2022-06-10 00:03:05 -07:00
James R
1800970ed9 Death: respawn from where you died and take an invisible lightsnake 2022-06-09 22:49:30 -07:00
Sally Coolatta
e2ac698247 Make Ballhog more interesting
- No more instant fuck you button. You charge up a meter instead by holding down attack, and let go to fire as many as you charged up. Tapping fires one out of five, holding for the entire duration shoots out all five like before, but anything inbetween is also possible.
- Ballhog projectiles scale up over time (like Contra spread shot), to help make it stronger again after players started getting faster.
2022-05-27 17:51:47 -04:00
James R
dac2f4495e Merge branch 'hyu' 2022-05-25 00:43:32 -07:00
toaster
17d007d418 * Restore player colour and colorization correctly when the Eggman Mark concludes its effect.
* Allow colorisation types to not completely crowd each other out.
    * For example, it's possible for invincibility + grow to flicker Invincibility, Eggman mark, and grow colours if the conditions for each type of flash are true on different frames!
2022-05-23 22:04:14 +01:00
Sally Coolatta
644b9e1acd Merge branch 'master' into hyu 2022-05-22 20:27:14 -04:00
Sally Coolatta
83b5bfef59 Super Circuit hit confirms
After getting hit, you'll hear the person who hit you's hit confirm from any distance
2022-05-22 03:26:32 -04:00
Sally Coolatta
7891b10328 Merge branch 'master' into hyu 2022-05-21 22:38:15 -04:00
Sally Coolatta
56c23339be Directional Influence
Pretty much just copy+pasted from Snap the Sentinel!!
- Hold left/right to adjust the momentum angle after hitlag, up to 22.5 degrees. (Only angle can be adjusted, so you can't adjust your speed, only your direction.)
- It's relative to your angle, so sometimes you need to use forward/back, or even diagonals (forward/back throws now store full analog data for this to work)
- Bananas flip DI direction, to make them not baby easy mode
- Tumble has x3 DI (so angle adjustments of 67.5!!), and hitlag on each bounce to allow even more control.
2022-05-20 01:45:16 -04:00
James R
c6e7fe2d29 Hyudoro object code 2022-04-29 22:02:22 -07:00
toaster
b9864c9294 BATTLE SYNC
* Fix majority of Battle resyncs.
    * Change how Paperitem spawners work. Instead of rerolling the RNG if a map spot is already used, maintain a list of available spots...
    * Correct over-the-network type of player->spheredigestion.
    * Remove the condition that prevented the spheres' spawnpoints from being sent over the network, which meant they were only respawning on the host's end...
* Fix itemroulette on Battle playerarrow. (Rarely seen these days but still possible to observe as spectator for Break the Targets)
* Change draw order of Position Faces and Tab Rankings to allow for players' numbers to draw on top of the big out-of-bumpers X.
2022-03-23 00:34:23 +00:00
SteelT
002e07dceb Merge branch 'mergeladder' into 'master'
Merge Ladder

See merge request KartKrew/Kart!558
2022-03-22 03:34:08 +00:00
SteelT
dbdaebbb04 Merge branch 'droptarget' into 'master'
"Drop Target" item

See merge request KartKrew/Kart!562
2022-03-22 03:33:54 +00:00
toaster
52d2472ed7 "Drop Target" item initial commit.
Most of the way there, but still a bit left to do.
2022-03-21 23:40:30 +00:00
toaster
b270b67c1d Limit array access for placed emblems.
(Partial merge of STJr/SRB2!1757)
2022-03-18 20:52:53 +00:00
toaster
bf43784d22 This is a doozy...
HUD:
* Miniaturised Spheres and Emeralds HUD for 3P/4P.
* Repair 3P minimap.
* Move accessibility icons in 3P/4P to next to the lap/bumper sticker (currently only kickstartaccel exists)
* Change language on menu retry to be more generalised.
* Adjust HUD code structuring a bit.

MECHANICAL:
* Now correctly set number of bumpers in Break the Capsules to 1 (from 3).
* The above required reworking K_SpawnBattleCapsules into K_BattleInit, which is a good staging ground to handle more battle-specific setup in future.
* Do not spawn Emeralds or Sphereboxes in Break the Capsules.
* If everyone is WANTED... nobody is.
* Try to handle exceptions to timelimits a little more thoroughly (still not perfect).
* Disable pointlimits in bosses.
2022-03-05 22:31:43 +00:00
toaster
17e5f71b5d * Re-enable sphere HUD in bosses.
* Do a little more anti-overtime checking for bosses. (This *really* requires a refactor at some point, but not right now)
2022-02-27 17:48:04 +00:00
toaster
8f4e8a4953 can't believe i messed up the brackets this bad, woops 2022-02-09 23:43:06 +00:00
toaster
c3e9eceda2 * Instead of checking for a player moving up, check for a player moving up that's only JUST been tumbled.
* Remove the DMG_WOMBO flag from PVP touch damage tumbles as that was restricting tumble combos in this branch, not allowing it.
2022-02-08 21:38:24 +00:00
toaster
766fce5857 Make some adjustments to the damage combo system for players.
* Prevent a player that is moving upwards from being DMG_TUMBLE'd again (resolves #212).
* Instead of having a special case for missiles there, make PIT_CheckThing toggle DMG_WOMBO instead.
* Allow hard hits (DMG_TUMBLE, DMG_EXPLODE, and DMG_KARMA) to have combos toggled off with DMG_WOMBO, too.
2022-02-03 19:51:17 +00:00
SinnamonLat
191103fec1 Fix a dumb mistake, add DMG_WOMBO to orbinauts, jawz and banana hits 2022-01-22 11:41:49 +01:00
SinnamonLat
ba9ef23b31 Add MF_NOHITLAGFORME and DMG_WOMBO 2022-01-22 10:01:24 +01:00
Sal
8f22730dc5 Merge branch 'infinitepainfloor' into 'master'
Fix infinite pain floors

See merge request KartKrew/Kart!515
2022-01-05 03:45:14 +00:00
toaster
7237b6bea9 Fix infinite pain floors
If inflictor is null and you're in hitlag do not damage again
2022-01-04 23:35:59 +00:00
Sal
69fa93f980 Merge branch 'terrain-lump' into 'master'
TERRAIN lump

See merge request KartKrew/Kart!480
2022-01-04 20:13:11 +00:00
Sally Coolatta
ef5a4f01d4 Merge branch 'master' into terrain-lump 2022-01-04 12:34:47 -05:00
Sal
d54cfcdc7b Merge branch 'ring-sting-fixes' into 'master'
Fix ringsting and hitlag

Closes #111

See merge request KartKrew/Kart!511
2022-01-04 17:28:55 +00:00
James R
5498f9d02d Let objects receive damage while in hitlag 2021-12-29 22:58:21 -08:00
Sally Coolatta
cc250afd45 P_InitAngle, to fix angle interpolation on spawning objects 2021-12-24 12:45:51 -05:00
Sally Coolatta
0cd3efc76d Merge branch 'master' into terrain-lump 2021-12-18 18:36:05 -05:00
James R
1140410e2c Spawn SPHERE BOXES randomly in Battle
They look like random item boxes (the ones in Race) but
have a blue sphere inside of them. One box is worth 10
blue spheres. More boxes spawn during Overtime.

New sprite: SBOX
2021-12-14 01:05:42 -08:00
Sally Coolatta
150faf9de6 Add terrain pointer to mobj_t 2021-12-09 00:56:05 -05:00
Sally Coolatta
c43f8da5e6 P_SetOrigin & P_MoveOrigin to replace P_TeleportMove 2021-11-29 08:20:27 -05:00
James R
17b3cd205e Merge branch 'snapify-hitlag' into 'master'
Snap da sentinel like hitlag

See merge request KartKrew/Kart!458
2021-11-28 00:29:29 +00:00