Commit graph

23485 commits

Author SHA1 Message Date
Oni
a06f93eb8c Merge branch 'develop-unlocks' into 'master'
Develop unlocks

See merge request KartKrew/Kart!1322
2023-07-02 02:40:32 +00:00
Oni
161dde2a98 Merge branch 'spb-attack-thunderdome' into 'master'
Use only Ring Box in SPB Attack

See merge request KartKrew/Kart!1321
2023-07-02 02:03:53 +00:00
AJ Martinez
d1c954fd86 DEVELOP devmode cheat: save gamedata instantly 2023-07-01 16:17:37 -07:00
AJ Martinez
304ed85941 DEVELOP devmode cheat: allow saving 2023-07-01 16:14:42 -07:00
AJ Martinez
24d3524509 DEVELOP Z-unlock should still try not to crash 2023-07-01 16:10:17 -07:00
AJ Martinez
ca3ecce7ca DEVELOP: Hold Z to unlock anything, anytime 2023-07-01 16:02:31 -07:00
AJ Martinez
30207327c7 Use only Ring Box in SPB Attack 2023-07-01 15:43:41 -07:00
Oni
afc474461f Merge branch 'battle-recommendations' into 'master'
Battle Recommendations

Closes #569

See merge request KartKrew/Kart!1318
2023-07-01 20:19:18 +00:00
Oni
09ca91be90 Merge branch 'udmf-convert-waypoint-risers' into 'master'
-writetextmap: convert Waypoints and Dash Rings

See merge request KartKrew/Kart!1320
2023-07-01 20:18:34 +00:00
James R
f0b12d895e writetextmap: save waypoints correctly, account for risers and anchors 2023-07-01 12:59:56 -07:00
James R
23d8a3f638 Split apart some of P_WriteTextmap 2023-07-01 12:58:38 -07:00
James R
4dcd46d590 P_ConvertBinaryThingTypes: convert dash rings (not yet hardcoded) 2023-07-01 12:55:35 -07:00
James R
4f972588b4 K_BattleAwardHit: evaluate win condition before adding points 2023-06-30 21:35:15 -07:00
James R
8dedc73c11 Show point count next to rank icons HUD in Battle
If the player has reached the point limit, the numbers
dance and flash tangerine (indicating that they are about
to win, after they kill someone).
2023-06-30 21:26:39 -07:00
VelocitOni
c042c6e5dc Battle odds re-do
Cleared out all battle odds and started fresh, now mostly projectiles.
2023-06-30 19:58:02 -07:00
James R
eb41362195 K_RunPaperItemSpawners: always give monitors 3 item types 2023-06-30 19:58:02 -07:00
James R
ea6db0a561 Draw MMAPDOT in front of players' facing angles on the minimap 2023-06-30 19:58:02 -07:00
James R
313d2f8fd2 During Overtime: point Servant Hand to Battle Kiosk, stop pointing to UFOs 2023-06-30 19:58:02 -07:00
AJ Martinez
f8131cbd4e Direct players to battle UFOs via Obj_PointPlayersToXY 2023-06-30 19:58:02 -07:00
James R
43aa03bfc3 WANTED player or Lightning Shield attracts emeralds 2023-06-30 19:58:02 -07:00
James R
96eb60ee63 Don't pickup emeralds if in pain state 2023-06-30 19:58:02 -07:00
James R
99091036fb Kill Battle UFOs outside of the Overtime Barrier 2023-06-30 19:58:02 -07:00
James R
835981d299 Battle: scale Overtime Barrier to minimap size 2023-06-30 19:58:02 -07:00
James R
506e0c58c8 Always shrink Overtime Barrier in 30 seconds 2023-06-30 19:58:02 -07:00
James R
8ef03f29e5 K_SpawnOvertimeLaser: only move laser height with player if player goes above the top of the lasers 2023-06-30 19:58:02 -07:00
James R
cd87a8c59d Give Overtime Lasers infinite draw distance 2023-06-30 19:58:02 -07:00
James R
a387189487 Don't steal bumpers unless below 3 bumpers or dealing STEAL damage (sneakers) 2023-06-30 19:58:01 -07:00
James R
b1b0e579d0 Battle: power-up time 20 -> 30 seconds, UFO respawn 25 -> 20 seconds 2023-06-30 19:55:02 -07:00
Gunla
a8a8d375c3 Merge branch 'fix-sphere-box' into 'master'
Fix Sphere Boxes not awarding spheres

See merge request KartKrew/Kart!1319
2023-07-01 02:22:43 +00:00
James R
d4a0cdd3c0 Sphere Box: use extravalue2 for sphere count
extravalue1 is already used by timer
2023-06-30 17:07:25 -07:00
James R
5b27d2a84e Battle: time limit 2 -> 3 minutes 2023-06-30 04:04:33 -07:00
Oni
219f3407cb Merge branch 'small-battle-fix-friday' into 'master'
Don't Guard Break when damage state player collides; remove invincibility effect when dropping "S" power-up

See merge request KartKrew/Kart!1317
2023-06-30 09:04:20 +00:00
James R
4c30b84588 Fix "S" extending invincibility timer on hit 2023-06-30 01:23:37 -07:00
James R
e03e1aff0c K_DropPowerUps: remove invincibilitytimer along with "S" 2023-06-30 01:23:17 -07:00
Oni
571fe1a903 Merge branch 'noplaybackmedals' into 'master'
demo.playback guard

Closes #567

See merge request KartKrew/Kart!1307
2023-06-30 07:58:33 +00:00
James R
5d4ec59a33 K_DropPowerUps: refactor to use more lambdas 2023-06-30 00:48:08 -07:00
Oni
6e22ab5fa6 Merge branch 'battle-win-by-kill' into 'master'
Battle: win by having enough points when you kill a player

See merge request KartKrew/Kart!1316
2023-06-30 07:48:08 +00:00
James R
d4b0ee21ab Don't Guard Break if other player is in pain state 2023-06-30 00:47:14 -07:00
James R
609b0c0ae0 MT_FLOATINGITEM: check P_PlayerInPain before picking up power-ups 2023-06-30 00:46:52 -07:00
James R
1184e6d674 Battle: win by having enough points when you kill a player 2023-06-29 23:32:17 -07:00
Oni
e6ba45e558 Merge branch 'fix-emerald-overtime-crash' into 'master'
Fix Overtime Barrier crash

See merge request KartKrew/Kart!1315
2023-06-30 06:23:30 +00:00
Oni
5a48dbc875 Merge branch 'dont-pickup-powerups' into 'master'
Don't pickup power-ups if you are flashing or (s)tumbling; fix Stumble damage floors

See merge request KartKrew/Kart!1314
2023-06-30 06:16:33 +00:00
Oni
da2e745bf7 Merge branch 'splitscreen-timer' into 'master'
Splitscreen level timer HUD

See merge request KartKrew/Kart!1309
2023-06-30 06:08:52 +00:00
Oni
0c94ce41eb Merge branch 'battle-ufo' into 'splitscreen-timer'
Battle: Power-up UFO

See merge request KartKrew/Kart!1308
2023-06-30 06:08:37 +00:00
James R
38f9922aa1 Fix crash from trying to spawn emerald sparkles on emeralds or monitors killed by the Overtime Barrier 2023-06-29 23:08:32 -07:00
James R
38c5703020 Add Battle UFO to minimap 2023-06-29 23:01:27 -07:00
James R
8b33c45cbd Fix Stumble damage floors damaging the player 2023-06-29 22:40:09 -07:00
James R
42f140399f Don't pickup power-ups if you are flashing or (s)tumbling 2023-06-29 22:39:51 -07:00
Oni
c8e260a1b0 Merge branch 'restart-level-above-resume' into 'master'
Pause menu: move Retry Map/Try Again directly above Resume Game

See merge request KartKrew/Kart!1312
2023-06-30 05:29:23 +00:00
James R
d8afc7597d Add K_FlingPaperItem, split off random thrust functionality
Battle UFO drops do not fling.
2023-06-29 22:22:00 -07:00