Commit graph

795 commits

Author SHA1 Message Date
TehRealSalt
d52e7a652e Faster waterskipping 2019-10-27 09:03:35 -04:00
lachwright
4835d26c8b Merge branch 'master' into knuxstuff 2019-10-26 05:53:49 +08:00
TehRealSalt
b69d105af3 Add respawn animation
This commit also fixes MF_NOCLIP not working properly on players. Sink now spawns an SPB explosion on successful hit, since dying is no longer a harsh punishment.
2019-10-24 16:35:39 -04:00
TehRealSalt
674c0aec17 Merge branch 'master' into new-items 2019-10-24 10:08:37 -04:00
James
4b04423bbe Bring this back, but more lenient
(not tested)
2019-10-22 08:46:14 -04:00
James
f9ea683312 P_PlayerTouchingSectorSpecial turned into P_MobjTouchingSectorSpecial 2019-10-22 08:45:38 -04:00
toaster
00ba624cfa Prevent CA2_MELEE, CA_TWINSPIN and CA_BOUNCE from fucking up boosters. 2019-10-19 14:46:14 +01:00
toaster
383b93e43a * New object types!
* Red and yellow Boost panels!
        * Added because SUBARASHII and KIMOKAWAIII had several levels using them, and I wanted to make them look better.
        * https://cdn.discordapp.com/attachments/359091121789468672/634486669202161674/srb20015.gif
        * Uses the mapthingnums of Glaber's SOC resource boosters, but absolutely nothing else - not even the magnitudes.
        * Apply MF_AMBUSH to force the player into a spin - even if they don't have a spin ability!
    * Banpyura!
        * A Crushstacean with a spring instead of a crushclaw.
        * https://cdn.discordapp.com/attachments/428262628893261828/634432099306176512/srb20019.gif
        * Wanted this for a while, finally added it.
* Improved springs.
    * Add pw_noautobrake to disable autobrake for half a second when touching yellow horizontal springs, and a second when touching red ones, even on the ground.
    * Add pw_justsprung to disable directionchar for a few tics while touching any springs with a horizontal component to their velocity.
    * Add the diagonal spring flag options Red and Yellow Diagonal Springs have to the Blue Diagonal Spring as well.
    * Started but decided against a tip of the hat to the CD spring spin, hidden behind #define SPRINGSPIN.
* Make directionchar "lag behind" a little bit in waterslides.
* Improved flame jets.
    * They now use new sprites for having their flames move upwards and sideways, instead of having them always face downwards like in 2.1!
* Fixed a mixed declaration and code error in A_RolloutRock. (Sorry Lach!)
* Make the Amy Cameo only spawn in SP, Record Attack, or Co-op unless it's the Clone Mode.
* Improved ZB config.
    * Add above new types.
    * Add Blue Diagonal Spring, which existed in the source but not the config.
    * Re-order enemies in ZB config by zone (but keep them in the Enemies section only).
2019-10-18 18:33:45 +01:00
TehRealSalt
d1c20c2a5a Don't allow finish lines to be hit multiple times per tic 2019-10-15 21:30:23 -04:00
lachwright
cf97857ec7 Merge branch 'master' into knuxstuff 2019-10-15 02:50:59 +08:00
lachwright
9642e8d4a5 Merge branch 'master' into knuxstuff 2019-10-15 02:49:44 +08:00
toaster
9cf3bd2e74 Revert stupid 2.1-compat fuckup I did in slopes code. 2019-10-13 11:55:50 +01:00
toaster
e9867c4bd7 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into rvz-hardcode
# Conflicts:
#	src/p_map.c
2019-10-10 17:51:29 +01:00
MascaraSnake
68edb0e8fa Merge branch 'bumperstuff' into 'master'
Change the time NiGHTS bumpers aren't responded to to 5 tics rather than 9.

Closes #246

See merge request STJr/SRB2Internal!365
2019-10-10 02:35:33 -04:00
toaster
ed304a5b19 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into rvz-hardcode
# Conflicts:
#	src/p_mobj.c
2019-10-08 19:43:43 +01:00
MascaraSnake
00ac7095d1 Players can jostle free from Pterabytes 2019-10-08 00:00:41 +02:00
MascaraSnake
b055dea4ba Don't apply autobrake to Pterabyte-carried players 2019-10-07 22:33:06 +02:00
lachwright
90b867bf22 Allow rock to disappear if unridden for 12 seconds 2019-10-07 22:22:51 +08:00
toaster
0ace4a2a3f Change the time NiGHTS bumpers aren't responded to to 5 tics rather than 9. 2019-10-07 13:08:49 +01:00
lachwright
4780898619 Collision polish 2019-10-07 14:51:32 +08:00
MascaraSnake
4476c8140f Fixed a typo 2019-10-07 08:36:40 +02:00
lachwright
7bdc29b13a Readability changes 2019-10-07 13:36:36 +08:00
lachwright
4b96eeb578 Readability changes 2019-10-07 13:35:10 +08:00
lachwright
7c50193dcb Let ridden rollout rocks collide with other players 2019-10-07 13:14:23 +08:00
MascaraSnake
62b244148a Fixed solid objects (such as Minus-carried TNT barrels) not colliding with players.
Springs and gas jets are exempt because all hell might break loose otherwise.
2019-10-06 19:53:54 +02:00
toaster
cf4abf6b36 Merge branch 'acz-fixes' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into acz_touchups
# Conflicts:
#	src/p_enemy.c
2019-10-06 15:18:59 +01:00
lachwright
c2b98b0e27 Merge branch 'rvz-hardcode' of https://git.magicalgirl.moe/STJr/SRB2Internal into rvz-hardcode 2019-10-06 22:12:47 +08:00
toaster
4456c15190 Add solidity back to MT_SALOONDOOR, to work as a backup in case MT_SALOONDOORCENTER doesn't work (which it has issues with in one location in ACZ2 for some reason, and I can't identify why).
Fully resolves #209, in any case.
2019-10-06 12:14:18 +01:00
MascaraSnake
c838ac30e9 Lavafall lava also kills rings 2019-10-05 20:37:48 +02:00
toaster
edc65a1a22 Fix Saloon doors.
* Make the center be the object stuff collides with, so that if the door is open people can't slip through.
* Add an MF_AMBUSH enhancement to allow non-minecart players to travel through.
* Make A_SaloonDoorSpawn more customisable. (var1 = object type, var2 = distance sides should be placed apart)
2019-10-05 13:21:35 +01:00
lachwright
d9f4772fbc Fix false comment 2019-10-03 02:31:32 +08:00
MascaraSnake
b38bd1a078 Lava is now either completely solid or completely intangible. No more half-assing 2019-10-01 21:58:18 +02:00
MascaraSnake
002e45ee53 Made solid lava walls damaging 2019-10-01 21:17:33 +02:00
MascaraSnake
12f555de25 Merge branch 'master' into acz-fixes 2019-09-30 20:50:33 +02:00
lachwright
52e7ae5322 Allow camera movement while climbing; allow sliding while landing from a glide 2019-09-30 14:38:58 +08:00
MascaraSnake
c1d06a1b49 Pterabytes can now swoop you off a rollout rock 2019-09-29 22:13:10 +02:00
lachwright
4a47b66990 (Hopefully) cover all cases for resetting rock usability 2019-09-30 03:05:08 +08:00
TehRealSalt
9e3b818cce Fix finish line occasionally failing for small players 2019-09-29 14:40:23 -04:00
MascaraSnake
ca9fdd4f0e Merge branch 'rvz-hardcode' of git.magicalgirl.moe:STJr/SRB2Internal into rvz-hardcode
# Conflicts:
#	src/d_player.h
#	src/dehacked.c
#	src/p_map.c
#	src/p_user.c
2019-09-29 18:49:53 +02:00
MascaraSnake
309d26069f Implemented the Pterabyte grabbing mechanic 2019-09-29 18:42:17 +02:00
lachwright
f67ef441b3 Hardcode pumice ball
Current known issues: players detached from the ball via any means other than jumping or pain do not have their ball reset properly
2019-09-29 20:18:40 +08:00
TehRealSalt
2c400487a5 not def 0 2019-09-27 23:11:43 -04:00
TehRealSalt
bc3f0568ee Merge master 2019-09-27 23:09:54 -04:00
TehRealSalt
22796b7633 Merge master 2019-09-27 03:44:37 -04:00
Sal
542c4a3306 Merge branch 'new-springs' into 'master'
New springs

See merge request KartKrew/Kart!171
2019-09-27 03:06:29 -04:00
James R
7a6a2f248e Remove trailing whitespace 2019-09-26 14:32:25 -07:00
toaster
3d793fc1ea Correctly restrict MF_NOCLIPTHING-objects from being interacted with from both moving and non-moving side. 2019-09-25 15:49:37 +01:00
TehRealSalt
bc7673f2da Update Spring Shells, add color modulo check 2019-09-23 06:29:30 -04:00
TehRealSalt
9d8cb5247a Special effects!
Tire grease waves, colored stars
2019-09-23 03:15:08 -04:00
toaster
26ac81fea7 * Resolve #224 (landing frames on ceiling contact).
* Fix some other landing weirdness with CA_BOUNCE.
2019-09-19 13:20:05 +01:00