Nev3r
3c6ad3a9a8
Merge branch 'udmf-next' into udmf-multitag
...
# Conflicts:
# src/doomdata.h
# src/p_setup.c
2020-04-22 09:11:17 +02:00
Nev3r
3d6d767bce
Initialize pitch and roll on textmap mapthings too.
2020-04-22 09:00:29 +02:00
Nev3r
fbb2450133
Merge branch 'udmf-next' into udmf-thingargs
...
# Conflicts:
# src/p_setup.c
2020-04-22 08:58:40 +02:00
Ashnal
abc17c9448
Fix dedicated servers not waiting for client wipes.
...
Now they run wipe logic to wait the same amount of
time that clients do, without actually rendering anything.
Previously, the server would start the new map immediately,
and clients would frameskip up to the server when they were done wiping.
2020-04-21 19:16:31 -05:00
Nev3r
3358413479
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
74e8d7f733
Rename lumpinfo_t.name2 to lumpinfo_t.fullname
2020-04-20 23:40:41 +02:00
Nev3r
d0340c864f
Merge branch 'udmf-next' into udmf-multitag
2020-04-20 09:05:55 +02:00
Nev3r
5632120a74
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
da165d2d22
Add textmap pitch and roll parsing, and mobj pitch and roll variables.
2020-04-19 14:51:55 +02:00
MascaraSnake
c1dff185bf
Add enums to encapsulate the textmap colormap settings
2020-04-18 17:15:25 +02:00
MascaraSnake
7978920b53
Merge branch 'udmf-next' into udmf-argenums
2020-04-18 16:56:21 +02:00
MascaraSnake
6abc3da5de
Add enums to encapsulate the textmap slope settings
2020-04-18 16:55:56 +02:00
Nev3r
c6cc863a3a
Merge branch 'udmf-next' into udmf-multitag
...
# Conflicts:
# src/p_spec.c
2020-04-18 14:04:15 +02:00
Nev3r
109d09aa4c
Merge branch 'udmf-colormaps' into 'udmf-next'
...
UDMF colormaps
See merge request STJr/SRB2!855
2020-04-18 07:42:24 -04:00
Sally Cochenour
96d69785bf
Merge branch 'master' into pet-robo
2020-04-18 01:18:22 -04:00
Nev3r
f61d677f34
Delete tags.
2020-04-18 00:23:24 +02:00
Nev3r
86b0eabaa2
Delete old taglists.
2020-04-18 00:05:55 +02:00
MascaraSnake
93eb0ee1c8
Add an enum for crumblestate
2020-04-17 23:54:37 +02:00
Nev3r
36d6bbd42a
Netsynch the sector local taglists.
2020-04-17 22:29:26 +02:00
Nev3r
df87feaba7
Carry over a considerable case regarding accessing the old tag vars.
2020-04-17 18:15:25 +02:00
Nev3r
7cd4a3de14
Map loading should consider tag 0 as a valid tag and add its respective entries just like the rest of tags.
2020-04-17 11:21:40 +02:00
Nev3r
0375bef961
P_ConvertBinaryMap() line conversion now uses the first tag from taglists.
2020-04-17 11:16:01 +02:00
Nev3r
720da2ab35
Polyobject spawning now use the taglist.
2020-04-17 10:30:38 +02:00
Nev3r
6ab06fc89c
Skybox spawning now uses the taglists.
2020-04-17 10:05:50 +02:00
Nev3r
e0edd25fd6
Thing-based slope vertexes use taglists now.
2020-04-17 10:04:11 +02:00
James R
0b3b13b3b5
Remove FOF height sorting
2020-04-15 19:16:49 -07:00
Nev3r
cccf5d8151
Merge branch 'udmf-next' into udmf-multitag
2020-04-14 22:21:32 +02:00
Nev3r
750cafbcbc
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next
2020-04-14 22:20:54 +02:00
Nev3r
44426fd453
Actually remove the entire code block in T_MovePlane(), and remove line_t.tagline as it served no other purpose.
2020-04-13 15:17:53 +02:00
Nev3r
e00c8fcdbe
Added static multitag read and storage on mapload.
2020-04-12 11:56:36 +02:00
Nev3r
1dae8df2f5
Merge branch 'udmf-next' into udmf-thingargs
2020-04-12 10:02:12 +02:00
Nev3r
860c44d953
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next
...
# Conflicts:
# src/lua_hooklib.c
2020-04-12 09:57:19 +02:00
Wolfy
5e4ec61d82
Merge remote-tracking branch 'remotes/bird/isolatedbatching' into awful-mix
...
# Conflicts:
# src/hardware/hw_cache.c
# src/hardware/hw_draw.c
# src/hardware/hw_glob.h
# src/hardware/hw_main.c
# src/r_bsp.h
# src/r_data.c
2020-04-11 23:47:25 -05:00
Nev3r
dec80cb2a7
Add mapthing arg support.
2020-04-11 12:54:34 +02:00
James R
71f4433b98
Merge branch 'dye' into 'next'
...
Expose colorization to mappers and SOC
See merge request STJr/SRB2!679
2020-04-09 19:50:32 -04: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
James R
3fa22c508b
Put screenshots, movies and replays under a "media" directory
2020-03-30 17:41:48 -07:00
Latapostrophe
4c1459cd4e
Chaos Conflicts
2020-03-29 12:14:27 +02:00
Sally Cochenour
751fd9ad1b
Start on bots, doesn't work
2020-03-27 23:51:49 -04:00
James R
abcba53781
Merge remote-tracking branch 'origin/master' into parties
2020-03-22 18:28:07 -07:00
James R
cbd4693de7
Merge remote-tracking branch 'origin/master' into parties
2020-03-22 14:34:29 -07:00
Sally Cochenour
b1ec5654bc
Merge branch 'master' into targets
2020-03-22 14:31:17 -04:00
MascaraSnake
62603ff226
Merge branch 'udmf-next' into udmf-colormaps
2020-03-22 08:05:05 +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
MascaraSnake
f92d5806b5
Add sector flag that protects the colormap from being changed
2020-03-20 12:19:02 +01:00
MascaraSnake
79852f0ec0
Adapt setup of colormap linedefs
2020-03-20 11:19:30 +01:00
Louis-Antoine
46df2b9551
Use HAVE_BLUA as fuel for my fireplace
2020-03-19 18:36:14 +01:00
Sryder
c268313f0a
Merge branch 'master' of git@git.magicalgirl.moe:KartKrew/Kart.git into waypoints
...
# Conflicts:
# src/Makefile
# src/k_kart.c
# src/p_map.c
# src/p_setup.c
# src/p_spec.c
2020-03-16 00:13:42 +00:00
Monster Iestyn
f3bfa2b1db
Merge branch 'master' into next
2020-03-15 20:32:43 +00:00
