Sally Coolatta
3dd04b90c6
Fix jet fume crash when dashmode is above DASHMODE_MAX
...
I would like to use higher dashmode values for extra leniency, the jet fume kicks and screams when this happens.
2021-04-05 16:59:02 -04:00
lachablock
000e865f80
Revise spinheight/gap entry conditions (again), let's keep things WAY simpler:
...
- PF_NOJUMPDAMAGE no longer affects height at all (you're welcome katsy).
- Characters with SF_NOJUMPSPIN will only use spinheight when panim is PA_ROLL. They cannot enter gaps when jumping with spinheight, unless also spinning or gliding.
- All other characters use spinheight when panim is PA_JUMP or PA_ROLL. They can enter gaps when jumping with spinheight.
2021-03-25 21:42:25 +11:00
lachablock
6ea9653681
Add PlayerHeight and PlayerCanEnterSpinGaps Lua hooks
2021-03-25 21:41:09 +11:00
lachablock
f99d89742a
Revise conditions under which players use spinheight and enter gaps:
...
- players with SF_NOJUMPDAMAGE but *not* SF_NOJUMPSPIN now always use spinheight while jumping (i.e. even with PF_NOJUMPDAMAGE), as long as their panim is PA_JUMP or PA_ROLL
- players with SF_NOJUMPSPIN no longer use spinheight while jumping (but,)
- PA_ROLL is now an acceptable condition for using spinheight (but not for entering gaps, e.g. S3K shields will shrink the hitbox but not allow gap entry on their own)
- flying players now only use spinheight if they do not have SF_NOJUMPSPIN (you're welcome, EggpackRE)
- players with neither SF_NOJUMPSPIN nor SF_NOJUMPDAMAGE use the same conditions as in 2.2.9 prerelease, i.e. use spinheight and can enter gaps unless they have PF_NOJUMPDAMAGE
2021-03-25 15:57:35 +11:00
lachablock
0405b3922c
Do not let nonspin characters enter sectors they could not enter if standing at full height
2021-03-23 15:09:04 +11:00
Lachlan Wright
fc1bc94d9a
Merge branch 'fix-flipped-bounce' into 'next'
...
Fix CA_BOUNCE height when flipped (Fixes #428 )
Closes #428
See merge request STJr/SRB2!1373
2021-03-01 17:49:54 -05:00
Lachlan Wright
49c68d279d
Merge branch 'marathon-pause-fix' into 'next'
...
Disable pausing during score screens in marathon mode
See merge request STJr/SRB2!1416
2021-03-01 16:51:28 -05:00
Lachlan Wright
77feee73c3
Revert "Merge branch 'player-speed' into 'next'"
...
This reverts merge request !1309
2021-02-27 03:38:13 +00:00
Riku Salminen
8bcc71c629
Disable pausing during score screens in marathon mode
2021-02-26 15:43:53 +02:00
lachwright
cf389179e8
Rollout rock improvements:
...
- No longer struggles to start to accelerating at certain angles
- Carrying a player onto a rollout rock no longer leaves them in their ride state
- Changed dispoffset might alleviate some sorting issues
- Changes the player's camera angle when sprung horizontally
- Works better in reverse gravity
2021-02-15 01:11:03 +11:00
LJ Sonic
09d911a5b6
Revert "Replace all instances of P_AproxDistance with FixedHypot"
...
This reverts commit 75633bde50
.
2021-02-13 17:45:20 +01:00
James R
5b287f9cce
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
83947d4428
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
Shane Ellis
ca00e2d508
correction to nights bot clause
2021-01-24 12:46:03 -05:00
Shane Ellis
2e528216ac
Updated references to player->bot
2021-01-23 10:15:33 -05:00
Shane Ellis
6103d7a51e
Update p_user.c
2021-01-15 17:41:16 -05:00
Shane Ellis
759ff44dfd
Revert "Add conditions for new player bot type"
...
This reverts commit b995e3cb75
2021-01-15 22:32:02 +00:00
Shane Ellis
b995e3cb75
Add conditions for new player bot type
2021-01-15 16:48:19 -05:00
Zippy_Zolton
216f227539
12
2021-01-13 12:03:02 -06:00
lachwright
a117ec9859
oops that doesn't work in reverse gravity
2021-01-14 04:34:43 +11:00
lachwright
149535634e
Keep Metal's jet fume at a consistent height during dashmode
2021-01-14 04:24:48 +11:00
lachwright
d2be3110bd
Have Metal Sonic use spinheight while dashing
2021-01-13 22:28:38 +11:00
Zippy_Zolton
129ac4633c
Increased launch height
2021-01-11 13:25:42 -06:00
Zippy_Zolton
1917155adf
PF_THOKKED
2021-01-11 00:19:56 -06:00
Zippy_Zolton
058b681660
P_SetObjectMomz
2021-01-10 22:01:41 -06:00
Zippy_Zolton
8e9073f11f
CR_PTERABYTE tweaks
2021-01-10 21:55:25 -06:00
Zippy_Zolton
8aac7454b8
Make Armageddon Shield instantly kill Egg Guards
2021-01-10 17:20:07 -06:00
GoldenTails
59bc197f32
Fix a divby0 when you have SF_MULTIABILITY, CA_DOUBLEJUMP, and actionspd -FRACUNIT.
2021-01-10 10:01:31 -06:00
Zwip-Zwap Zapony
679bf5f999
Fix CA_BOUNCE when flipped
...
Fix P_DoAbilityBounce() always using "max",
instead of "min" while upside-down and "max" while not
2021-01-08 16:25:10 +01:00
GoldenTails
50d46e1fa6
Set the target of a spawned ghost to where it came from.
2020-12-27 00:21:09 -06:00
James R
84e9020eed
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
14c6d93c0c
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
721170f5a0
lol
2020-12-14 05:32:51 -06:00
katsy
da7cdd92ff
Merge remote-tracking branch 'stjr/next' into dashaction
2020-12-14 05:10:01 -06:00
katsy
4521827e2c
you too
2020-12-14 04:06:28 -05:00
katsy
2bebaf12d0
add checks for new flag, make emergency jump call shieldspecial
2020-12-14 04:03:14 -05:00
James R
75633bde50
Replace all instances of P_AproxDistance with FixedHypot
2020-12-12 14:53:54 -08:00
James R
9649a9fbae
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
7b6675178e
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
c8cc9c7a6f
Remove trailing whitespace
2020-12-12 02:40:46 -08:00
James R
e55d842d7f
Kill SEENAMES
2020-12-12 02:11:23 -08:00
Zippy_Zolton
f2095b57fd
Player-Colored Elemental Fire for competitive gametypes
2020-12-10 20:37:50 -06:00
katsy
f79ded7c0b
scale minimum dashmode thok on actionspd, not normalspeed
2020-12-10 20:52:06 -05:00
Zippy_Zolton
317c107064
Make player->speed use R_PointToDist2
2020-12-10 16:09:43 -06:00
James R
5a0d3981f1
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
ef6f69ee22
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
ee48fa2de3
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
9a77cf6306
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
857113b60e
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
c841750868
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
katsy
ffd20ee753
Revert "ensure the new flag is cleared properly"
...
This reverts commit 3dbb44e7b1
2020-12-06 07:44:49 +00:00
katsy
3dbb44e7b1
ensure the new flag is cleared properly
2020-12-05 23:17:01 -05:00
Zippy_Zolton
69248cc684
thanks zap
2020-11-30 16:39:24 -06:00
Zippy_Zolton
20d1811983
oops
2020-11-30 12:05:45 -06:00
Zippy_Zolton
da1a3029a9
overhaul
2020-11-30 12:04:35 -06:00
Zippy_Zolton
412f3fc42b
P_GivePlayerRings
2020-11-29 17:39:54 -06:00
Zippy_Zolton
f913d60a9f
Make P_DoSuperTransformation (with giverings) add 50 rings instead of setting it
2020-11-29 17:16:57 -06:00
SMS Alfredo
95dfb93a11
Allow non-player objects to apply the CR_PLAYER carry type without crashing the game
2020-11-28 22:03:02 -06:00
Zippy_Zolton
db6b0c6aa0
Fix normal one-up sound playing in Mario mode
2020-11-25 21:46:45 -06:00
SMS Alfredo
5c71fe0710
Allow player.lastlinehit and player.lastsidehit to be used outside of Knuckles' climbing ability
2020-11-25 14:31:24 -06:00
lachwright
87968c946b
Prevent non-CA2_SPINDASH characters from getting crushed by roll-jumping into a crevice
2020-11-24 14:56:22 +11:00
SMS Alfredo
fe066b3ef2
...snickerdoodles
2020-11-23 09:23:02 -06:00
SMS Alfredo
ea7e06a616
Remove PF_SPINNING when jumping if you have SF_NOJUMPDAMAGE
2020-11-23 09:21:00 -06:00
SMS Alfredo
7b05ffd92d
Revert "Fix no spin characters being able to damage enemies with their jump out of a spin without removing PF_SPINNING"
...
This reverts commit ad9bf6085f
.
2020-11-23 09:18:05 -06:00
SMS Alfredo
7bbd563b73
Remove unneeded S_PLAY_ROLL check
2020-11-22 23:23:35 -06:00
James R
30792e7820
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
5e890ee6f8
Merge branch 'next' into spritestuff2
2020-11-19 00:52:43 -03:00
SMS Alfredo
01a03a4daa
lmao formatting
2020-11-18 12:03:48 -06:00
SMS Alfredo
09644d69c0
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
ad9bf6085f
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
SMS Alfredo
fb40a28365
Do deh thing
2020-11-17 11:47:33 -06:00
Nev3r
fb9432ae57
Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into udmf-multitag
2020-11-10 11:46:53 +01:00
James R
33cfd2c72a
Merge branch 'mobjghost-rollangle' into 'next'
...
Ghost mobj matches rollangle (Closes #362 )
Closes #362
See merge request STJr/SRB2!1211
2020-11-01 22:49:50 -05:00
Zippy_Zolton
6c00a96755
thunder shield :D
2020-10-29 12:32:42 -05:00
Zippy_Zolton
4e56caa196
Flame Shield Changes
2020-10-28 01:23:05 -05:00
Nev3r
c62ef355ef
Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into udmf-multitag
...
# Conflicts:
# src/lua_baselib.c
# src/lua_maplib.c
2020-10-27 20:48:25 +01:00
Zippy_Zolton
5d4032fd00
Ghost mobj matches rollangle
2020-10-24 12:38:30 -05:00
Zippy_Zolton
c0571b5fbf
g
2020-10-23 01:09:12 -05:00
Zippy_Zolton
a4459b6693
Dash state for Tails overlay
2020-10-23 00:47:47 -05:00
James R
7f65023891
Merge branch 'bustflags' into 'next'
...
Bustable Wall and Floor flags.
See merge request STJr/SRB2!1163
2020-10-18 16:42:15 -04:00
lachwright
6a73e81227
Merge remote-tracking branch 'origin/next' into i-pity-you
2020-10-13 09:24:09 +11:00
Jaime Passos
cc97e22e2f
Changes to sprite rendering:
...
- Added render flags (see r_defs.h)
- Implemented floor splats
- Drop shadow sprite rendering through render flags
2020-10-12 00:13:22 -03:00
James R
15008f31a7
Merge branch 'sanity-meter-empty' into 'next'
...
Replace cvar initializers with a macro
See merge request STJr/SRB2!1178
2020-10-08 22:02:25 -04:00
James R
dbd79a29a4
Replace C90's junk with a modest macro
2020-10-06 23:04:23 -07:00
Snu
afcadb3232
Remove all instances of PF_CANBUSTFLOORS
2020-09-29 20:16:06 +01:00
Snu
cd4f755e53
Replace all instances of SF_CANBREAKWALLS and PF_CANBREAKFLOORS with SF_CANBUSTWALLS and PF_CANBUSTFLOORS, respectively.
2020-09-29 13:52:35 +01:00
Snu
75042d781f
Fix characters without SF_CANBREAKWALLS not being able to climb bustable walls.
2020-09-29 13:47:48 +01:00
Snu
90fbb752fa
Add functionality to PF_CANBREAKFLOORS
2020-09-29 12:58:36 +01:00
Snu
d07422bda1
Change breaking walls requirement from CA_GLIDEANDCLIMB to SF_CANBREAKWALLS.
2020-09-29 10:32:45 +01:00
lachwright
2bb5b42960
Allow JumpSpin abilities to be used with non-ability shields
2020-09-16 16:50:10 +09:30
Bartu İnce
7e9bc0d103
no message
2020-09-08 03:03:48 +03:00
Nev3r
b15c760dc2
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-multitag
2020-08-15 13:44:59 +02:00
James R
3e8cf5ab06
Merge branch 'bt_spin' into 'next'
...
Replace all occurances of BT_USE with BT_SPIN (2.2!)
See merge request STJr/SRB2!982
2020-08-09 21:03:17 -04:00
Nev3r
c65ada7dd7
Merge branch 'next' into udmf-multitag
...
# Conflicts:
# src/hardware/hw_main.c
2020-07-29 13:55:14 +02:00
James R
c944d3adf4
Merge branch 'fix-nights-fullbright' into 'next'
...
NiGHTS fullbright fixes
See merge request STJr/SRB2!1080
2020-07-22 22:15:07 -04:00
lachwright
242e128aa0
Fix Super Sonic exploiting CA_FLOAT abilities
2020-07-21 03:50:26 +08:00
lachwright
cea3f64c88
Fix default NiGHTS skin brightness for non-super characters
2020-07-20 22:24:16 +08:00
James R
42b0ab1851
Merge branch 'p-xymovement-lua-exposure' into 'next'
...
Expose several movement-related functions to Lua.
See merge request STJr/SRB2!884
2020-07-12 19:11:47 -04:00
James R
b9a24001d8
Merge remote-tracking branch 'origin/next' into remove-glide-2
2020-07-12 16:05:15 -07:00
GoldenTails
ada06910dc
Expose P_MovePlayer to Lua.
2020-07-12 18:02:50 -05:00