Commit graph

20698 commits

Author SHA1 Message Date
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
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
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
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
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
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
107ec27846 Go back to the old one, but gamma correct it
Did more research into the subject, the formula I used before was fine and was just expecting gamma correction.
2022-12-15 22:29:38 -05:00
Sally Coolatta
4feba88327 Slightly improve colorize's luminance method
Before I was using coefficents from another formula I forget the source of, but over time I've stopped liking how it looked -- just considers greens far too bright. Here I'm trying out BT.601 coefficents instead (https://en.wikipedia.org/wiki/Rec._601).

These are also the coefficients Doom itself used for invulnerability's invert effect (if you ignore the typo Carmack made :p), so this checks out.
2022-12-15 22:08:29 -05:00
Sally Coolatta
5ffcfb558f #define BOOL boolean -> #define boolean BOOL 2022-12-15 20:54:15 -05:00
Sal
1b4c910cbf Merge branch 'cmake-sources' into 'master'
Move sources list from Sourcefile to CMakeLists.txt

See merge request KartKrew/Kart!795
2022-12-16 01:08:40 +00:00
Sally Coolatta
3f2209b853 Newly added files to CMakeLists.txt 2022-12-15 19:55:29 -05:00
Sally Coolatta
38d8281a6b Merge branch 'master' into cmake-sources 2022-12-15 19:54:59 -05:00
Sal
03b37e2871 Merge branch 'deterministic-roulette' into 'master'
Deterministic roulette

See merge request KartKrew/Kart!808
2022-12-16 00:50:45 +00:00
Sal
aa29ac5ada Merge branch 'enable-cxx' into 'master'
Enable C++17 additionally with Catch2 unit testing

See merge request KartKrew/Kart!807
2022-12-15 22:54:27 +00:00
Sally Coolatta
05413eeb2d Add proper comments for each function
(I think this is the only code style I want to actively enforce :p)
2022-12-15 16:19:06 -05:00
James R
01f8fb3233 Use sinusoidial interpolation for Broly ki 2022-12-15 05:16:19 -08:00
James R
7f569fe168 Rename K_SpawnBrolyKi to Obj_SpawnBrolyKi, move to objects/broly.c, spawn MT_BROLY 2022-12-15 04:14:38 -08:00
Sally Coolatta
6554c8bfb1 Improve scope handling of the roulette
All of the player_t references are now full-const instead of const pointer after a certain point. This is because I've made two mistakes so far of modifying the player with this, when it's supposed to be safe to call for HUD as well.

Also uses this split to add a more efficient way to prevent multi-Shrink/SPB.

Also handles NULL player better, for the sake of Battle's K_CreatePaperItem.
2022-12-15 02:13:46 -05:00
Sally Coolatta
167df6cca7 Remove item roulette between maps 2022-12-15 01:44:09 -05:00
Sally Coolatta
ffe9d5cd1d Properly support small splitscreen itembox 2022-12-15 01:41:34 -05:00
Sally Coolatta
f7e53ec811 Cleanup lots of the older roulette code
- Most of it now requires a reference to itemroulette_t, rather than copying all of the variables over.
- Increased the effect of Frantic Items, as the old scaling was made extremely low because  item distance was exponential back then.
- A lot of variables are pre-calculated in itemroulette_t instead of redoing the calculations every time (player count, first place's dist, etc)
- Make most of these functions only accessible by k_roulette.c
- Even when single items get forced into your roulette, the Super Ring Debt effect can happen
- Make the game support setting single items from other gametypes (Pogo Spring-only races work now)
- Fix some item distances not accounting for scale
- Prevent multiple of certain items from rolling at once; Shrinks (not a big deal) and SPBs (OH GOD NO)
2022-12-15 01:23:23 -05:00
James R
c32134849f Merge branch 'clipping-rectangle' into 'master'
Clipping rectangle

See merge request KartKrew/Kart!806
2022-12-15 04:11:56 +00:00
Oni
f4ab4d753d Merge branch 'broly' into 'master'
Broly's ki on explosions

See merge request KartKrew/Kart!809
2022-12-15 03:56:39 +00:00
James R
b97c8cd176 Make explosions louder from a distance 2022-12-14 19:54:33 -08:00