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
28080 commits 1 branch 12 tags 205 MiB
Commit graph

912 commits

Author SHA1 Message Date
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
TehRealSalt
97b09ba9c1 Grease part 2 2019-09-12 14:23:45 -04:00
TehRealSalt
d3f1b4f82c Greased horizontals 2019-09-12 02:01:30 -04:00
TehRealSalt
d4d03f907b Remove commented out code 2019-09-12 00:32:47 -04:00
TehRealSalt
55caae6d1a Remove teleporting jank from springs, set angle when going directly against a horizontal/diagonal spring 2019-09-12 00:31:51 -04: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
Monster Iestyn
d9048f2c39 Merge branch 'metalfixes' into 'toast_cleanup' 
Metal Sonic Boss fixes (again)

See merge request STJr/SRB2Internal!245
 2019-07-09 14:29:42 -04:00
toaster
e5cdfe998b Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into toast_cleanup 
# Conflicts:
#	src/p_mobj.c
 2019-07-08 13:53:31 +01:00
MascaraSnake
c48d00ad72 Fixed teetering on TNT barrels 2019-07-07 17:02:10 +02:00
toaster
168a7f4768 Revert "Revert "Merge branch 'metalfixes' into 'toast_cleanup'"" 
This reverts commit c17ec4a77e.
 2019-07-03 00:58:02 +01:00
MascaraSnake
c17ec4a77e Revert "Merge branch 'metalfixes' into 'toast_cleanup'" 
This reverts merge request !239
 2019-07-02 23:49:10 +00:00
MascaraSnake
9f666e125e Merge branch 'master' into thinkerlists 
# Conflicts:
#	src/f_finale.c
#	src/p_enemy.c
 2019-07-02 23:08:37 +02:00