Commit graph

1970 commits

Author SHA1 Message Date
James R
196d310052 Sacrifice fun for readability :( 2021-02-16 10:48:24 -08:00
James R
dd5223f4d7 Draw an icon above players when they are typing in chat or console
A little speech bubble is drawn, with dots cycling as they type.
No typing = no dots.
2021-02-16 09:24:22 -08:00
James R
3ac803be76 Merge branch 'mirrorfixes' into 'master'
Mirror fixes

See merge request KartKrew/Kart!385
2021-02-16 11:33:13 -05:00
toaster
a210049839 Attempt to calculate postimg during chasecam hitlag - otherwise encore mode will temporarily flip back and it'll be confusing. 2021-02-15 11:43:45 +00:00
toaster
b66965185a Caltrop calstop (resolves #114).
If a ring isn't lost from the counter, don't drop a caltrop.

This is done by changing the function signature of P_GivePlayerRings to return the number of rings it has successfully given (or taken away) (which can differ from the rings provided to it). This change has been done for Lua as well.

Super Ring absorbtion now uses this system too, so you only need to change one location to modify the maximum and minimum number of rings a player can have (as far as I am aware).
2021-02-14 21:48:55 +00:00
LJ Sonic
85cd429d1d Revert "Replace all instances of P_AproxDistance with FixedHypot"
This reverts commit 498ff708bb.
2021-02-13 17:45:20 +01:00
Sally Coolatta
0d1e98c7b9 Merge branch 'master' into bot-updates 2021-02-07 15:49:28 -05:00
Sally Coolatta
4535a642d6 Merge branch 'master' into spindash-rebalance 2021-02-07 02:35:55 -05:00
Sally Coolatta
fb1d495b5c Bots can recover from dying
Rogue code that came back from vanilla
2021-02-06 01:40:39 -05:00
Sally Coolatta
7584274636 Spring/spindash grease & invincibility gives you slope resistence 2021-02-05 23:28:22 -05:00
Sally Coolatta
cc2704bc87 Death animation
Art is missing, but functionality is complete.

The kart corpse is also placeable as type 4095. No way to set its color currently, it simply defaults to SKINCOLOR_RED.
2021-02-02 22:36:56 -05:00
Sal
df2a2b3b46 Merge branch 'lap-executor-edit' into 'master'
Lap executor edit

See merge request KartKrew/Kart!356
2021-02-02 01:30:07 -05:00
Sally Coolatta
092a24540b Camera no longer updates while you're in hitlag
The camera zooming out made it hard to focus on the hit, which is the opposite of what hitlag is intended to do :V
2021-02-01 22:28:02 -05:00
Sally Coolatta
d627da7510 Fix lap executors not happening, and also edit it so they act like Each Time rather than Once
Allows for simplified executor logic on Desert Palace and Chrome Gadget, possibly Egg Zeppelin too
2021-02-01 14:34:48 -05:00
James R
763e42625d Merge branch 'fix-doublejump-divby0' into 'next'
Fix a divby0 when you have specific character stats.

See merge request STJr/SRB2!1374
2021-01-31 01:17:41 -05:00
LJ Sonic
05a75758ab Merge branch 'redundant-hypot' into 'next'
Replace P_AproxDistance with FixedHypot, and replace FixedHypot's algorithm with R_PointToDist2's

See merge request STJr/SRB2!1320
2021-01-25 18:08:25 -05:00
GoldenTails
f11850a0eb Fix a divby0 when you have SF_MULTIABILITY, CA_DOUBLEJUMP, and actionspd -FRACUNIT. 2021-01-10 10:01:31 -06:00
Sally Coolatta
cfda66103d Merge branch 'master' into just-tumble 2021-01-06 23:02:51 -05:00
Sal
57e69603a4 Merge branch 'natural-camera-outrun' into 'master'
Add distance easing to the camera, so it doesn't jitter around too much when you're stuck.

See merge request KartKrew/Kart!310
2021-01-06 22:27:09 -05:00
Sally Coolatta
c75b9cd89f Merge branch 'master' into natural-camera-outrun 2021-01-06 17:57:04 -05:00
Latapostrophe
74a39837bb Merge conflicts 2021-01-06 18:33:42 +01:00
James R
f3fa2c4f32 Merge branch 'shieldless' into 'next'
Add new skin flag SF_NOSHIELDABILITY

See merge request STJr/SRB2!1331
2020-12-15 21:00:53 -05:00
James R
bde40c36b1 Merge branch 'team-elementalfire' into 'next'
Player-Colored Elemental Fire for competitive gametypes

See merge request STJr/SRB2!1312
2020-12-15 20:47:45 -05:00
katsy
ead6180ef5 lol 2020-12-14 05:32:51 -06:00
katsy
03c9543db9 you too 2020-12-14 04:06:28 -05:00
katsy
3e73577b8e add checks for new flag, make emergency jump call shieldspecial 2020-12-14 04:03:14 -05:00
James R
498ff708bb Replace all instances of P_AproxDistance with FixedHypot 2020-12-12 14:53:54 -08:00
James R
e305de037c Merge branch 'player-speed' into 'next'
Make player->speed and other things use R_PointToDist2

See merge request STJr/SRB2!1309
2020-12-12 17:38:02 -05:00
James R
956fd338f0 Merge branch 'oldguards' into 'next'
Kill remaining HAVE_BLUA and SEENAMES

See merge request STJr/SRB2!1319
2020-12-12 17:34:04 -05:00
James R
20e0d99ea0 Remove trailing whitespace 2020-12-12 02:40:46 -08:00
James R
41f1b3b97c Kill SEENAMES 2020-12-12 02:11:23 -08:00
Zippy_Zolton
b153276057 Player-Colored Elemental Fire for competitive gametypes 2020-12-10 20:37:50 -06:00
Zippy_Zolton
59f7b40497 Make player->speed use R_PointToDist2 2020-12-10 16:09:43 -06:00
James R
63a2ee1378 Merge branch 'super-giverings' into 'next'
Make P_DoSuperTransformation (with giverings) only set 50 rings if you have less than 50

See merge request STJr/SRB2!1278
2020-12-10 15:27:01 -05:00
James R
79df0c5366 Merge branch 'CR_BRUH' into 'next'
Allow non-player objects to apply the CR_PLAYER carry type without crashing the game

See merge request STJr/SRB2!1274
2020-12-10 15:20:11 -05:00
James R
a8f61b9f7b Merge branch 'mario1up' into 'next'
Fix normal one-up sound playing in Mario mode

See merge request STJr/SRB2!1272
2020-12-10 15:15:08 -05:00
James R
ed9d5960ef Merge branch 'lastlineshit' into 'next'
Allow player.lastlinehit and player.lastsidehit to be usable outside of Knuckles' climbing ability

See merge request STJr/SRB2!1271
2020-12-10 15:14:16 -05:00
James R
df56fcca37 Merge branch 'crunchyroll' into 'next'
Prevent non-CA2_SPINDASH characters from getting crushed by roll-jumping into a crevice

See merge request STJr/SRB2!1267
2020-12-10 15:07:01 -05:00
James R
fc27bbc6e4 Merge branch 'no-spin-jump' into 'next'
Fix a Few Spin Related Bugs (Closes #286 and #360)

Closes #286 and #360

See merge request STJr/SRB2!1256
2020-12-10 15:02:29 -05:00
Zippy_Zolton
3015ee07ae thanks zap 2020-11-30 16:39:24 -06:00
Zippy_Zolton
6bfccec3c3 oops 2020-11-30 12:05:45 -06:00
Zippy_Zolton
8c836971de overhaul 2020-11-30 12:04:35 -06:00
James R
9c912f0cd4 Merge branch 'bot-fixes' into 'master'
Fix bots having weird rubberbanding in 2.2

See merge request KartKrew/Kart!337
2020-11-29 19:13:54 -05:00
James R
71553a8ad0 Merge branch 'battle-rethink' into 'master'
Battle rethink

See merge request KartKrew/Kart!335
2020-11-29 19:13:38 -05:00
Zippy_Zolton
556dd3bfca P_GivePlayerRings 2020-11-29 17:39:54 -06:00
Zippy_Zolton
96ff6d002d Make P_DoSuperTransformation (with giverings) add 50 rings instead of setting it 2020-11-29 17:16:57 -06:00
SMS Alfredo
6b83600300 Allow non-player objects to apply the CR_PLAYER carry type without crashing the game 2020-11-28 22:03:02 -06:00
toaster
f72108c4fa A whole bunch of cleanup to get most record attack/replay stuff reasonably functional.
* Fix the screen being stuck black at the very start of start record attack.
* Bump up the demoversion to 7, because I want all previous v2 demos to be guaranteed kaput (it was previously 4, but 7 is a nice number).
* Fix a ton MORE shitcausing misalignments in the replay system, this time specifically focused on getting ghosts functional.
* Plug a few holes in the "best lap" record implementation that allowed for stupidly easy records due to the way v2's finish lines work.
* Make a few follower-related things sane, to prevent spurious console prints that were getting in the way of my test prints.
2020-11-27 20:30:28 +00:00
Zippy_Zolton
9a8493f1c4 Fix normal one-up sound playing in Mario mode 2020-11-25 21:46:45 -06:00
SMS Alfredo
12f36719b4 Allow player.lastlinehit and player.lastsidehit to be used outside of Knuckles' climbing ability 2020-11-25 14:31:24 -06:00