thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
9949 commits 1 branch 12 tags 205 MiB
Commit graph

350 commits

Author SHA1 Message Date
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
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
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
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
Nev3r
d6e02c20b3 Always force player camera direction for springs with horizontal thrust component. 2019-09-15 17:43:19 +02:00
toaster
c7ea762cf1 Autobrake polish! 
* Make it actually look like a brake, so people can tell it's on instead of just having high friction.
* Fix it fucking with spring chains (caused by being unwittingly active for the first tic of spring collision).
 2019-08-22 16:13:00 +01:00
Monster Iestyn
6f9fbd0ddf Merge branch 'landingbetter' into 'master' 
Fix all our landing woes. (For now.)

See merge request STJr/SRB2Internal!289
 2019-08-20 09:28:40 -04:00
Monster Iestyn
0b6a463cff Merge branch 'public_next' 
# Conflicts:
#	src/config.h.in
#	src/d_clisrv.c
#	src/d_netcmd.c
#	src/doomdef.h
#	src/p_map.c
#	src/p_maputl.c
#	src/sdl12/macosx/Srb2mac.xcodeproj/project.pbxproj
 2019-08-20 13:54:48 +01:00
Monster Iestyn
f993d74e63 Use P_MobjInsidePolyobj instead of P_MobjTouchingPolyobj, so that you can be crushed by the polyobject's middle rather than just its edges 2019-08-16 14:54:01 +01:00
Monster Iestyn
925c9dc5d8 Modify P_CheckSector with a modified version of Sal's attempted proper fix for polyobjects crushing, so that we only need to check the polyobject's control sector directly in the waypoints code. 
This time I've definitely fixed that teleport to ground issue I'm pretty sure, I don't get it in my tests at least.
 2019-08-15 14:20:52 +01:00
toaster
f3eb35bb6d Did some testing, needed to fix one more issue with moving surfaces and spinning. 2019-08-11 14:36:52 +01:00
Monster Iestyn
2106263988 Merge branch 'master' into snaptoground-fix 2019-08-03 18:23:09 +01:00
Monster Iestyn
cbd408278f Merge branch 'bustables_misc' into 'master' 
Bustables and landing events

Closes #157 and #162

See merge request STJr/SRB2Internal!262
 2019-08-02 13:16:53 -04:00
Monster Iestyn
c88f02675e Modify P_CheckSector with a modified version of Sal's attempted proper fix for polyobjects crushing, so that we only need to check the polyobject's control sector directly in the waypoints code. 
This time I've definitely fixed that teleport to ground issue I'm pretty sure, I don't get it in my tests at least.
 2019-08-02 16:51:44 +01:00
Monster Iestyn
55a738d2be Whoops, forgot this part 2019-08-01 20:17:15 +01:00
toaster
cbf73014a5 Two one liners related to angles, so doin' em in a single branch. 
* If a spring has vertical speed AND horizontal speed, always set the player's angle when touching it.
* If you have less than 32 rings and spill them, they now get launched away from the player's motion, rather than in the direction of the camera.
 2019-07-29 20:29:02 +01:00
toaster
71e5835e66 Successfully cause landing events when the ground moves up to hit you, as opposed to just when you move down to the ground. 2019-07-17 23:25:49 +01:00
MascaraSnake
a1a22929ac Used toaster's new P_PlayerCanDamage function for the barrel collision 2019-07-10 09:08:57 +02:00
MascaraSnake
d1554b531f Merge branch 'master' into acz-fixes 2019-07-10 08:47:22 +02:00