Sally Coolatta
fc934b38e1
Merge public next
2020-11-10 15:32:48 -05:00
JugadorXEI
5d22277aed
Polyobject and SPB 'lastlook' interaction fix
2020-11-03 16:41:00 +01:00
Sryder
11386e12ba
Keep NUMTRANSMAPS what it was, instead add NUMEFFECTMAPS to end of enum
...
Should have easier merging and be less likely to break current effects.
2020-10-26 11:18:53 +00:00
Sryder
a585d3c9d1
Revert "Fix various things that used NUMTRANSMAPS for the number of translucent trans maps"
...
This reverts commit dc453fbbda
2020-10-26 11:07:17 +00:00
Sryder
dc453fbbda
Fix various things that used NUMTRANSMAPS for the number of translucent trans maps
2020-10-25 23:19:20 +00:00
Sryder
488ad70da3
Merge branch 'the-scary-22-merge' of git@git.do.srb2.org:KartKrew/Kart.git into additive-transmap
2020-10-25 14:43:44 +00:00
Sally Coolatta
7c2bd0d1c2
Merge remote-tracking branch 'srb2/next' into the-scary-22-merge
2020-10-24 20:50:58 -04:00
Sryder
d311242a6e
Support for additive/subtractive translation maps on FOFs and Polyobjects
...
Polyobjects set translucency to 11 for additive, and 12 for subtractive
FOFs using the regular translucency settings set the top texture to #900 for additive, and #901 for subtractive
2020-10-22 23:13:51 +01: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
Sally Coolatta
99a1bacb81
Turning code overhaul
...
Packet drops are still broken, but at least netgames are playable now.
2020-09-22 00:35:44 -04:00
Monster Iestyn
4424a949b2
Added the functions Polyobj_moveXY and Polyobj_rotate to Lua as polyobj.moveXY and polyobj.rotate
2020-09-09 19:38:56 +01:00
FlykeSpice
2d9ec1687c
Remove POLYOBJECTS POLYOBJECTS_PLANES #ifdefs(backport from srb2 2.2)
2020-08-20 13:02:13 -04:00
Sally Coolatta
9b9ab8a2d5
Get up to p_user
2020-08-14 23:23:14 -04:00
Sally Coolatta
6a9b68cc88
Merge p_polyobj.c
2020-08-10 14:39:11 -04:00
Sally Coolatta
e296e1309a
YAY, round 2
2020-08-09 21:02:56 -04:00
Sally Coolatta
d27f16c4d5
A bunch of easy files (1-5 conflicts)
...
g_state.h, hu_stuff.h, lua_hud.h, m_misc.h, p_polyobj.c, p_telept.c, r_draw.c, r_draw8.c, r_sky.c
2020-08-05 14:34:17 -04:00
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
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
d886e35576
Fix potential desynch when a player spawns
2020-05-28 11:03:35 +02:00
Sryder
195920acdc
Update light offset on polyobjects when they rotate
2020-05-21 17:15:50 +01: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
