Commit graph

2601 commits

Author SHA1 Message Date
toaster
d8bb2fe8fe Merge branch 'master' of https://git.do.srb2.org/KartKrew/Kart into setangle
# Conflicts:
#	src/k_kart.c
#	src/p_enemy.c
#	src/p_mobj.c
2022-09-26 16:25:06 +01:00
Sally Coolatta
21d32511a5 Merge branch 'master' into better-splash 2022-09-25 20:01:27 -04:00
Sally Coolatta
4165fae63f Merge branch 'master' into cheats-streamline 2022-09-25 17:29:38 -04:00
VelocitOni
1d2e1420f6 Merge branch 'master' into cheats-streamline 2022-09-25 14:27:17 -04:00
Sally Coolatta
15edb40eb5 Merge branch 'master' into rng-states-2 2022-09-25 14:04:42 -04:00
Sally Coolatta
139d6f4a49 Merge branch 'master' into rng-states-2 2022-09-25 14:04:19 -04:00
Sally Coolatta
4b51f12c09 Merge branch 'master' into better-splash 2022-09-25 13:39:55 -04:00
Sally Coolatta
ead1c59d58 Weight dist even less heavily 2022-09-25 12:41:23 -04:00
Sally Coolatta
13e6dfb79e New Jawz swap prevention
Instead of a static 5 tic delay each time the reticule changes, its a timer that increments the longer your target is on someone, up to 10 tics. When trying to swap targets, it will reduce this timer, and only swap when it reaches 0.
2022-09-25 12:29:18 -04:00
Sally Coolatta
13e94dfee0 Polish up Jawz target conditions slightly 2022-09-25 12:14:21 -04:00
Sally Coolatta
bbec083d4e Polish backwards behavior 2022-09-25 12:04:08 -04:00
Sally Coolatta
b0e3840550 Add jawz.c + new backwards behavior 2022-09-25 11:27:07 -04:00
Sally Coolatta
cc331d90da Add orbinaut.c + new backwards behavior 2022-09-25 09:55:49 -04:00
Sally Coolatta
a9634dde2f Fix Shrink not receiving stumble 2022-09-24 19:51:41 -04:00
Sally Coolatta
bd1faa3178 Use scale for all grow/shrink interactions 2022-09-24 16:35:14 -04:00
Sally Coolatta
eedff2dea9 Make Grow cause stumble 2022-09-24 16:13:44 -04:00
toaster
5c36e72115 Merge branch 'master' of https://git.do.srb2.org/KartKrew/Kart into rng-states-2
# Conflicts:
#	src/p_enemy.c
2022-09-24 20:29:53 +01:00
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
Sally Coolatta
a60d48202f Merge branch 'master' into cheats-streamline 2022-09-24 14:32:15 -04:00
AJ Martinez
fdffed0622 Remove redundant radius set 2022-09-23 23:39:35 -07:00
AJ Martinez
e10d6124d6 Merge remote-tracking branch 'origin/master' into new-spb 2022-09-23 22:20:24 -07:00
AJ Martinez
9ecd5b9c4b Add shockwave support to K_SpawnDriftElectricSparks 2022-09-23 22:14:10 -07:00
Oni
70cfe6a228 Merge branch 'trick-fail-lose-drug-items' into 'master'
Drop items being dragged behind you, like orbinaut shields, when failing a trick

See merge request KartKrew/Kart!696
2022-09-24 02:57:45 +00:00
James R
ac55987d6b Merge branch 'oldcmd' 2022-09-23 19:32:38 -07:00
Sally Coolatta
117d791424 Merge branch 'master' into cheats-streamline 2022-09-23 14:38:54 -04:00
Sally Coolatta
4952a2d2ae Merge branch 'master' into new-spb 2022-09-23 11:41:53 -04:00
Sally Coolatta
d582cf0a3f Merge branch 'master' into rng-states-2 2022-09-23 11:23:49 -04:00
Sal
619d33d8e7 Merge branch 'double-meme-taunt' into 'master'
Don't play boost taunt twice if meme voices are enabled

See merge request KartKrew/Kart!692
2022-09-23 15:17:55 +00:00
James R
c6e4a93e29 Drop items being dragged behind you, like orbinaut shields, when failing a trick 2022-09-23 06:15:19 -07:00
James R
3d01fca41b K_GetRollingRouletteItem: support Battle 2022-09-23 04:48:30 -07: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
d43a5d0554 Fix unused variables 2022-09-23 04:08:07 -04:00
Sally Coolatta
21bd7bf041 Reverse SPB distance scaling 2022-09-23 04:04:05 -04:00
Sally Coolatta
fa63c67f04 Disable shrinking items into nothing
No one feels strongly about it, it just feels weird
2022-09-23 03:46:56 -04:00
Sally Coolatta
13caae7a0e Shrink does not remove SPB 2022-09-23 03:41:27 -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
James R
bcdf41ec64 Remove PF_ATTACKDOWN/PF_ACCELDOWN/PF_BRAKEDOWN, use oldcmd.buttons 2022-09-22 08:49:44 -07:00
James R
c792818887 Rename PF_LOOKDOWN to PF_GAINAX 2022-09-22 07:19:56 -07:00
James R
966ccdd230 Don't play boost taunt twice if meme voices are enabled 2022-09-22 06:39:45 -07:00
James R
713c21688e Remove unnecessary setting of PF_ATTACKDOWN; use BT_ATTACK where equivalent 2022-09-22 06:38:07 -07:00
VelocitOni
3a21f60ce1 Revert "Set back to 100%+ top speed, but w/ everything else kept the same"
This reverts commit e4f51ada15.
2022-09-22 00:23:31 -04:00
VelocitOni
e4f51ada15 Set back to 100%+ top speed, but w/ everything else kept the same 2022-09-22 00:13:35 -04:00
VelocitOni
d9beb0daa6 Rebalanced GATES gains and reduced boost timers
Reduced top-speed from 100%+ to 75%+, reduced handling buff from 50%+ to 25%+, reduced boost-time on gates to half the time.
2022-09-22 00:00:32 -04:00
VelocitOni
5cbaeb5835 Gateboost @ 100%+ speed instead of 50%+ 2022-09-21 23:14:12 -04:00
VelocitOni
b9ecb9ccc8 Reduced SPB distances again 2022-09-21 22:01:09 -04:00
Sally Coolatta
47293d1d9f Improve debug distribution, rebalance SPB spawning
Might be too far in the other direction, we'll see
2022-09-21 21:02:05 -04:00
Sally Coolatta
34aa00ab0d Fix drop target cvars & debug distribution 2022-09-21 19:48:57 -04:00
Sally Coolatta
f3742bad9d Safe-guard SPB from 1st place 2022-09-21 19:02:38 -04:00
Sally Coolatta
38f6fe3112 Merge branch 'master' into new-spb 2022-09-21 12:11:39 -04:00
Sally Coolatta
44a742b1aa r_things.c -> r_things.h 2022-09-21 11:51:43 -04:00