Commit graph

91 commits

Author SHA1 Message Date
Nev3r
6b38fe4b2c Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next 2020-07-06 11:13:27 +02:00
Louis-Antoine
ec2f58c664 Fix crash when a polyobject rotates a non-player mobj 2020-06-30 18:37:21 +02:00
MascaraSnake
5bbbb16837 Compiling fix 2020-06-09 22:10:02 +02:00
MascaraSnake
c685328268 Adapt POF_SPLAT to UDMF setup 2020-06-09 09:44:49 +02: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
Lachlan Wright
5263b8cf63 Merge branch 'fix-spawn-desynch' into 'next'
Fix desynch when a player spawns

See merge request STJr/SRB2!977
2020-06-08 05:25:41 -04:00
Monster Iestyn
3a7417c8fe Merge branch 'master' into next 2020-06-06 20:35:48 +01:00
Monster Iestyn
e2e65d7fae Polyobj_rotate and related: change "origin" to vector2_t since all it needs is x/y and not any of the new stuff for vertex_t 2020-06-03 20:47:49 +01:00
MascaraSnake
f713487f3c Effect 6 flag allows cutting of cyan pixels on FOF and PolyObject planes (even if they're translucent) 2020-06-03 19:41:47 +02:00
Louis-Antoine
d886e35576 Fix potential desynch when a player spawns 2020-05-28 11:03:35 +02:00
MascaraSnake
ef85e7f99d Polyobject waypoint movement: Prevent infinite loop if all waypoints are in the same location 2020-05-16 10:24:06 +02:00
MascaraSnake
55aacf6b83 polywaypointdata_t: Turn reverse and continuous into flags 2020-05-16 09:49:30 +02:00
MascaraSnake
fe77e7506b EV_DoPolyObjWaypoint: Don't discard movement if you start at the last waypoint 2020-05-16 09:09:26 +02:00
MascaraSnake
52e05bc8d5 T_PolyObjWaypoint: We can find waypoints in constant time now, so no need to store the waypoint mobj in the thinker anymore 2020-05-16 09:03:02 +02:00
MascaraSnake
bb8ad195c4 T_PolyObjWaypoint: If the polyobject reaches its target exactly, find next waypoint in the same tic 2020-05-16 08:49:03 +02:00
MascaraSnake
f8dee9c104 Rewrite T_PolyObjWaypoint to move more smoothly 2020-05-16 08:45:06 +02:00
MascaraSnake
8d16937c6a T_PolyObjWaypoint: Move duplicated movement code into its own function 2020-05-15 17:35:07 +02:00
MascaraSnake
93b6615e61 Store PolyObject waypoint return behavior in an enum 2020-05-13 16:21:47 +02:00
MascaraSnake
ea0176fada Remove diffx/y/z from polywaypoint_t, since they're always 0 anyway 2020-05-13 14:40:07 +02:00
MascaraSnake
2e8bb50808 Fix accidental swap of first and last waypoint 2020-05-13 09:32:00 +02:00
MascaraSnake
4c526f6e50 Store waypoints (for zoom tubes, rope hangs, polyobjects) explicitly 2020-05-12 23:50:30 +02:00
MascaraSnake
34c55acf48 Fix PolyObject flags not being applied when there is no parameter line 2020-05-05 08:40:59 +02:00
MascaraSnake
db717f1cf7 Move polyobject crush option to the first line args 2020-05-04 23:27:26 +02:00
MascaraSnake
af8bd89558 Adapt basic PolyObject setup to UDMF 2020-05-04 22:40:49 +02:00
MascaraSnake
8c22834b46 Merge branch 'next' into udmf-next 2020-05-04 20:32:56 +02:00
MascaraSnake
af2098c3b6 PolyObject: Allow translucency to be set via X offset 2020-05-04 19:47:39 +02:00
MascaraSnake
7b293d43c0 Make PolyObject special functions return boolean instead of INT32 2020-05-04 10:07:38 +02:00
MascaraSnake
c6d245879a Pass parameters to EV_DoPolyObjFlag in a struct and not via the line 2020-05-04 09:54:32 +02:00
MascaraSnake
48c5bd4486 Refactor Polyobj_findSegs 2020-05-04 01:28:21 +02:00
MascaraSnake
3d9bf8335e Purge uninformative comments 2020-05-04 00:17:05 +02:00
MascaraSnake
9fa267f247 Clean up Polyobj_GetInfo 2020-05-03 23:55:23 +02:00
MascaraSnake
a1a3b54108 Remove "explicitly include line in polyobject" code which has never worked 2020-05-03 23:47:26 +02:00
MascaraSnake
8efec04051 Remove POLYOBJECTS and POLYOBJECTS_PLANES defines 2020-05-02 12:08:31 +02:00
Nev3r
63fb8f846b Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next 2020-03-11 09:31:31 +01:00
James R
2274129f57 Update copyright year to 2020 2020-02-19 14:08:45 -08:00
MascaraSnake
c2311dca45 Merge branch 'next' into udmf-next 2020-02-18 18:39:11 +01:00
fickleheart
6a076091f7 Improvements to polyobjects carrying things:
- Fixed loss of precision in rotate carry causing objects to slide off
- Adjusted player carrying logic to make platforms less slippery
- Finally obsoleted the player-specific rotate hack now that I found the
  actual problem :]
2020-02-10 00:07:25 -06:00
MascaraSnake
0080844c5b Use tag instead of angle for polyobject spawn points and anchors 2020-01-25 10:15:20 +01:00
fickleheart
77ba835f4f Merge branch 'next' into next-newcontrols
# Conflicts:
#	src/g_game.c
#	src/p_setup.c
2019-12-31 12:58:36 -06:00
James R
0f3b77de8c Merge branch 'polyobj-waypoint-thinker-optimise' into 'next'
Polyobj waypoint thinker optimise

See merge request STJr/SRB2!586
2019-12-31 01:33:01 -05:00
Monster Iestyn
014d2f6358 Fix P_SetTarget crash by setting th->target to NULL first 2019-12-30 11:49:01 +00:00
Nev3r
d689e06c6a Add XNOD, XGLN and XGL3 BSP formats recognition and support. 2019-12-29 14:17:51 +01:00
Monster Iestyn
6092c5774e use P_SetTarget to assign a value to th->target 2019-12-27 19:24:00 +00:00
Monster Iestyn
ad56f5e362 added a "target" pointer to polywaypoint_t, so the polyobj waypoint thinker doesn't have to re-find the next waypoint every tic 2019-12-27 19:10:14 +00:00
fickleheart
d1c9a3af0b Fix wacky CEZ2 platform camera 2019-12-13 19:30:19 -06:00
Steel Titanium
a5cdb0a4b3 Update copyright date on source files 2019-12-06 13:49:42 -05:00
Monster Iestyn
eb477ee784 Remove commented out P_CheckSector calls and add extra comments explaining the situation 2019-08-03 19:06:45 +01: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
1ba1318f37 Fix mixed code-and-declaration error 2019-07-14 16:19:48 +01:00
Jonas Sauer
b7c783223a Fixed the thinkerlist issues by removing THINK_LIMBO. Delay-removed thinkers now stay in their list.
Also includes toaster's assorted fixes and improvements from target_painted_on_your_ass.
2019-07-13 01:42:03 +02:00