Commit graph

9969 commits

Author SHA1 Message Date
Nev3r
96f6800ec3 Merge branch 'udmf-thingargs' into udmf-multitag
# Conflicts:
#	src/doomdata.h
#	src/lua_mobjlib.c
#	src/p_setup.c
2020-04-22 10:54:27 +02:00
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
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
Nev3r
0368c7b4bd Merge branch 'udmf-mthingscale' into 'udmf-next'
Add mapthing scale support

See merge request STJr/SRB2!883
2020-04-21 12:26:46 -04:00
Nev3r
d0340c864f Merge branch 'udmf-next' into udmf-multitag 2020-04-20 09:05:55 +02:00
Nev3r
2d15e953eb Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next 2020-04-20 09:05:21 +02:00
Nev3r
ccb8e7a7c6 Use fixed_t on the mapthing scale for the sake of coherence. 2020-04-19 18:34:00 +02:00
Nev3r
1ebfeb3be6 Add mapthing pitch/roll Lua access as well. 2020-04-19 17:19:04 +02:00
Nev3r
9eb5fe954d Add missed pitch and roll to precipmobj_t 2020-04-19 16:05:08 +02:00
Nev3r
c00f995b7f Move the scale setting code behind the MapthingSpawn hook. 2020-04-19 16:00:57 +02:00
Nev3r
f55f425d1a Add Lua support. 2020-04-19 15:56:06 +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
Nev3r
a11f94e45b Fix cage issue with boss 4. 2020-04-19 13:13:53 +02:00
Nev3r
630e8f27a1 Merge branch 'udmf-argenums' into 'udmf-next'
No more magic numbers for linedef arg values in UDMF

See merge request STJr/SRB2!881
2020-04-19 07:06:32 -04:00
Nev3r
268a66a55a Fix an outrageous typo which didn't get pushed for some reason. 2020-04-19 12:23:51 +02:00
Nev3r
57b12f4592 Taggroups are now sorted when a new entry is added. 2020-04-19 12:21:22 +02:00
James R
28b1e8de1c Merge remote-tracking branch 'origin/master' into next 2020-04-18 17:20:33 -07:00
James R
01da59fe02 Merge branch 'angle-for-spawn-object' into 'next'
Make the Spawn Object linedef executor able to set the object's angle.

See merge request STJr/SRB2!877
2020-04-18 20:16:07 -04:00
James R
a7291a2ad4 Merge branch 'packetversion-revision' into 'master'
The rule for PACKETVERSION is too confusing, it's also too hard to unify formats

See merge request STJr/SRB2!875
2020-04-18 20:15:23 -04:00
James R
7e981edfcc Merge branch 'continue_tweaks' into 'next'
A tangible mechanism to disable Continues

See merge request STJr/SRB2!865
2020-04-18 20:15:04 -04:00
James R
a891b1126b Merge branch 'netgame-urls' into 'master'
srb2:// server URLs

See merge request STJr/SRB2!858
2020-04-18 20:11:00 -04: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
MascaraSnake
059fded08c Fix NULL pointer crash involving stringargs 2020-04-18 12:23:01 +02:00
Nev3r
e7d68601cf Implement dynamic global taggroups/lists functionality. 2020-04-18 11:35:56 +02: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
Nev3r
c997624224 Rewrote a bit of the boss 4 code, which still requires working dynamic global tag lists. 2020-04-17 23:43:26 +02:00
Nev3r
9e79101ee3 Remove old taglist access from Lua. 2020-04-17 23:31:08 +02:00
Nev3r
80d1e0561b Remove old tag list netgame packing/unpacking. 2020-04-17 23:30:47 +02:00
Nev3r
456acb24a0 Remove P_ChangeSectorTag(). 2020-04-17 23:30:07 +02:00
Nev3r
98daa82462 Double fuck. 2020-04-17 23:05:41 +02:00
Nev3r
d3719d923b Fuck. 2020-04-17 22:41:04 +02:00
Nev3r
95146cfdab Make the Lua interface return/set the first tags from the local taglists. 2020-04-17 22:30:16 +02:00
Nev3r
36d6bbd42a Netsynch the sector local taglists. 2020-04-17 22:29:26 +02:00
Nev3r
71ab943298 Remove presumably the remaining old tag references in the gamelogic. 2020-04-17 22:28:41 +02:00
Nev3r
df87feaba7 Carry over a considerable case regarding accessing the old tag vars. 2020-04-17 18:15:25 +02:00
Nev3r
f4f42c25fb Add currently unused auxiliary function. 2020-04-17 18:14:15 +02:00
Nev3r
27c4b584e2 Move the global taglist init functionality to the taglist files. 2020-04-17 12:52:44 +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
8adeb39ada P_SpawnSpecials() line special spawn sequence now uses the taglist, until we move on to using args[0]. 2020-04-17 10:52:12 +02:00
Nev3r
e11e19a5c0 Make a commented out debug code account for taglists. 2020-04-17 10:41:26 +02:00
Nev3r
3a007462c4 Portal lines now use the taglist's first element. 2020-04-17 10:34:24 +02:00