sphere
a53d9b3788
Merge branch '457failuretagfix' into 'next'
...
Fix action 457 (Track object angle) not triggering the 'failure' tag
Closes #883
See merge request STJr/SRB2!1814
2022-09-28 21:04:02 +00:00
spherallic
00ecddf3e9
Fix action 457 reading the failure tag from the wrong offset field
2022-09-18 12:55:17 +02:00
spherallic
8a0f0237f2
Merge branch 'next' into udmf-fof-flags
2022-09-06 09:52:01 +02:00
sphere
9e2d8f059d
Merge branch 'write-textmap-bruh' into 'next'
...
Fix size_t compiler warnings in P_WriteTextmap
See merge request STJr/SRB2!1785
2022-09-05 21:54:20 +00:00
MascaraSnake
ec119eac2f
Merge branch 'next' into udmf-fof-flags
2022-07-31 13:27:03 +02:00
MascaraSnake
8d4baace53
Add Lua backwards compatibility for FOF flags
2022-07-31 12:04:42 +02:00
MascaraSnake
9971592dc6
UDMF conversion: Fix noclimb flag not being applied to linedef types 66-68
2022-06-04 11:14:31 +02:00
MascaraSnake
fc4b79c0de
Fix custom FOF flag conversion in binary maps
2022-06-04 10:59:42 +02:00
Eidolon
f94c25c05c
Change UDMF wall scroll scale to SCROLL_SHIFT
...
UDMF special 502 now must scale arg 2 and 3 in the same scale
space as line length scrolling in binary format. This
is to ensure compatibility with the binary format.
Fixes STJr/SRB2#862
Co-Authored-By: MascaraSnake <jonassauer27@gmail.com>
2022-05-29 02:02:20 -05:00
Zwip-Zwap Zapony
d10ca13eb9
Apply 1 suggestion(s) to 1 file(s)
2022-05-28 12:18:09 +00:00
MascaraSnake
e1a5f48c51
Fix even more size_t printfs
2022-05-28 14:08:19 +02:00
MascaraSnake
fd2a097c34
Fix more size_t mishaps
2022-05-28 10:29:35 +02:00
MascaraSnake
28bdd7ef00
Fix size_t compiler warnings in P_WriteTextmap
2022-05-01 19:27:10 +02:00
MascaraSnake
5fbe5189ce
Merge branch 'udmf-sector-fields' into udmf-full
2022-04-20 21:01:52 +02:00
MascaraSnake
faa7d89e3e
Merge branch 'udmf-more-linedef-types' into udmf-sector-fields
2022-04-20 21:01:16 +02:00
MascaraSnake
5660d896e6
Merge branch 'udmf-thing-types' into udmf-more-linedef-types
2022-04-20 21:00:44 +02:00
MascaraSnake
54640a8664
Merge branch 'udmf-executor-triggers' into udmf-thing-types
...
# Conflicts:
# extras/conf/udb/Includes/SRB222_things.cfg
2022-04-20 20:59:55 +02:00
MascaraSnake
39b7fb9ff8
Merge commit 'd624ee25' into udmf-thing-types
...
# Conflicts:
# src/p_mobj.c
# src/p_spec.c
2022-04-20 20:41:46 +02:00
MascaraSnake
9815d40c20
Adapt tutorial plant to UDMF
2022-04-20 20:06:08 +02:00
MascaraSnake
36bf8b1a77
Merge branch 'udmf-linedef-executors' into udmf-executor-triggers
2022-04-19 22:33:53 +02:00
MascaraSnake
863b1e125a
Merge branch 'udmf-lighting' into udmf-linedef-executors
...
# Conflicts:
# src/p_spec.c
2022-04-19 22:31:57 +02:00
MascaraSnake
2e56c3de35
Merge branch 'udmf-polyobjects' into udmf-lighting
2022-04-19 22:18:30 +02:00
MascaraSnake
f672b1b940
Merge branch 'udmf-scrollers' into udmf-polyobjects
...
# Conflicts:
# src/p_spec.c
2022-04-19 22:17:28 +02:00
MascaraSnake
f164809618
Merge branch 'udmf-plane-linedefs' into udmf-scrollers
2022-04-19 22:06:32 +02:00
MascaraSnake
36692483df
Merge branch 'udmf-fofs-mkii' into udmf-plane-linedefs
...
# Conflicts:
# src/p_inter.c
2022-04-19 22:04:04 +02:00
MascaraSnake
0b4bbacec0
Merge branch 'next' into udmf-fofs-mkii
2022-04-19 21:59:31 +02:00
sphere
55854410ac
Merge branch 'line-angle' into 'next'
...
Add angle field to linedef_t
See merge request STJr/SRB2!1602
2022-03-22 09:09:40 +00:00
sphere
a0aebb2ed0
Merge branch 'fast-r-load-textures' into 'next'
...
Do not reload every texture when adding a wad
See merge request STJr/SRB2!1725
2022-03-21 22:41:04 +00:00
MascaraSnake
a78e4e553c
Merge branch 'next' into udmf-fofs-mkii
2022-03-18 07:29:02 +01:00
SteelT
3eaae066ef
Show overall grade emblem requirement of a multi-mare NiGHTS stage in SP pause menu
...
Fixes #71
2022-03-08 21:06:01 -05:00
spherallic
50330c746b
Merge branch 'next' into fast-r-load-textures
2022-03-08 22:11:16 +01:00
spherallic
14295ac7de
2022
2022-03-03 20:24:46 +01:00
LJ Sonic
1a1cb8942c
Merge branch 'znodes-offset-fix' into 'next'
...
UDMF: Fix offset calculation for segs that represent linedef backsides
See merge request STJr/SRB2!1701
2022-02-06 17:12:58 +00:00
James R
2ebec53561
P_AddWadFile: only load textures in current file
2022-01-27 00:03:34 -08:00
MascaraSnake
a342703b50
Merge branch 'udmf-sector-fields' into udmf-full
...
# Conflicts:
# src/lua_maplib.c
# src/p_setup.c
2022-01-14 21:16:23 +01:00
MascaraSnake
13b8d1cf7e
Merge branch 'udmf-more-linedef-types' into udmf-sector-fields
2022-01-14 21:09:11 +01:00
MascaraSnake
7fd1c0512a
Merge branch 'udmf-thing-types' into udmf-more-linedef-types
...
# Conflicts:
# src/p_setup.c
2022-01-14 21:06:45 +01:00
MascaraSnake
0833f0bd4f
Merge branch 'udmf-executor-triggers' into udmf-thing-types
...
# Conflicts:
# src/p_setup.c
# src/p_spec.h
2022-01-14 21:01:39 +01:00
MascaraSnake
0d9860c368
Merge branch 'udmf-linedef-executors' into udmf-executor-triggers
2022-01-14 20:42:59 +01:00
MascaraSnake
4b8f5bd7f3
Merge branch 'udmf-lighting' into udmf-linedef-executors
...
# Conflicts:
# extras/conf/udb/Includes/SRB222_misc.cfg
# src/doomdata.h
# src/r_defs.h
2022-01-14 20:30:29 +01:00
MascaraSnake
79cf2f53e8
Merge branch 'udmf-polyobjects' into udmf-lighting
2022-01-14 20:24:51 +01:00
MascaraSnake
7d2a188c31
Merge branch 'udmf-scrollers' into udmf-polyobjects
2022-01-14 20:24:13 +01:00
MascaraSnake
940d076190
Merge branch 'udmf-plane-linedefs' into udmf-scrollers
...
# Conflicts:
# extras/conf/udb/Includes/SRB222_misc.cfg
# src/p_spec.h
2022-01-14 20:21:48 +01:00
MascaraSnake
5d343f9c13
Merge branch 'udmf-fofs-mkii' into udmf-plane-linedefs
...
# Conflicts:
# extras/conf/udb/Includes/SRB222_misc.cfg
# src/p_spec.h
2022-01-14 20:17:18 +01:00
MascaraSnake
323cfaace9
Add blendmode support to FOFs
2022-01-14 19:40:45 +01:00
MascaraSnake
6bb6dc88ca
Merge branch 'next' into udmf-fofs-mkii
...
# Conflicts:
# src/hardware/hw_main.c
# src/lua_maplib.c
# src/p_spec.c
# src/p_user.c
2022-01-14 07:24:05 +01:00
MascaraSnake
7c0687bc33
P_WriteTextmap: Copy colormap only to first tagged sector and do the rest via the linedef
2022-01-13 23:02:38 +01:00
MascaraSnake
1fdfb6ba6e
P_WriteTextmap: Add warning for linedef type 61
2022-01-13 22:14:41 +01:00
MascaraSnake
b8524fc741
P_WriteTextmap: Convert linedef executors that rely on mapthings
2022-01-13 21:59:00 +01:00
MascaraSnake
2d4aabe48e
P_WriteTextmap: Remove superfluous whitespaces in moreids
2022-01-13 18:57:41 +01:00
