Commit graph

20901 commits

Author SHA1 Message Date
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
Sally Coolatta
6b78cd2428 Adjust UFO pieces 2022-12-15 23:17:39 -05:00
Sally Coolatta
a524422071 First pass on UFO visuals 2022-12-15 23:17:38 -05:00
Sally Coolatta
2c5df772c8 Prevent possible overflow, just in case 2022-12-15 23:16:28 -05:00
Sally Coolatta
eab34651bf Sneakers deal contact damage to the UFO 2022-12-15 23:16:27 -05:00
Sally Coolatta
2ea84c2901 Add prints for winning / losing for now. 2022-12-15 23:16:27 -05:00
Sally Coolatta
577f505342 Set eventmode when testing Special Stages from ZB 2022-12-15 23:16:26 -05:00
Sally Coolatta
e7ae65f30e Next round of UFO tweaks
- Damage depends on item thrown at it.
- UFO speeds up when getting damaged.
- Made UFO speed up more often.
- First Special Stage item column is active farther back.
- Items can't be disabled if rules can't be changed.
- Item column code with items disabled uses fractional precision.
- Fixed bug with the new item table code to support different lengths better.
- Tweaked UFO speed values again.
- UFO is no longer solid.
2022-12-15 23:16:26 -05:00
Sally Coolatta
d1b2e42560 Lots more UFO work
- UFO is able to be damaged. (No damage values set yet, so it has an obnoxious amount of health.)
- Emerald becomes collectible when fully damaged.
- Jawz can target the UFO.
- Tweaked some of the speed values.
2022-12-15 23:12:52 -05:00
Sally Coolatta
dc6caf1eb3 Implement the Special Stage item table 2022-12-15 23:12:51 -05:00
Sally Coolatta
0a733c7265 First pass on Special Stage UFO
- UFO spawns at first waypoint for TOL_SPECIAL maps
- UFO moves up the waypoints, the speed varying based on your position relative to it and your own speed.
- You are able to tether off of the UFO.
- Bugfix: PathfindThruCircuit no longer fails when reaching a one-ended waypoint.

Damage is my next project but I wanted to get this committed for now.
2022-12-15 23:06:17 -05: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