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
toaster
1f5a73d467
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into playerfixes
2019-09-19 12:00:55 +01:00
toaster
68116b914c
* Fix native MF_PAIN sound extension being limited to UINT8 range, which only became evident when the new s1/2/cd/3db/kc sfx were added.
...
* Make the pain-causing cactodes have DMG_SPIKE.
2019-09-18 17:48:41 +01:00
toaster
09fce66717
Fix Knuckles being able to climb up solid midtextures by repeatedly gliding at them. (addresses #174 checkbox 2)
2019-09-18 15:26:21 +01:00
TehRealSalt
22ccce6f24
Modify angle offset with your speed vs the spring's speed
...
Blue springs will send you more at a reflected momentum angle, while red springs will send you more straight
2019-09-16 20:47:13 -04:00
TehRealSalt
cd65381abc
Add another file to handle Kart item collision functions, now items can damage anything with MF_SHOOTABLE
...
Now this code won't make me pull out my hair. Could possibly be enhanced by using a function or define to handle the big copy-pasted tmthing/thing switch blocks in p_map, but for now I'm way happier.
As a result, Battle capsules are now destructible.
2019-09-15 17:25:33 -04:00
Nev3r
d6e02c20b3
Always force player camera direction for springs with horizontal thrust component.
2019-09-15 17:43:19 +02:00
TehRealSalt
5738071100
Horizontal/diagonal springs use all object's speed, instead of only players
2019-09-15 00:49:10 -04:00
TehRealSalt
0e35b65caa
Spring Bullshit, part (?)
...
Who knows how many times I've had to rewrite this part but it FINALLY works properly for everything...
2019-09-14 23:47:08 -04:00
TehRealSalt
40c8081a1b
Grease part 3
2019-09-12 19:26:00 -04:00
