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
c89fb15399
Use our updated name where appropriate. (text strings only)
2022-12-19 21:48:19 +00:00
toaster
0214f62057
Add descriptions for TESTERS and HOSTTESTERS builds.
2022-12-19 21:47:37 +00:00
toaster
48a43eb9af
Merge branch 'master' of https://git.do.srb2.org/KartKrew/Kart into cmake-testers
2022-12-19 21:41:25 +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
d106c0a329
Add TESTERS and HOSTTESTERS builds to CMake options
2022-12-19 19:52:53 +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
9d350c64c8
Allow SPB to attack the UFO properly
2022-12-19 04:49:53 -05:00
Sally Coolatta
b0598c2182
Merge branch 'noclip-isnt-noclipthing' into special-stages
2022-12-19 04:45:51 -05:00
Sally Coolatta
65e6e54e7d
Alter MF_NOCLIP behavior
...
- Things with MF_NOCLIP can still run code when touching things, but won't be blocked by them.
- Things need both (MF_NOCLIP|MF_NOCLIPTHING) to do a single movement step, since MF_NOCLIP can do thing collision now.
2022-12-19 04:39:46 -05:00
Sally Coolatta
e959ff954c
Merge branch 'master' into capsules-improvement
2022-12-19 03:27:13 -05:00
Sally Coolatta
7427daf7ad
Jawz uses Battle's steering in Special Stages
...
Makes it miss the UFO's erratic movement less often
2022-12-19 02:10:11 -05:00
Sally Coolatta
630e5d4cf1
Add less speed when damaging the UFO.
...
Brings it back to old behavior before speed increase
2022-12-19 02:00:46 -05:00
Sally Coolatta
85604cfd2e
Merge branch 'master' into special-stages
2022-12-19 01:53:41 -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
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