Commit graph

20811 commits

Author SHA1 Message Date
James R
a29d43d3b5 Restore save_p after P_LoadLevel
P_LoadLevel calls some functions that save gamedata and
unset save_p.
2022-12-21 22:45:46 -08:00
toaster
33167078c8 Merge branch 'capsules-improvement' into 'master'
Break the Capsules additions

See merge request KartKrew/Kart!793
2022-12-20 21:26:46 +00:00
Oni
62906ebd4e Merge branch 'unlockables-undefeatable' into 'master'
Unlockables Undefeatable

Closes #350 and #324

See merge request KartKrew/Kart!789
2022-12-19 22:21:30 +00:00
toaster
8edf099f78 Sal's review: Clear levels on gamedata addition by default
Instead, if you want an exception - in the *same* MainCfg block, set `doClearLevels = False` (or `0`, or `No`)
2022-12-19 21:26:52 +00:00
toaster
d0cd059c5e Rework the Level List functions to operate off a provided levelsearch_t pointer.
* Prevents the dependency on a `levellist` global that could be corrupted
* Fixes the issue where cups that were not unlocked would not show up on the cup select (because `M_MapLocked` would make `M_CanShowLevelInList` fail).
* Shows both Race and Battle maps in the cup unlock preview.
2022-12-19 21:18:36 +00:00
toaster
8e88a840bb Merge branch 'master' of https://git.do.srb2.org/KartKrew/Kart into unlockables-undefeatable
# Conflicts:
#	src/k_menudraw.c
#	src/k_menufunc.c
2022-12-19 20:13:44 +00:00
toaster
f693faeaa3 Merge branch 'cmake-nodynamicbase' into 'master'
Remove dynamic base from CMake target link options

See merge request KartKrew/Kart!827
2022-12-19 19:54:10 +00:00
toaster
a62282aa4e Make Wl,--disable-dynamicbase its own link option seperate from -static 2022-12-19 19:43:31 +00:00
toaster
9c8601ed9e Merge branch 'fix-soundorg' into 'master'
Fix not being able to play sounds from sector->soundorg

See merge request KartKrew/Kart!828
2022-12-19 12:03:44 +00:00
Sally Coolatta
e959ff954c Merge branch 'master' into capsules-improvement 2022-12-19 03:27:13 -05:00
Sally Coolatta
fed08a28a1 Make Gachabom stay still when tossing forward 2022-12-19 01:50:14 -05:00
Sally Coolatta
321c8bf976 Update k_roulette.c 2022-12-19 01:13:44 -05:00
Sally Coolatta
021f829112 Update k_roulette.c 2022-12-19 01:12:18 -05:00
Sally Coolatta
a7ff0afc8b Merge branch 'master' into capsules-improvement 2022-12-19 01:12:07 -05:00
Sal
3d33b95094 Merge branch 'spring-terrain' into 'master'
Spring terrain

Closes #362

See merge request KartKrew/Kart!820
2022-12-19 05:27:40 +00:00
James R
d3b8f295b8 Fix not being able to play sounds from sector->soundorg 2022-12-18 21:10:31 -08:00
James R
eef944bb1b Play spring TERRAIN sfx from sector 2022-12-18 21:09:29 -08:00
James R
8d39f0e60f Add springStrength and springStarColor to TERRAIN 2022-12-18 21:09:29 -08:00
James R
4281adc60d Separate most of P_DoSpring into P_DoSpringEx 2022-12-18 21:09:29 -08:00
Sal
48d5af71fb Merge branch 'adjust-spdinash-charge' into 'master'
Adjust spindash charge time and power

Closes #341

See merge request KartKrew/Kart!825
2022-12-19 04:52:15 +00:00
Sal
a3583f5a9d Merge branch 'battle-cups' into 'master'
Battle Cups + Re-order level select

Closes #372

See merge request KartKrew/Kart!826
2022-12-19 04:43:35 +00:00
toaster
32e53bbd83 Remove dynamic base from CMake target link options
Permits functional debugging of crash reports by preventing ASLR
2022-12-18 22:23:30 +00:00
Sal
d504af7b39 Merge branch 'garden-top-tweak' into 'master'
Garden top tweaks

Closes #342

See merge request KartKrew/Kart!824
2022-12-18 17:08:20 +00:00
Sal
2a6e33490a Merge branch 'scripts.pk3' into 'master'
Rename patch.pk3 to scripts.pk3

Closes #344

See merge request KartKrew/Kart!823
2022-12-18 17:08:07 +00:00
Sal
e53412f509 Merge branch 'fix-spectator-ebrake' into 'master'
Don't show ebrake visuals for spectators

Closes #355

See merge request KartKrew/Kart!822
2022-12-18 17:07:47 +00:00
toaster
6a5029c83b Use GTR_NOCUPSELECT as the controlling factor in advancemap next 2022-12-18 14:45:31 +00:00
toaster
e0412ab851 Fix pageno if greater than permitted 2022-12-18 14:42:18 +00:00
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
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
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
659dc8270e Roulette speed thing
- Slightly slower at start
- More reasonable default
2022-12-18 01:10:34 -05:00