toaster
1e502da748
Merge branch 'master' of https://git.do.srb2.org/KartKrew/RingRacers
2024-08-17 20:16:27 +01:00
Antonio Martinez
f9b72269f7
Further checkpoint amp nerfs
2024-08-13 18:14:45 -07:00
Antonio Martinez
89544772b3
Amps for checkpoints (and small amp fixes)
2024-08-13 17:54:31 -07:00
Ashnal
df4e99b050
WIP Race Checkpoints
...
MobjList count
WIP: Checkpoints grant lap bonus
help?
can't allocate vector
fixed tagged line iteration and collision detection
Multiplayer animations and map retart fixes
Clear between maps
2024-08-13 20:20:21 -04:00
Oni
4bf99e7f16
Merge branch 'amps' into 'master'
...
Overdrive!
See merge request KartKrew/Kart!2414
2024-08-13 02:46:56 +00:00
Antonio Martinez
ed1dde5788
WIP: Separate Overdrive shield
2024-07-23 17:32:10 -07:00
Antonio Martinez
4d202fbd67
WIP: Overdrive VFX refactor
2024-07-23 17:00:17 -07:00
Antonio Martinez
81e9441218
WIP: Overdrive polish 2
2024-07-22 21:51:33 -07:00
Antonio Martinez
2b61497536
WIP - Overdrive polish
2024-07-22 20:35:28 -07:00
Antonio Martinez
199a92ebb2
WIP: Overdrive
2024-07-22 02:14:11 -07:00
AJ Martinez
4cf38b3f3f
Fix dodgy math in grow laser timer calculations
2024-06-29 18:38:45 -07:00
JugadorXEI
586e4c4cd8
Fix powerup aura being unflipped
2024-05-22 21:54:45 +02:00
JugadorXEI
cea8b9566e
Fix super flicky bobbing not being flipped, as well as the object itself
2024-05-22 21:54:45 +02:00
JugadorXEI
dbac449272
Fix hyudoro being incorrectly flipped during roaming status
2024-05-22 21:54:45 +02:00
JugadorXEI
87ddd2f794
Fix servant hand not being properly flipped
2024-05-22 21:54:40 +02:00
AJ Martinez
eab2900ac6
Increase shrink contact leniency
2024-05-20 18:47:22 -07:00
Sally Coolatta
08703be9d4
Shrink cooldown: 20sec -> 60sec
2024-05-20 17:19:42 -07:00
Oni
8c0cecf289
Merge branch 'invalid-rideroid-pickup' into 'master'
...
Fix Rideroids grabbing you out of lightsnake
Closes #1398
See merge request KartKrew/Kart!2392
2024-05-20 21:20:41 +00:00
JugadorXEI
cfc8aaa068
Fix misaligned instawhip objects when under gravflip
2024-05-19 23:48:45 +02:00
JugadorXEI
a9408fd62d
Set instawhip recharge's height offset from the start
2024-05-19 23:46:35 +02:00
JugadorXEI
636d7bb3ca
Set instawhip recharge's scale only if it differs from the player's
2024-05-19 22:24:28 +02:00
AJ Martinez
3610fb88e8
Fix Rideroids grabbing you out of lightsnake
2024-05-16 21:06:53 -07:00
James R
4485436eed
InitSpecialUFO: fix -Wsign-compare
2024-05-05 17:43:42 -07:00
Gunla
254cdc795f
Merge branch 'claw-determination' into 'master'
...
UFO determination
See merge request KartKrew/Kart!2355
2024-05-05 22:14:03 +00:00
toaster
2dc8ce330a
Review
...
- Update SAV_VERSIONMINOR so 2.0/2.1 cup backup files won't load
- Move specialDamage to grandprixinfo_t (from rank_t, per Sal review)
2024-05-05 20:36:43 +01:00
AJ Martinez
cf696ac5c7
Determination: max discount 50->40, rate .25x->.17x
2024-05-04 17:08:32 -07:00
AJ Martinez
10be033605
Cap UFO difficulty reduction at half off
2024-05-03 14:45:21 -07:00
Eidolon
f75564371d
Merge public master
2024-05-03 12:55:15 -05:00
bitten2up
cfacbd91be
Fix implicit casts of int expecting 4-byte width
...
This fixes the issue with certain compilers that have int set to
different sizes by either explicitly casting or setting templates
manually
2024-05-03 17:53:53 +00:00
AJ Martinez
7a1a4c58fb
Remove UFO damage debug print
2024-05-03 05:01:08 -07:00
AJ Martinez
e418996213
UFO determination
2024-05-03 01:49:05 -07:00
toaster
e88c162161
Also dismount DLZ rocket/rideroid if respawning for any reason
2024-05-02 00:47:04 +01:00
toaster
f2de83843b
Dismount DLZ Rocket on tumble bounce counter being nonzero, not tumble height
...
Tumble height is not set to 0 between (s)tumble events
2024-05-02 00:43:00 +01:00
AJ Martinez
9dee22a7f6
Remove powerup timer debug print
2024-04-29 19:35:49 -07:00
AJ Martinez
fdf1be6a50
Grow/invinc tweakpass
2024-04-29 19:31:36 -07:00
toaster
24a2cc12e4
Charge Aura visual: Remove in more cases
...
- Dying
- Falling into a deathpit in Sealed Star
2024-04-15 15:10:18 +01:00
Oni
3154d8ccf9
Merge branch 'emerald-disambig' into 'master'
...
Make default Emerald pickup in extra Sealed Star a fake SA2 yellow-gold Chaos Emerald
See merge request KartKrew/Kart!2268
2024-04-12 03:40:49 +00:00
Oni
ee1fb29de8
Merge branch 'no-gp-thunderdome' into 'master'
...
No thunderdome in GP
Closes #1265
See merge request KartKrew/Kart!2266
2024-04-12 03:40:20 +00:00
toaster
536840485b
The default Emerald pickup in a Sealed Star is a fake SA2 yellow-gold Chaos Emerald
...
Minimal effort disambiguation for a Sealed Star's Page 2/3 rematch from its Page 1 canon appearance, without also repeating the green Chaos Emerald.
2024-04-11 20:11:25 +01:00
Sally Coolatta
78f3d62808
No thunderdome in GP
2024-04-11 03:07:56 -04:00
James R.
19c726390a
Merge branch 'emerald-instawhip-lockout' into 'master'
...
Allow SS Emerald pickup while instawhip charging
See merge request KartKrew/Kart!2257
2024-04-11 01:37:22 +00:00
Sally Coolatta
5d452ff74f
Allow Emerald pickup while instawhip charging
2024-04-09 20:00:27 -04:00
toaster
6e9f53eab9
Correct pobby spawning for starting in reverse gravity but ending in normal gravity
2024-04-09 16:25:51 +01:00
Lach
f274d24560
Fix Poh-Bee behaviour for flipped waypoints
2024-04-09 23:34:18 +10:00
Sally Coolatta
747f09852d
SRB2 -> DRRR copyright in objects folder
2024-04-05 10:26:52 -04:00
Lach
d2a53a0e64
Adjust Adventure Air Boosters for 3D models
2024-04-04 20:41:21 +11:00
James R
551a101f7b
Hardcode SA2 Pulley (ipullup.lua)
...
Differences from Lua version:
- Does not set cusval
- Does not have individual states for pulley, hook
- Simply sets sprite on S_INVISIBLE
- Does not do P_CheckPosition, sets Z directly
- Does not spawn chain visual every tic
- Spawns a single object and vertically stretches it to
the correct length
- MT_IPULLUP has MF_SCENERY and a short-circuiting
thinker, also MF_NOBLOCKMAP so there is never any
collision against it (it is a controller)
- MT_PULLUPHOOK has MF_NOCLIP to avoid extra collisions
while moving
2024-04-03 04:37:44 -07:00
James R
e41b371096
Audience: double scale bobbing height
2024-04-02 17:44:36 -07:00
Oni
c3239b3746
Merge branch 'top-thrown-scale' into 'master'
...
Preserve scale of Garden Top when thrown
See merge request KartKrew/Kart!2213
2024-04-02 18:03:10 +00:00
toaster
d7f4cd2d8f
Copyright update for Viv Grannell specifically (the author of this commit)
2024-04-02 17:38:18 +01:00
