Commit graph

161 commits

Author SHA1 Message Date
Sally Coolatta
150faf9de6 Add terrain pointer to mobj_t 2021-12-09 00:56:05 -05:00
James R
696ca049d8 Apply momentum based squash and stretch to every object
Also netsave.
2021-11-28 22:43:48 -08:00
Sally Coolatta
48c8843feb Merge branch 'master' into stair-janking 2021-04-21 21:44:23 -04:00
toaster
b3d006b093 structs gunched 2021-04-17 00:27:13 +01:00
James R
b3293aa122 Don't stair jank on really small steps
Also don't do it off slope launches.
2021-04-11 02:07:23 -07:00
Sally Coolatta
9d7ec0ab8f Merge SRB2 next
Probably doesn't compile yet, but I got rid of all of the conflicts for anyone who wants to take a stab at it.
2021-02-27 05:18:36 -05:00
LJ Sonic
85cd429d1d Revert "Replace all instances of P_AproxDistance with FixedHypot"
This reverts commit 498ff708bb.
2021-02-13 17:45:20 +01:00
James R
498ff708bb Replace all instances of P_AproxDistance with FixedHypot 2020-12-12 14:53:54 -08:00
Nev3r
003f46c18e Add a level parameter to the iterators to account for nesting, and thus avoid variable shadowing. 2020-11-12 13:48:14 +01:00
Nev3r
c22dbe1d2e rename TAG_ITER_C to TAG_ITER_DECLARECOUNTER and remove the semicolon from the macro. 2020-11-10 12:22:55 +01:00
Sally Coolatta
9dd43d4e4e Remove modeltilt, use roll & pitch instead
Broken currently, about half of the slopes you can go into have the wrong tilt
2020-10-28 18:36:26 -04:00
James R
fdb77175c5 More buttered slope speed 2020-10-17 21:47:04 -07:00
Sally Coolatta
b5fcd74ef9 Merge master
Slopes in a few maps are really broken ... think it's anchors, I'm gonna leave that to jart :V
2020-09-25 12:00:50 -04:00
Sally Coolatta
861cb8e144 Fix springs giving you way too many
(Also removed a bunch of instances of PF_SPINNING since we haven't used it)
2020-09-25 02:24:19 -04:00
James R
ce7161e81d Check out this massive slopes
Line specials 777 - slope floor by anchors, 778 - slope ceiling by anchors,
779 - slope floor and ceiling by anchors.

Thing types 777 - floor anchors, 778 - ceiling anchors.

Summary.

These line specials slope the front or back sector's floor/ceiling by 'anchor'
things. Anchors are floor or ceiling specific and snap to the nearest vertex.
Using this method it is possible to create seamless slopes, without even
tagging.

Details.

Normal slope flags apply. To slope the backside sector, set No Climb on the
line. An anchor each is required to be near three of a sector's vertices in
order to slope it. More may be present but the order is undefined.
2020-09-21 19:35:49 -07:00
James R
ef108cbb36 Merge remote-tracking branch 'pub/next' 2020-09-20 14:07:54 -07:00
FlykeSpice
2424418390 Remove ESLOPE #ifdef(backport from srb2 2.2) 2020-08-20 13:02:13 -04:00
Sally Coolatta
9efdc98de6 Makes it through all kart files
All that's left is SDL, OGL, maybe also Lua
2020-08-15 04:42:56 -04:00
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