Commit graph

2050 commits

Author SHA1 Message Date
toaster
871de857ae Merge branch 'master' of https://git.do.srb2.org/KartKrew/Kart into setangle
# Conflicts:
#	src/p_enemy.c
#	src/p_mobj.c
2022-09-24 20:23:35 +01:00
James R
fe6bfd1ff2 Merge remote-tracking branch 'origin/master' into wall-transfer-everything 2022-09-23 23:40:37 -07:00
James R
79f4454016 Let jawz wall transfer; don't thrust in air 2022-09-23 21:06:33 -07:00
James R
b6b7d7a93e Don't thrust orbinauts while airborne
Fixes bonking against a wall transfer.
2022-09-23 20:10:05 -07:00
James R
5f8901b033 Apply wall transfer to any object 2022-09-23 20:09:25 -07:00
Sally Coolatta
4952a2d2ae Merge branch 'master' into new-spb 2022-09-23 11:41:53 -04:00
James R
375fb72de1 Add K_GetRollingRouletteItem, refactor item drawers
Roulette now cycles through all single items (that have
odds). Added missing shields and drop target.
2022-09-23 04:09:32 -07:00
Sally Coolatta
e340d9b701 Remove itnext at top of MobjThinker also 2022-09-23 05:54:02 -04:00
Sally Coolatta
31009264ca NULL itnext in general on removal 2022-09-23 05:51:14 -04:00
Sally Coolatta
2786957fef Move Obj_SPBExplode to correct place 2022-09-23 03:52:14 -04:00
Sally Coolatta
f89d8d15c2 Properly separate SPB & Shrink cooldowns
Also refactors some of the result -> type & amount code
2022-09-23 03:35:18 -04:00
Sally Coolatta
a790ffee79 The little SPB tweaks
- Explosion strength scales with how long you've been outrunning it. 0 seconds is even more punishing than it was before, while surviving 60+ seconds converts the damage into minimal stumble.
- When it starts properly chasing a new target, it will be intangible for 1 second
- Hot potato takes 2 seconds instead of 7
- Too much hot potato will make it run ahead & explode (untested)
2022-09-21 11:51:16 -04:00
Sally Coolatta
0e7d9ba84e Merge branch 'master' into new-spb 2022-09-21 11:18:31 -04:00
Sally Coolatta
dd94b1449e Juicebox gates forward port for SPB 2022-09-21 07:05:26 -04:00
VelocitOni
6d45e58425 Merge branch 'master' into tumble-slope-fuck 2022-09-21 07:04:37 -04:00
Sally Coolatta
b7f0f05f84 Merge branch 'master' into new-spb 2022-09-21 02:12:53 -04:00
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
Sally Coolatta
f987d1b601 Add smooth landing vfx 2022-09-20 10:33:24 -04:00
James R
c2b2cd9a43 Reenable item box respawning
Old code was shit so I removed it (4d67cc632). Turns out
none of that bullshit actually mattered to make this box
respawn and it just needs to go to an invisible state!

Makes use of some nifty flickering code (that was already
there but effectively disabled) shortly before it actually
respawns.
2022-09-20 05:45:28 -07:00
Sally Coolatta
acf2484def Merge branch 'master' into tumble-slope-fuck 2022-09-20 07:34:44 -04:00
Sally Coolatta
5767315787 SPB in its own file + better waypoint movement 2022-09-18 01:07:46 -04:00
James R
4d67cc6324 Replace shitty item box pop with flying debris and dust clouds
Debris flies forward and outward from the player in the
direction of momentum. Debris particles bounce once then
disappear when they hit the ground for the second time.
Clouds spawn on and trail behind the player for a short
duration.
2022-09-17 06:41:44 -07:00
Sally Coolatta
fac7bb0627 Merge branch 'master' into item-bungus 2022-09-16 06:56:23 -04:00
Sally Coolatta
cb2d2cb2ba Cleanup objects properly 2022-09-15 20:03:32 -04:00
Sally Coolatta
dd0635fb23 Merge branch 'master' into m-for-mini 2022-09-14 01:55:28 -04:00
X.organic
6dfd49a3b9 Fix use-after-frees around mobjs
# Conflicts:
#	src/p_enemy.c
#	src/p_mobj.c
#	src/p_saveg.c
#	src/p_tick.c
2022-09-12 17:00:33 +01:00
Sally Coolatta
92f9fc266d Merge branch 'master' into m-for-mini 2022-09-11 18:39:53 -04:00
Sally Coolatta
e5631d3182 Merge branch 'master' into m-for-mini 2022-09-11 18:39:11 -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
Sally Coolatta
cf9bfcae02 Start on new Shrink
Currently just spawns an object that goes along the waypoint path
2022-09-10 21:44:40 -04:00
Sally Coolatta
79f6d0643b Launch / step-down changes
- Launch / wall-transfer off of no-physics slopes
- Prevent step down when trying to move upwards
- E-brake enables launching again
- Removed old comment talking about slope nerf
2022-09-10 14:46:12 -04: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
toaster
d62147e8b5 Merge branch 'master' of https://git.do.srb2.org/KartKrew/Kart into setangle
# Conflicts:
#	src/k_kart.c
2022-09-07 14:23:56 +01:00
VelocitOni
813751d9c0 Consistent color scale
Driftsparks now go through grey, yellow, red, and blue; instead of yellow, red, blue, purple. This is consistent with every other scale of power in the game.
2022-09-07 03:45:20 -04:00
Oni
a6c35a2191 Merge branch 'fast-fall' into 'master'
Fast falling

See merge request KartKrew/Kart!660
2022-09-07 04:37:48 +00:00
SteelT
cb46f8de39 Turn the console warning into a devmode print because turns out it happens more often than I thought
(cherry picked from commit 893ea10a677274b8cb3aa0987f22f162521b6311)
2022-09-05 11:56:30 -07:00
SteelT
c73d3b4244 Spawn MT_RAY when attempting to spawn MT_NULL
Some code assumes that P_SpawnMobj can never return NULL
So spawn MT_RAY in it's place when attempting to spawn MT_NULL and show a console warning

(cherry picked from commit 34f8464cbfc01adf1650da1311a0751fce5b0678)
2022-09-05 11:56:30 -07:00
James R
707f487f92 Never spawn MT_NULL
(cherry picked from commit a8c658b545e3c7709212a43489163f33ffbe91f0)
2022-09-05 11:56:30 -07:00
James R
37c3a55dda Fix conflicts 522467a88 2022-09-05 11:56:30 -07:00
toaster
1f3ac199ae Merge branch 'master' of https://git.do.srb2.org/KartKrew/Kart into 14plus-mergeladder 2022-09-05 15:32:02 +01:00
Sally Coolatta
bc538a066f Fast falling
E-Brake in the air for x4 gravity, at the cost of a tiny bounce on landing.
2022-09-04 21:21:25 -04:00
toaster
1abfb2745a Merge branch 'master' of https://git.do.srb2.org/KartKrew/Kart into new-menus 2022-09-03 22:26:28 +01:00
toaster
2c91f83a02 Store tripwire pass level on the player
Fixes tripwire leniency fadeout - previously broken two commits ago
2022-08-30 21:22:26 +01:00
toaster
6b8d729b2c Blaster polish
* Use leveltime instead of leniency for flicker, which makes it work as intended
* Make the threshold for tripwire BLASTER 200% (from 180%)
* Always colorize boost/BLASTER when you have a Flame Shield
* Hide boost/BLASTER if you're using flamedash specifically
2022-08-30 19:29:12 +01:00
toaster
97fab1ab20 Levels of tripwire pass conditions.
- Invinc and sneaker can go up to BLASTER.
- Flame shield and momentum make only the boost by themselves.
- Hyuu and grow ignore tripwire so don't make ANY aura without any of the prior also occouring.
2022-08-30 18:16:51 +01:00
James R
31835b380b Set tripwire blaster destscale instead of player's 2022-08-30 00:12:08 -07:00
toaster
bdd786d8ab BLASTER finalisation
- BLASTER >= 180% speed, smaller boost otherwise
- Flickers under 150%
- Invinc-coloured when invincibility
- Ketchup coloured when boosting, invisible otherwise
2022-08-29 18:35:38 +01:00
Sally Coolatta
b9e3bdff94 Better tripwire leniency vfx 2022-08-29 16:26:58 +01:00
JugadorXEI
904f1703c5 Fix duplicated matchgenericflags (was causing crash)
# Conflicts:
#	src/p_mobj.c
2022-08-28 16:40:50 +01:00