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
lachwright
9172661e47
Prevent non-CA2_SPINDASH characters from getting crushed by roll-jumping into a crevice
2020-11-24 14:56:22 +11:00
SMS Alfredo
d33aab487a
...snickerdoodles
2020-11-23 09:23:02 -06:00
SMS Alfredo
a60a74e33e
Remove PF_SPINNING when jumping if you have SF_NOJUMPDAMAGE
2020-11-23 09:21:00 -06:00
SMS Alfredo
21d9e870aa
Revert "Fix no spin characters being able to damage enemies with their jump out of a spin without removing PF_SPINNING"
...
This reverts commit 826a4429dd
2020-11-23 09:18:05 -06:00
SMS Alfredo
fee455ec7a
Remove unneeded S_PLAY_ROLL check
2020-11-22 23:23:35 -06:00
James R
78c2fa09a0
Merge branch 'flame-orb' into 'next'
...
Flame Shield & Thunder Shield Adjustment (Closes #363 )
Closes #363
See merge request STJr/SRB2!1220
2020-11-22 17:31:23 -05:00
Jaime Ita Passos
be274a4fa9
Merge branch 'next' into spritestuff2
2020-11-19 00:52:43 -03:00
Sally Coolatta
d0ca3b78c1
Merge branch 'master' into battle-rethink
2020-11-18 17:49:06 -05:00
SMS Alfredo
ec291ec3e3
lmao formatting
2020-11-18 12:03:48 -06:00
SMS Alfredo
dc51465195
Don't force S_PLAY_SPIN when landing with PF_SPINNING if you have certain PA flags
2020-11-18 12:01:06 -06:00
SMS Alfredo
826a4429dd
Fix no spin characters being able to damage enemies with their jump out of a spin without removing PF_SPINNING
2020-11-18 11:28:31 -06:00
Sal
b2eb64ac09
Merge branch 'roll-and-tilt' into 'master'
...
Roll & pitch replace modeltilt
See merge request KartKrew/Kart!326
2020-11-17 20:03:48 -05:00
SMS Alfredo
e099631e3c
Do deh thing
2020-11-17 11:47:33 -06:00
Sally Coolatta
e16c7d722f
Cherry-pick e1b265df2
2020-11-16 19:55:28 -05:00
Sally Coolatta
14b379fd27
Cherry-pick 4eb69a664
2020-11-16 19:52:26 -05:00
Sally Coolatta
6a4eb721bd
The real problem
2020-11-16 18:35:07 -05:00
Sally Coolatta
56a20d05df
Merge branch 'master' into battle-rethink
2020-11-11 00:11:18 -05:00
Sally Coolatta
2b3a86d4b4
Merge branch 'master' into hitlag-retry
2020-11-10 21:37:09 -05:00
