stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-12-21 18:30:40 +00:00
Code Issues Projects Releases Packages Wiki Activity
10323 commits 172 branches 41 tags 280 MiB
Commit graph

677 commits

Author SHA1 Message Date
MascaraSnake
9dbfa28dbc Merge branch 'udmf-next' into udmf-fofs-mkii 
# Conflicts:
#	extras/conf/udb/Includes/SRB222_linedefs.cfg
#	src/p_setup.c
 2020-06-09 09:50:02 +02:00
MascaraSnake
d07c376f6d Adapt POF_SPLAT to UDMF setup 2020-06-09 09:44:49 +02:00
MascaraSnake
4a0206b38d Merge branch 'next' into udmf-next 
# Conflicts:
#	src/p_mobj.c
#	src/p_polyobj.c
 2020-06-09 09:38:01 +02:00
MascaraSnake
11493e61d2 Merge branch 'executordelay' into 'udmf-next' 
UDMF linedef executor delay

See merge request STJr/SRB2!918
 2020-06-01 07:57:23 -04:00
MascaraSnake
371a1851e3 Polyobject waypoint movement: Prevent infinite loop if all waypoints are in the same location 2020-05-16 10:24:06 +02:00
MascaraSnake
02c2aeb46a Merge branch 'udmf-next' into udmf-fofs-mkii 2020-05-13 16:23:36 +02:00
MascaraSnake
d3ec12c842 Merge branch 'udmf-next' into executordelay 
# Conflicts:
#	src/p_spec.c
 2020-05-13 09:55:25 +02:00
MascaraSnake
d708789c3a Store waypoints (for zoom tubes, rope hangs, polyobjects) explicitly 2020-05-12 23:50:30 +02:00
MascaraSnake
df3ca712d8 Move polyobject crush option to the first line args 2020-05-04 23:27:26 +02:00
MascaraSnake
8c36b9efa5 Adapt basic PolyObject setup to UDMF 2020-05-04 22:40:49 +02:00
MascaraSnake
6e7373a475 Merge branch 'next' into udmf-next 2020-05-04 20:32:56 +02:00
MascaraSnake
f26648e6f2 Adapt linedef executor delay to UDMF 2020-05-03 20:41:37 +02:00
MascaraSnake
9eb81539a6 Merge branch 'udmf-next' into udmf-fofs-mkii 2020-05-03 19:31:36 +02:00
MascaraSnake
7fec1211fd Bugfix in XGL3 ZNODES parsing 2020-05-03 19:28:52 +02:00
MascaraSnake
700b340827 Allow map-wide gravity to be set via level header 2020-05-03 18:33:18 +02:00
MascaraSnake
4b87bee759 Add level header options for setting special stage time and spheres requirements 2020-05-03 17:56:49 +02:00
MascaraSnake
1aafc2f463 Replace "bouncy FOF" sector type with "make FOF bouncy" linedef type 2020-05-03 12:44:30 +02:00
MascaraSnake
35e9e5b33c Rearrange FOF flags and improve custom FOF backwards compatibility 2020-05-03 09:13:14 +02:00
MascaraSnake
6949b70dbf Remove temporary FOF setup code 2020-05-02 23:33:07 +02:00
MascaraSnake
0d4d7bfc38 Adapt custom FOF setup 2020-05-02 23:00:22 +02:00
MascaraSnake
4dd25721f6 Merge branch 'movement-refactor' into udmf-fofs-mkii 2020-05-02 14:29:10 +02:00
MascaraSnake
485a4e5035 Remove POLYOBJECTS and POLYOBJECTS_PLANES defines 2020-05-02 12:08:31 +02:00
MascaraSnake
538c81676b Recognize ML_EFFECT1 and ML_EFFECT2 on crumbling FOFs 2020-05-02 10:40:35 +02:00
MascaraSnake
863ac48c9b Fix rising FOF speed 2020-04-27 11:56:29 +02:00
MascaraSnake
c702e697b6 Fix bobbing FOF speed 2020-04-27 11:55:05 +02:00
MascaraSnake
d9f761b619 Adapt setup of rising FOFs 2020-04-27 11:52:31 +02:00
MascaraSnake
7198cc46fd Adapt setup of water bobbing FOF 2020-04-27 11:05:27 +02:00
MascaraSnake
f6b67d8253 Some additions/fixes for air bobbing FOFs 2020-04-27 10:58:38 +02:00
MascaraSnake
607aeb3a52 Adapt setup of air bobbing FOFs 2020-04-27 10:29:29 +02:00
MascaraSnake
e00531ed9c Merge branch 'udmf-next' into udmf-fofs-mkii 
# Conflicts:
#	src/p_floor.c
#	src/p_spec.c
#	src/p_spec.h
 2020-04-26 11:13:09 +02:00
MascaraSnake
3170f2b8c3 Merge branch 'next' into udmf-next 
# Conflicts:
#	src/p_mobj.c
#	src/r_segs.c
 2020-04-24 21:15:53 +02:00
Monster Iestyn
d1d006a1a7 Merge branch 'thinker-cleanup' into 'next' 
Plane movement thinker cleanup

See merge request STJr/SRB2!880
 2020-04-24 14:30:52 -04:00
Monster Iestyn
4ef8093e92 Merge branch 'emeraldspawnfix' into 'next' 
Fix emerald hunt not working properly, part 2

See merge request STJr/SRB2!887
 2020-04-23 15:41:27 -04:00
sphere
f85bfc87f5 Move variable declarations outside of for loops. 2020-04-22 23:17:18 +02:00
sphere
e26788d014 Fix variable-length array definition, just in case. 2020-04-22 23:10:43 +02:00
sphere
01a1297631 Make P_SpawnEmeraldHunt even more concise, using Fisher-Yates shuffle. 2020-04-22 22:46:12 +02:00
sphere
b254cb186b Fix a mistake with P_SpawnEmeraldHunt and make it more concise. 2020-04-22 20:38:58 +02:00
sphere
25affe6948 Make emerald hunt shards spawn at correct heights, and add Float option. 2020-04-22 18:58:40 +02:00
Nev3r
1afb0eb79f Initialize pitch and roll on textmap mapthings too. 2020-04-22 09:00:29 +02:00
Nev3r
188ad67c58 Merge branch 'udmf-next' into udmf-thingargs 
# Conflicts:
#	src/p_setup.c
 2020-04-22 08:58:40 +02:00
Nev3r
3d9d9d74f6 Merge branch 'udmf-pitch-and-roll' into 'udmf-next' 
Add textmap pitch and roll parsing, and mobj pitch and roll variables.

See merge request STJr/SRB2!882
 2020-04-21 12:27:26 -04:00
Louis-Antoine
f6e2c7063f Rename lumpinfo_t.name2 to lumpinfo_t.fullname 2020-04-20 23:40:41 +02:00
Nev3r
7cf08e1a08 Add mapthing scale support; fields scale, scalex and scaley set the only mapthing scale field alike. 2020-04-19 15:18:36 +02:00
Nev3r
ca10b38b9c Add textmap pitch and roll parsing, and mobj pitch and roll variables. 2020-04-19 14:51:55 +02:00
MascaraSnake
1d3aa7129a Add enums for textmap FOF values 2020-04-18 18:02:43 +02:00
MascaraSnake
8e5effa07b Merge branch 'udmf-argenums' into udmf-fofs-mkii 2020-04-18 17:23:02 +02:00
MascaraSnake
09506112d7 Add enums to encapsulate the textmap colormap settings 2020-04-18 17:15:25 +02:00
MascaraSnake
f0c63ce76a Merge branch 'udmf-next' into udmf-argenums 2020-04-18 16:56:21 +02:00
MascaraSnake
111da04b07 Add enums to encapsulate the textmap slope settings 2020-04-18 16:55:56 +02:00
Nev3r
2b2a18fdf1 Merge branch 'udmf-colormaps' into 'udmf-next' 
UDMF colormaps

See merge request STJr/SRB2!855
 2020-04-18 07:42:24 -04:00