Commit graph

1964 commits

Author SHA1 Message Date
toaster
09a99fa06d * Make RunOverlays and A_OverlayThink more consistent.
* Incorporate drawangle support for both (flattened merge of STJr/SRB2!1599)
2022-03-18 20:59:18 +00:00
toaster
134f3b5df5 fix water fof height calculation on slopes
# Conflicts:
#	src/p_mobj.c
2022-03-18 19:54:19 +00:00
James R
df1c0fddcb Fix GCC 11 array-bounds warning in P_SetupStateAnimation
Removing inline here silences the warning somehow, it
could be a GCC bug?
2022-03-18 19:37:34 +00:00
toaster
e07fb31f72 P_ZMovement: add a P_MobjWasRemoved check after P_CheckPosition, so we can bail out if the mobj was removed (by Lua most likely)
# Conflicts:
#	src/p_mobj.c
2022-03-18 17:35:34 +00:00
toaster
f073218532 Merge branch 'master' of https://git.do.srb2.org/KartKrew/Kart.git into boss
# Conflicts:
#	src/m_menu.c
2022-03-18 09:07:13 +00:00
toaster
4839586617 Allow GTR_PAPERITEMS to function in a hypothetical GTR_CIRCUIT-based custom gametype. 2022-03-07 13:45:15 +00:00
toaster
590d236b66 * Make item boxes spawn in at map start in race.
* Make them use MF_NOBLOCKMAP as well as MF_NOCLIPTHING so bots won't do weird things when Battle bots are coded way down the line.
2022-03-07 12:37:47 +00:00
toaster
f518ae5c58 * Fix some music and visual bugs with dying in Battle at the conclusion of the round.
* Fix emeralds HUD overlapping minimap in 2P splits.
2022-03-06 18:19:28 +00:00
toaster
bf43784d22 This is a doozy...
HUD:
* Miniaturised Spheres and Emeralds HUD for 3P/4P.
* Repair 3P minimap.
* Move accessibility icons in 3P/4P to next to the lap/bumper sticker (currently only kickstartaccel exists)
* Change language on menu retry to be more generalised.
* Adjust HUD code structuring a bit.

MECHANICAL:
* Now correctly set number of bumpers in Break the Capsules to 1 (from 3).
* The above required reworking K_SpawnBattleCapsules into K_BattleInit, which is a good staging ground to handle more battle-specific setup in future.
* Do not spawn Emeralds or Sphereboxes in Break the Capsules.
* If everyone is WANTED... nobody is.
* Try to handle exceptions to timelimits a little more thoroughly (still not perfect).
* Disable pointlimits in bosses.
2022-03-05 22:31:43 +00:00
toaster
329c2a60a2 Fix item boxes not spawning in Break the Capsules.
Specifically, they turn invisible on tic 0, then make a decision about whether to replace themselves with MT_PAPERITEMSPOT or simply become visible (with an explosion puff, same as how they respawn) when starttime is reached.

This delay also applies to Race, which I think is a good thing, considering Item Capsules already are not collectable during POSITION, but I can change it if others disagree.
2022-02-27 17:11:18 +00:00
toaster
c1f3237157 Boss API + assorted relevant bugfixes, will go over the featureset of this branch with a fine toothed comb when it's time to write the merge request description so this is all you're getting right now 2022-02-24 21:19:03 +00:00
James R
82f4364eb4 pedantic: fix misc leniencies and GNU-isms 2022-02-20 03:28:22 -08:00
Sally Coolatta
39da886447 Merge branch 'master' into invinc-color-fix 2022-02-16 23:01:23 -05:00
Sally Coolatta
a750fdd810 Invincibility wasn't using K_RainbowColor anymore, what the function was designed for... 2022-02-16 23:01:07 -05:00
SteelT
a793af47c5 Merge branch 'grow-shrink-shoe-polish' into 'master'
More extremely scaled grow & shrink players!

See merge request KartKrew/Kart!534
2022-01-23 18:59:39 +00:00
toaster
93dfbf382c The "free" changes from framezero - the crash fixes that have no complexity and therefore no negative consequence to introduce 2022-01-20 19:27:02 +00:00
Sally Coolatta
38e741af76 Merge branch 'master' into grow-shrink-shoe-polish 2022-01-18 02:57:08 -05:00
Sally Coolatta
8acdbf7df8 Merge branch 'master' into grow-shrink-shoe-polish 2022-01-18 02:55:56 -05:00
James R
d06355018d Track skybox within player struct
TODO: Lua

Splitscreen and change viewpoint uses the proper skyboxes!
2022-01-17 22:46:01 -08:00
SteelT
d384d1b828 Merge branch 'precip-overflow' into 'master'
Fix precip sector search deadlock

See merge request KartKrew/Kart!525
2022-01-16 23:42:33 +00:00
toaster
ef6ee928ac After I experienced a few consistent crashes for invalid subsector references in P_BounceMove/P_SlideMove, add a few extra checks for whether the mobj is removed. 2022-01-16 22:03:27 +00:00
toaster
3eac1fed0f Rewrote the fix to:
- be comprehensive (still allow rain to be heard against the topleft corner, not just the bottomright corner)
- not use volatile (now uses INT64)
- not perform this pointinsubsector search if the map has no rain/thunder (yes I tested EHZ with this check dummied out so this bug won't crop up again later)
2022-01-16 20:57:56 +00:00
James R
521f8eac3e Fix overflow in precipitation sector search 2022-01-14 22:36:49 -08:00
Sally Coolatta
c606e1e96b Force shrink can be toggled individually online
In preparation for a "make yourself small by default" cheat on the char select like SMK.
2022-01-09 04:08:26 -05:00
Sally Coolatta
23f9649fb9 More extremely scaled grow & shrink players!
- Grow is x2 instead of x1.5.
- Shrink is x0.5 instead of x0.75.
- Physics were left ALONE!! This is purely a HITBOX / VISUAL change!! Grow isn't any faster, and Shrink isn't any slower!! The only potential worry is low ceilings in maps!!
2022-01-09 00:00:01 -05:00
Sally Coolatta
ef5a4f01d4 Merge branch 'master' into terrain-lump 2022-01-04 12:34:47 -05:00
Sal
20b1ddb4d3 Merge branch 'dont-scale-gravity' into 'master'
Scale gravity with map scale instead of object scale

See merge request KartKrew/Kart!513
2022-01-04 04:22:42 +00:00
Sally Coolatta
c4385166e5 Scale gravity with map scale instead of object scale 2022-01-03 20:02:22 -05:00
Sally Coolatta
762ee92c06 Purple spark electricity UNCAPPED 2021-12-25 03:53:55 -05:00
Sally Coolatta
b87b00fcda Apply the same fix for instashield overlay 2021-12-24 23:07:12 -05:00
Sally Coolatta
d63ce0c803 Fix jawz reticule in uncapped 2021-12-24 22:52:38 -05:00
Sally Coolatta
0a915a719b Hack to fix drift spark explosion while keeping its interpolation 2021-12-24 13:17:57 -05:00
Sally Coolatta
6c13ddca01 Rename PitchRoll stuff back
I did a find+replace because I realized the functions I added were named too similar to other ones & to make the purpose more obvious ... but it ended up changing them too anyway! Gah!
2021-12-24 13:00:12 -05:00
Sally Coolatta
cc250afd45 P_InitAngle, to fix angle interpolation on spawning objects 2021-12-24 12:45:51 -05:00
Sally Coolatta
c203bbdce9 Merge branch 'master' into terrain-lump 2021-12-23 03:05:10 -05:00
SteelT
3ce3fd0366 Merge branch 'getmobjzmovement' into 'master'
P_GetMobjZMovement

See merge request KartKrew/Kart!441
2021-12-21 07:07:10 +00:00
Sally Coolatta
21e868216e Merge remote-tracking branch 'origin/getmobjzmovement' into terrain-lump 2021-12-18 21:25:20 -05:00
lachablock
e14af65d52 Merge remote-tracking branch 'origin/master' into getmobjzmovement 2021-12-19 13:22:59 +11:00
Sally Coolatta
0cd3efc76d Merge branch 'master' into terrain-lump 2021-12-18 18:36:05 -05:00
James R
51941f5896 MF_NOSQUISH to disable K_Squish 2021-12-16 23:03:39 -08:00
Sal
809c766c99 Merge branch 'sphere-boxes' into 'master'
Blue Sphere boxes in Battle

See merge request KartKrew/Kart!494
2021-12-16 10:09:03 +00:00
Sal
463cbcef62 Merge branch 'gasping-for-air' into 'master'
Add gasp sound effect when emerging from water

See merge request KartKrew/Kart!484
2021-12-15 04:16:46 +00:00
James R
1140410e2c Spawn SPHERE BOXES randomly in Battle
They look like random item boxes (the ones in Race) but
have a blue sphere inside of them. One box is worth 10
blue spheres. More boxes spawn during Overtime.

New sprite: SBOX
2021-12-14 01:05:42 -08:00
James R
184a89db43 Always play splash sfx when entering/exiting water 2021-12-12 03:30:08 -08:00
James R
35238510e3 Use sfx_s3k38 2021-12-12 03:28:59 -08:00
Sally Coolatta
8d5cec5ebf Move where PF_HITFINISHLINE is removed
Also removes a few remaining instances of player->bot being checked to affect gameplay where it shouldn't from vanilla, but it's code that is rarely used / completely unused anyway.
2021-12-11 04:12:06 -05:00
James R
a617563bd8 Add gasp sfx when exiting water, but not with bubble shield 2021-12-09 17:44:23 -08:00
Sally Coolatta
bf4b47a2cf Merge branch 'master' into terrain-lump 2021-12-09 03:46:01 -05:00
Sally Coolatta
d7a8ec9fbd Liquid terrain functions 2021-12-09 02:37:44 -05:00
Sally Coolatta
53d777788a Friction value is used, implemented DefaultTerrain 2021-12-09 01:21:34 -05:00