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

193 commits

Author SHA1 Message Date
Sally Coolatta
f9ca40e673 Merge branch 'master' into the-scary-22-merge 2020-08-12 20:59:09 -04:00
Sally Coolatta
e296e1309a YAY, round 2 2020-08-09 21:02:56 -04:00
Sally Coolatta
a73b9a9a0d Merge p_slopes.c 2020-08-06 17:58:30 -04:00
Sally Coolatta
4a9a33130a Make it compile 2020-07-23 19:23:27 -04:00
Nev3r
ebe16a66d9 Merge branch 'udmf-next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-multitag 
# Conflicts:
#	src/hardware/hw_main.c
#	src/p_ceilng.c
#	src/p_floor.c
#	src/p_mobj.c
#	src/p_mobj.h
#	src/p_polyobj.c
#	src/p_saveg.c
#	src/p_setup.c
#	src/p_spec.c
#	src/p_spec.h
#	src/p_user.c
#	src/r_bsp.c
#	src/r_defs.h
 2020-07-10 18:18:07 +02:00
lachwright
8ab98011f6 Spindash charge (WIP) 2020-07-06 08:10:03 +08:00
MascaraSnake
3ce62d7780 Merge branch 'next' into udmf-next 
# Conflicts:
#	src/p_mobj.c
#	src/p_polyobj.c
 2020-06-09 09:38:01 +02:00
lachwright
8087352f9e Spindash: new braking 2020-06-09 05:27:05 +08:00
Sally Coolatta
63917ffccc The start of the scary 2.2 merge 
All conflicts are left in-tact. We should be collaborating on solving these files one at a time.
 2020-05-29 13:43:38 -04:00
Louis-Antoine
74fa35221d Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into slope-cleanup 
# Conflicts:
#	src/hardware/hw_main.c
#	src/p_spec.c
 2020-05-18 16:14:05 +02:00
Louis-Antoine
6af2871fa5 Rename P_GetZAt to P_GetSlopeZAt and P_GetZAt2 to P_GetZAt 2020-05-18 15:23:56 +02:00
lachwright
9b1ec81622 Start hill-parking 2020-05-09 06:24:53 +08:00
Sal
fae498f097 Merge branch 'fof-things-suck' into 'master' 
Generic raise things line special, Waypoint Riser and Waypoint Anchor

See merge request KartKrew/Kart!233
 2020-04-28 20:19:03 -04:00
MascaraSnake
c2cf8d57d0 Remove P_FindSectorFromLineTag 2020-04-27 14:31:37 +02:00
Sally Cochenour
e26bb897d6 Prevent divide by zero in slopes code 
Not exactly sure why this happens, or if this is the correct way to fix it
 2020-04-23 14:18:43 -04:00
Nev3r
d0340c864f Merge branch 'udmf-next' into udmf-multitag 2020-04-20 09:05:55 +02:00
MascaraSnake
6abc3da5de Add enums to encapsulate the textmap slope settings 2020-04-18 16:55:56 +02:00
Nev3r
df87feaba7 Carry over a considerable case regarding accessing the old tag vars. 2020-04-17 18:15:25 +02:00
Nev3r
e0edd25fd6 Thing-based slope vertexes use taglists now. 2020-04-17 10:04:11 +02:00
Nev3r
23ed07e08e Replace most P_FindSpecialLineFromTag() cases with Tag_FindLineSpecial(), which settle with the first found result. 2020-04-14 23:59:22 +02:00
Nev3r
f230438625 Replaces P_FindSectorFromTag() occurrences with its corresponding macro and vanishes it from existence. 2020-04-14 23:33:56 +02:00
James R
89a2f8ec8d Thing type 2002, MT_WAYPOINT_RISER - Raise tagged waypoints in sector to FOF sorted by height 
Thing height refers to the index of FOF. FOF are sorted by top height, lowest
to highest. Set Object Flip to sort highest to lowest.

If the waypoint thing set Object Flip, it will be placed on the bottom of the
FOF. The sorting remains the same though.

Set Ambush to raise the waypoint to the same z position.
 2020-04-04 01:20:38 -07:00
Louis-Antoine
29294a53cc Encapsulate plane height checks 2020-03-22 17:28:50 +01:00
MascaraSnake
9b76d3af6f Merge branch 'next' into udmf-next 
# Conflicts:
#	extras/conf/Includes/SRB222_linedefs.cfg
#	extras/conf/Includes/SRB222_misc.cfg
#	src/p_spec.c
 2020-03-21 20:04:31 +01:00
Louis-Antoine
4e7605f0e2 Make SRB2 flat like Earth 2020-03-20 18:55:29 +01:00
Nev3r
63fb8f846b Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next 2020-03-11 09:31:31 +01:00
Steel Titanium
fc042e90f0 Merge branch 'master' into next 2020-02-21 21:01:29 -05:00
James R
2274129f57 Update copyright year to 2020 2020-02-19 14:08:45 -08:00
fickleheart
598f66a997 Let scripters see if player just launched from slope 2020-02-16 21:34:07 -06:00
MascaraSnake
0cb61af3d2 Use tag field to setup vertex slopes 2020-01-25 10:01:01 +01:00
MascaraSnake
4e3dcc70c3 Merge branch 'next' into udmf-next 
# Conflicts:
#	src/p_slopes.c
 2020-01-11 16:16:57 +01:00
MascaraSnake
331fe7201c Merge branch 'udmf-vslopes' into 'next' 
Add textmap vertex slope support

See merge request STJr/SRB2!633
 2020-01-11 10:02:51 -05:00
Nev3r
aa2184989c Clarify ambiguity regarding mapthing-based vertex slopes. 2020-01-11 08:53:29 +01:00
MascaraSnake
fac733331d Some minor cleanup 2020-01-10 19:56:29 +01:00
MascaraSnake
28157bc20c Check slope flags explicitly instead of setting them directly (in case they ever change) 2020-01-07 21:50:14 +01:00
MascaraSnake
d55a64b740 Adapt setup of copy slope linedef to UDMF 2020-01-06 17:39:39 +01:00
MascaraSnake
7e6ac2ac92 Adapt setup of vertex-based slopes to UDMF 2020-01-06 15:34:28 +01:00
MascaraSnake
0ee12ebbd5 Adapt setup of line-based slopes to UDMF 2020-01-05 14:31:56 +01:00
Alam Ed Arias
fbee649c65 SpawnVertexSlops() is only used in p_slopes.c 2020-01-04 18:33:58 -05:00
Nev3r
275f07e05f Provide a fix for "non-sloped" slopes launch/land behavior by checking the normal's components. 2020-01-04 11:27:31 +01:00
Nev3r
42bbad4810 Revert "Provide a fix for "non-sloped" slopes launch/land behavior by checking the normal's components." 
This reverts commit 4ca4335f19.
 2020-01-04 11:25:46 +01:00
Nev3r
4ca4335f19 Provide a fix for "non-sloped" slopes launch/land behavior by checking the normal's components. 2020-01-04 11:17:54 +01:00
Nev3r
4c7604a107 Add vertex slope spawning function. 
Rename P_ResetDynamicSlopes() to P_SpawnSlopes().
 2020-01-04 10:39:45 +01:00
MascaraSnake
8d561a20c1 Merge branch 'kill-zshift' into 'next' 
Eliminate all unnecessary uses of ZSHIFT

See merge request STJr/SRB2!580
 2019-12-29 08:35:52 -05:00
MascaraSnake
d00a9a42a1 Cleaned up some more stuff in P_LoadLevel() 2019-12-28 12:48:32 +01:00
MascaraSnake
69539e640b Make slope vertices use mt->z directly instead of mt->options >> ZSHIFT 2019-12-25 09:10:20 +01:00
Steel Titanium
a5cdb0a4b3 Update copyright date on source files 2019-12-06 13:49:42 -05:00
Sal
921409224c Merge branch 'model-gradients' into 'master' 
Model gradients + model tilt adjustments

See merge request KartKrew/Kart!157
 2019-09-25 21:53:21 -04:00
toaster
a98bbafbc3 Fix all our landing woes. (For now.) 
* Player state upon collision with ground after rolling now sets state properly.
* Fix the thing where Knuckles can glide up a slope like it's nothing WHILE keeping things working for bouncers.
 2019-08-10 16:06:59 +01:00
MascaraSnake
3786604203 Don't zero out momz when landing on slopes. 
This fixes Fang's bounce on slopes and doesn't seem to make a difference otherwise, but there's still a non-zero chance this broke something.
 2019-08-06 23:18:53 +02:00