Commit graph

24789 commits

Author SHA1 Message Date
AJ Martinez
7ba7e2b076 Prevent failsafe briefly after taking damage 2023-11-04 23:42:26 -07:00
AJ Martinez
1667ca591e Don't failsafe when twerking 2023-11-04 23:22:03 -07:00
AJ Martinez
961372540a Flame Shield SFX, flame/lightning rescale 2023-11-04 20:43:27 -07:00
AJ Martinez
78086fc625 Fix duplicate pubkey detection misfiring on retry 2023-11-04 18:20:26 -07:00
Eidolon
187f30cc64 rhi: use GL 2 instead of GL Core
Widens the hardware compat range without losing features (besides
debugging)
2023-11-04 20:15:51 -05:00
AJ Martinez
4db18b1225 Easier ballhog tapfire 2023-11-03 22:51:14 -07:00
Oni
6e6c0cd71f Merge branch 'ballhog-descam' into 'master'
Ballhog fixups (+ sound cleanup)

See merge request KartKrew/Kart!1590
2023-11-03 03:13:13 +00:00
Oni
b20fb26c04 Merge branch 'hanagumi-ringbox' into 'master'
Hanagumi Hall ring vent overflow (resolves #745)

Closes #745

See merge request KartKrew/Kart!1591
2023-11-03 03:12:35 +00:00
Oni
4e5e0835b5 Merge branch 'mania-time-trial' into 'master'
Mania-style time trials (resolves #747 mostly by accident)

Closes #747

See merge request KartKrew/Kart!1592
2023-11-03 03:12:03 +00:00
AJ Martinez
28405087e5 Y to quick restart attack modes 2023-11-02 16:53:55 -07:00
AJ Martinez
5acfe85542 Fix incomplete ghost fast-forwarding 2023-11-02 16:51:25 -07:00
AJ Martinez
0ca7897327 Remove sliptide sound fix (revisit later) 2023-11-02 07:11:02 -07:00
AJ Martinez
a2438a14c2 Fix standard race times being modified on line cross 2023-11-02 07:06:28 -07:00
AJ Martinez
506ab31f7f Mania-style time trials 2023-11-02 06:51:51 -07:00
toaster
263c968cc8 Fix the Hanagumi Hall ring vent overflow
The way the cap was being handled was kind of messed up, and was trying to subtract your existing Super Ring count.
But because the datatype doesn't support negative numbers, it rolled under to approx UINT16_MAX!
Fix the datatypes and add the extra over-range check to prevent this from happening again.
2023-11-02 11:24:54 +00:00
AJ Martinez
143320b577 Misc item fuckery 2023-11-01 23:11:24 -07:00
toaster
4bc8f80d64 MT_FLOATINGITEM: Don't pick (back?) up immediately
Happened very frequently with Blend Eye
2023-10-31 22:17:21 +00:00
toaster
71d301779b Blend Eye Hardcode part EX: Code the rest of the owl 2023-10-31 21:47:18 +00:00
toaster
70b09c647f A_ForceWin: Health should not matter 2023-10-31 20:15:50 +00:00
toaster
c202b603da P_SupermanLook4Players: Do not allow focusing on respawning players 2023-10-31 20:15:23 +00:00
toaster
0bf9ad85c1 Obj_OrbinautJawzCollide: Orbinauts, Jawz, and Gachabom will die on collision with MF_PAIN objects 2023-10-31 20:13:50 +00:00
toaster
7e362b1ee8 MT_BLENDEYE_PUYO, MT_SPIKEDTARGET: Hardcode simple thinkers/init/death behaviour 2023-10-30 00:13:03 +00:00
toaster
c3380b8f5d Boss-related files: Adjust/add top-of-file copyright info 2023-10-30 00:12:12 +00:00
toaster
d9d137be77 VS_PredictAroundArena: Tidy up condition 2023-10-30 00:11:05 +00:00
toaster
e648db685c Make several Puyo Puyo sounds singular
Used in the fight
2023-10-29 23:13:34 +00:00
toaster
32c40dd7d6 Merge branch 'master' of https://git.do.srb2.org/KartKrew/Kart into will-it-blend 2023-10-29 22:05:58 +00:00
toaster
1c12b28498 Blend Eye Hardcode part 2
- VS_ArenaCenterInit - setting up the boss arena centerpoint
- VS_GetArena - Getting a particular arena
- VS_PredictAroundArena - Predict momentum of object around arena
- VS_RandomPointOnArena - Select random position around arena
2023-10-29 22:04:50 +00:00
AJ Martinez
429f84f6b6 Fix bad null check for sliptide zip indicator 2023-10-29 15:02:05 -07:00
toaster
506652c5df Blend Eye Hardcode part 1
Object, state, sprite, and sound defnitions
2023-10-29 17:41:49 +00:00
Oni
fc982e84fd Merge branch 'duel-items-in-bonus' into 'master'
Spawn Duel items in GP Bonus

See merge request KartKrew/Kart!1584
2023-10-29 16:07:29 +00:00
toaster
4c5005d46f K_StartingBumperCount: Versus contexts also have a GP difficulty-locked quantity 2023-10-29 12:42:30 +00:00
toaster
388b14e956 Merge branch 'master' of https://git.do.srb2.org/KartKrew/Kart into will-it-blend
# Conflicts:
#	src/k_podium.c
2023-10-29 12:36:30 +00:00
AJ Martinez
1a75bc2e00 Fix Duel Bonus items being shortcircuited in P_AllowMobjSpawn 2023-10-29 05:28:45 -07:00
Oni
d79f723138 Merge branch 'flame-shield-fixups' into 'master'
Flame Shield fixups

See merge request KartKrew/Kart!1585
2023-10-29 06:17:22 +00:00
Oni
f5c1180095 Merge branch 'turn-solver-leniency' into 'master'
Sliptide/drift exit cleanup

See merge request KartKrew/Kart!1576
2023-10-29 06:08:22 +00:00
Oni
8557a7250f Merge branch 'prison-difficulty' into 'master'
Prison difficulty modes

See merge request KartKrew/Kart!1583
2023-10-29 06:07:42 +00:00
Oni
263eb3dd87 Merge branch 'podium-polished' into 'master'
Podium rank screen polished

See merge request KartKrew/Kart!1588
2023-10-29 06:04:22 +00:00
Sal
cecd81b4aa Podium rank screen polished 2023-10-29 06:04:22 +00:00
AJ Martinez
7dba0c9aba Don't do gameplay controller vibration after finishing 2023-10-27 23:31:08 -07:00
AJ Martinez
b7892fd5d1 HACK: Lift all inputs when wipes execute 2023-10-27 22:37:56 -07:00
AJ Martinez
79a2c9a61d Flame Shield fixups 2023-10-27 21:05:18 -07:00
toaster
926c9dbec9 MF_BOSS should be immune to deathpits by default
Makes some arena design considerations easier
2023-10-26 23:54:22 +01:00
toaster
c5f7f93e20 Spectator intermission: Only use boss name to describe the Round if the cool boss intro occoured at level load. 2023-10-26 20:21:33 +01:00
toaster
7aa40f1a0a Y_RoundQueueDrawer: Support the star bonus round dot for queued gametypes that don't have GTR_PRISONS 2023-10-25 23:41:08 +01:00
toaster
e060e9dadc More consistent handling of special event round icons
- Gametypes have "GPpic" and "GPpicMini" parameters
- These are shown in contexts where a Round Number would be shown in GP, but an eventmode is under way.
- Instead of having different rules to show up on the pause menu, titlecard, and tally/intermission...
    - Pause Menu Roundqueue, Tally, and Intermission have all been aligned to the same rules.
    - As long as the titlecard is standard, it will show the GP Pic per those rules. (GTR_SPECIALSTART and GTR_BOSS still have their unique behaviour here)
2023-10-25 20:34:40 +01:00
toaster
c673bb3ea9 K_PointLimitForGametype: Fix up cv_pointlimit handling
- K_Cooperative is 1st priority
- K_CanChangeRules is 2nd
2023-10-25 18:08:31 +01:00
toaster
fe26af8187 MT_OVERLAY: Support setting fuse 2023-10-25 17:46:11 +01:00
toaster
c72fcca57e Adjust the circumstances players can get lives in GP contexts
- Permit awarding in A_ForceWin
    - Set var1 to 1 to do so
- More tightly restrict against awarding in GPEVENT_SPECIAL specifically
2023-10-25 17:45:58 +01:00
toaster
9cbaaa2f11 Defer owner->xtralife sound/animation not covered by Ring Total until Bonuses have been evaluated
Makes more sense for Prison Break, accomodates weird combinatorial custom gametypes
2023-10-25 17:27:02 +01:00
toaster
c50edc684c Tally in GP contexts: Recognise earned lives from other sources, not just Ring Total
- If owner->xtralife isn't 0...
    - For every 20 Rings we count up, increment livesAdded.
    - If at the end of the ring count livesAdded is less than owner->xtralife, set livesAdded to that value.
- Every time livesAdded is changed, play the sound and set the blink.
- Caps the number of added lives to the same as P_GivePlayerLives would permit.
2023-10-25 16:11:57 +01:00