Commit graph

21117 commits

Author SHA1 Message Date
toaster
d25e59535c Invalidate all instances of the same map across multiple cups' cachedlevels, so that it DEFINITELY will be assigned to the first cup in the linked list in P_InitMapData. 2022-12-18 14:40:16 +00:00
toaster
f9bdfd8a50 Fix typings for map index 2022-12-18 14:25:38 +00:00
toaster
ecfcc1356b Don't permit duplicate maps across multiple cups in time attack. A map is only valid for its later groupings in Grand Prix and multiplayer. 2022-12-18 14:08:26 +00:00
toaster
8809c68d55 Merge branch 'master' of https://git.do.srb2.org/KartKrew/Kart into battle-cups 2022-12-18 14:02:23 +00:00
toaster
15a733a344 Add I_Error for inability to allocate cuplist.builtgrid 2022-12-18 14:02:00 +00:00
toaster
facea912f4 Fix memory corruption in M_LevelListFromGametype 2022-12-18 13:58:39 +00:00
toaster
b9f18ffc24 More things use the menu map selection rules
* G_GetFirstMapOfGametype now uses the menu functions instead of repeating the effort
* GTR_NOCUPSELECT - allows gametypes to opt out of cup selection
2022-12-18 13:57:39 +00:00
James R
873b598409 Reduce spindash top speed
This was carefully adjusted so that Mecha Sonic reaches
199% top speed, barely shy of 200%. Previously, Mecha and
even down to Espio could overcharge a spindash to reach
Tripwire Blaster state.
2022-12-18 05:23:02 -08:00
toaster
ed85fb2e79 Clean up cup-related conditions for M_CanShowLevelInList 2022-12-18 13:20:50 +00:00
toaster
d703a02e6c Fix M_DrawCupSelect picking selected cup badly 2022-12-18 13:12:05 +00:00
toaster
7ff46e31b4 Fix usage of levellist.typeoflevel in M_GetNextLevelInList 2022-12-18 12:26:28 +00:00
toaster
286331b5c9 When doubling the cupgrid.builtgrid, memset the new region to prevent bad info 2022-12-18 12:25:37 +00:00
James R
9f2a83fa03 Slightly decrease spindash charge time
Also improve math precision by doing multiplication before
division.
2022-12-18 01:59:23 -08:00
Sally Coolatta
f89027e95e Fix it speeding off too fast at the start now 2022-12-18 04:45:20 -05:00
Sally Coolatta
f9da9b0617 Fix it still getting caught
I'm scared of raw MF_NOCLIP but maybe it's OK
2022-12-18 04:44:01 -05:00
Sal
7f9ac1e9e4 Merge branch 'roulette-speed-thing' into 'master'
Roulette speed thing

See merge request KartKrew/Kart!819
2022-12-18 09:32:35 +00:00
James R
6c75c9b2b1 Backthrow Garden Top in look direction if on ground 2022-12-18 01:29:34 -08:00
James R
134c4b7d66 Buff Garden Top acceleration from 800% to 1200% 2022-12-18 01:23:10 -08:00
James R
80d1b051b4 Rename patch.pk3 to scripts.pk3 2022-12-18 01:08:15 -08:00
James R
84c571259f Don't show ebrake visuals for spectators 2022-12-18 00:58:26 -08:00
Sally Coolatta
5f005cb9a7 Bananas deal 30 damage instead of default of 10 2022-12-18 03:31:47 -05:00
Sally Coolatta
ad005f461e Increase UFO base speed 2022-12-18 03:30:57 -05:00
Sally Coolatta
abcff39cd5 Give UFO MF_NOCLIPHEIGHT
Makes it go thru fences + not get caught on slopes
2022-12-18 02:50:59 -05:00
Sally Coolatta
526a2b7de1 Fix not being able to use map command to go to SS 2022-12-18 02:43:31 -05:00
VelocitOni
8cd36dbf03 Merge branch 'master' into unlockables-undefeatable 2022-12-18 01:59:04 -05:00
Oni
b42d52e80c Merge branch 'upside-down-spring-stars' into 'master'
Fix spring stars not spawning for upside down vertical springs

See merge request KartKrew/Kart!818
2022-12-18 06:54:44 +00:00
Sal
2410ea7988 Merge branch 'bomb-punt-fixes' into 'master'
Fix punting a fully deployed mine if you are invincible

See merge request KartKrew/Kart!815
2022-12-18 06:40:47 +00:00
Sal
b7142746d9 Merge branch 'fix-eggmark-intangible' into 'master'
Fix eggman mark becoming intagible to players who previously hit one

Closes #369

See merge request KartKrew/Kart!813
2022-12-18 06:30:33 +00:00
Sally Coolatta
a6e1731538 Merge branch 'master' into special-stages 2022-12-18 01:12:17 -05:00
Sally Coolatta
659dc8270e Roulette speed thing
- Slightly slower at start
- More reasonable default
2022-12-18 01:10:34 -05:00
Sal
076858970b Merge branch 'fix-opengl-clip-bottom-right' into 'master'
Fix item roulette scrolling past bottom of HUD box in OpenGL

See merge request KartKrew/Kart!816
2022-12-18 06:01:27 +00:00
Sal
bbcf85d50a Merge branch 'fix-first-capsule' into 'master'
Fix HUD crash if popping a capsule before any item box

Closes #368

See merge request KartKrew/Kart!817
2022-12-18 06:01:20 +00:00
Sally Coolatta
9ba5a97aa4 Set actual firstDist for Special Stages
Fixes wild roulette speed
2022-12-18 01:00:28 -05:00
James R
ab42c47373 .gitignore: add CMakeUserPresets.json 2022-12-17 21:23:07 -08:00
James R
12052a48de Fix spring stars not spawning for upside down vertical springs 2022-12-17 20:09:23 -08:00
James R
374342358d Fix HUD item flicker crash
Fixes item capsule award if a roulette was not rolled
sometime before.
2022-12-17 18:55:38 -08:00
James R
3a40352679 opengl: fix bottom and right edge of clip rect 2022-12-17 18:38:40 -08:00
James R
182c673677 Fix eggman mark becoming intagible to players who previously hit one
Specifically, if a player hit an eggmark and didn't roll
another item before hitting another eggmark.
2022-12-17 17:30:59 -08:00
toaster
6659e78c04 Battle cups
- The cups they're associated with for GP Bonus Round
- Fixes the issue where when opening Ring Cup, Green Hills would be first in the listing because its header is defined before the rest of the cup's maps
- One core set of functions that works between multiple modes
Will merge conflict with Unlockables Undefeatable
2022-12-18 01:08:18 +00:00
Oni
6247d42971 Merge branch 'musicdef-update' into 'master'
First Musicdef changes in preparation for music test

See merge request KartKrew/Kart!812
2022-12-18 00:28:23 +00:00
Sal
60d2f250b7 Merge branch 'broly-ease' into 'master'
Use sinusoidial interpolation for Broly ki

See merge request KartKrew/Kart!811
2022-12-17 23:44:16 +00:00
Sal
b02aa713d3 Merge branch 'slightly-better-colorize' into 'master'
Slightly improve colorize's luminance method

See merge request KartKrew/Kart!810
2022-12-17 23:44:01 +00:00
toaster
5f9854e898 First steps to making battle maps cup-based.
* Permit a map existing in multiple cups, rather than I_Error
    - The reason we didn't permit this before was because of marathon plans/advancemap next.
    - To that end, in that progression type, a map is only considered in its first valid cup.
2022-12-17 19:16:18 +00:00
toaster
ac423b3461 Further changes to musicdef based on discussion with Gunla
- Add "author" and "originalcomposers" fields
    - "author" is for remixes and original compositions, can be ommitted
    - "originalcomposers" will not be visible mid-game, but will be visible in music test. Stores original sound team info
- Store all strings as Zone memory instead of static arrays, since not every field will be relevant for every track
2022-12-17 17:36:44 +00:00
toaster
81fec17bb4 First Musicdef changes in preparation for music test
- Add `title` field, to permit seperation from `source`
- Store current displayed string as zone memory, to prevent repeated recalculation
2022-12-17 16:39:10 +00:00
James R
45dad16e4c Kill mine when running into it during explosion state
Fixes punting a mine if you run straight into it while
invincible.
2022-12-17 00:09:56 -08:00
Sally Coolatta
6b542805c7 Merge branch 'special-stages' of https://git.do.srb2.org/KartKrew/Kart into special-stages 2022-12-17 01:12:12 -05:00
Sally Coolatta
36e9a56f29 Add K_TimeAttackRules
Lets Time Attack capsules spawn in Free Play, and prevents Time Attack specific rules from happening in Special Stages
2022-12-17 01:05:30 -05:00
VelocitOni
7181e05cce Update k_hud.h
" trackingResult_t;" on line 31 turned into just ";" because structs use a new format now.
2022-12-16 23:12:01 -05:00
Sally Coolatta
f51a913710 Add stem 2022-12-15 23:17:40 -05:00