Commit graph

18506 commits

Author SHA1 Message Date
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
SteelT
f3c780d732 Merge branch 'master' into joinedip-fixes 2022-09-24 15:27:14 -04: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
1af7af8c62 Remove unused jump 2022-09-24 15:05:55 -04:00
toaster
fe49543456 Merge branch 'master' of https://git.do.srb2.org/KartKrew/Kart into big-large-map-markers 2022-09-24 19:53:36 +01:00
Sally Coolatta
a60d48202f Merge branch 'master' into cheats-streamline 2022-09-24 14:32:15 -04:00
James R
42c6f4fe92 Fix HUD drawing crash if 1 or more KITEM_NONE
blame 375fb72de
2022-09-24 02:47:52 -07:00
James R
fe6bfd1ff2 Merge remote-tracking branch 'origin/master' into wall-transfer-everything 2022-09-23 23:40:37 -07: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
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
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
Sal
708012b35c Merge branch 'more-flats' into 'master'
Allow smaller flat sizes

See merge request KartKrew/Kart!698
2022-09-24 02:52:53 +00:00
Sal
6b354bf251 Merge branch 'menu-jams' into 'master'
Menu jammin

See merge request KartKrew/Kart!699
2022-09-24 02:38:56 +00:00
James R
ac55987d6b Merge branch 'oldcmd' 2022-09-23 19:32:38 -07:00
Sal
e9a87aaa43 Merge branch 'cycle-command' into 'master'
Toggle cvar between multiple values

See merge request KartKrew/Kart!688
2022-09-24 02:31:36 +00:00
AJ Martinez
3501ca7976 Match gate animation to Chengi's new visuals 2022-09-23 17:44:22 -07:00
toaster
75c8749939 Menu jammin
- Menu uses one of three songs (already in music.pk3)
- Cycles between them every time you return to the title screen after starting a map
- Console-accessible. Do what you want
2022-09-23 22:58:51 +01:00
Sally Coolatta
362bef7b3a Add new gate sounds 2022-09-23 17:19:15 -04:00
Sally Coolatta
0bd280a29c Fix SPB dust
- Fix sliptide not using sliptide states
- Fix dust not dealing damage
2022-09-23 16:44:21 -04:00
toaster
a5d0fc4123 Add newline to end of w_wad.c 2022-09-23 21:08:36 +01:00
toaster
859375ce3d Disable all staffghosts code since the lumpname stuff needs addressing (but that'll come later) 2022-09-23 21:08:26 +01:00
Sally Coolatta
8b160a996b SPB circles in place if it goes past on accident 2022-09-23 16:00:35 -04:00
toaster
fe2757cb44 Fix special map usage
- Free header on `CLEAR LEVELS` even if it's `tutorialmap`
- `titlemap` infinite recursion prevention Z_Free's instead of leaking
2022-09-23 20:59:02 +01:00
toaster
f5998c7624 Skip over locked maps/cups when getting nextmap
(carve out an exception for marathon mode, although we will probably want to lock that behind all cups available)
2022-09-23 20:52:51 +01:00
Sally Coolatta
e202f244b9 Allow smaller flat sizes
With mobj scale, smaller flats are pretty reasonable to want to use. Fixes a visual bug in Endless Mine.
2022-09-23 15:25:42 -04:00
Sally Coolatta
117d791424 Merge branch 'master' into cheats-streamline 2022-09-23 14:38:54 -04:00
toaster
c1dbbdf801 Merge branch 'master' of https://git.do.srb2.org/KartKrew/Kart into big-large-map-markers 2022-09-23 17:38:49 +01:00
Sally Coolatta
cb54d9bb30 Use PR_ITEM_RINGS in P_PlayerRingBurst 2022-09-23 11:55:15 -04:00
Sally Coolatta
4952a2d2ae Merge branch 'master' into new-spb 2022-09-23 11:41:53 -04:00
Sally Coolatta
569021ba91 Update item debris for rng states 2022-09-23 11:30:10 -04:00
Sally Coolatta
d582cf0a3f Merge branch 'master' into rng-states-2 2022-09-23 11:23:49 -04:00
Sal
2890ce500a Merge branch 'pivot-default' into 'master'
Upgrade SPRTINFO -- default pivot offsets + wildcard

See merge request KartKrew/Kart!691
2022-09-23 15:19:05 +00: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
toaster
a4c73b204a Kill spstage_start and spmarathon_start 2022-09-23 13:07:59 +01:00
toaster
1538055091 Skip over empty entries when populating vres, saving memory 2022-09-23 13:03:37 +01:00
James R
3d01fca41b K_GetRollingRouletteItem: support Battle 2022-09-23 04:48:30 -07:00
toaster
8afd9b03b2 Only allow W_CheckNumForMap to return lumpnums fitting certain criteria
- For PK3, if it's a .wad
- For .wad, if it's a header (0-length)
2022-09-23 12:26:32 +01: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
toaster
959bb14f59 Fix an error that used map ID when lumpname is better for debugging 2022-09-23 11:55:11 +01: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
58f56de7cc fuck you NULL targets? 2022-09-23 05:30:19 -04:00
Sally Coolatta
43fa2ec19f Merge branch 'master' into new-spb 2022-09-23 04:21:25 -04:00
SteelT
08cd0393c0 Properly check for duplicate recent IP
Clean up M_AddToJoinedIPs a bit
2022-09-23 04:20:07 -04:00