Commit graph

9952 commits

Author SHA1 Message Date
Nev3r
5c605a8a39 Merge branch 'udmf-next' into udmf-multitag 2020-04-20 09:05:55 +02:00
Nev3r
efb81fc526 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next 2020-04-20 09:05:21 +02:00
Nev3r
9ac60a62b3 Fix cage issue with boss 4. 2020-04-19 13:13:53 +02:00
Nev3r
197d4e405d 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
6eaaa744f4 Taggroups are now sorted when a new entry is added. 2020-04-19 12:21:22 +02:00
James R
536fb1ef2a Merge remote-tracking branch 'origin/master' into next 2020-04-18 17:20:33 -07:00
James R
cbe181c66d 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
b11845b045 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
abb338d650 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
40ec8c4344 Merge branch 'netgame-urls' into 'master'
srb2:// server URLs

See merge request STJr/SRB2!858
2020-04-18 20:11:00 -04: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
ffc161e2aa Merge branch 'udmf-next' into udmf-multitag
# Conflicts:
#	src/p_spec.c
2020-04-18 14:04:15 +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
MascaraSnake
2a300bcea4 Fix NULL pointer crash involving stringargs 2020-04-18 12:23:01 +02:00
Nev3r
b7c4ed9c6b Implement dynamic global taggroups/lists functionality. 2020-04-18 11:35:56 +02:00
Nev3r
aa0d76f8fa Delete tags. 2020-04-18 00:23:24 +02:00
Nev3r
e87ad0fb38 Delete old taglists. 2020-04-18 00:05:55 +02:00
Nev3r
d775a42e93 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
38c665fa79 Remove old taglist access from Lua. 2020-04-17 23:31:08 +02:00
Nev3r
7c11091c40 Remove old tag list netgame packing/unpacking. 2020-04-17 23:30:47 +02:00
Nev3r
9eb17e4104 Remove P_ChangeSectorTag(). 2020-04-17 23:30:07 +02:00
Nev3r
e2a98a1591 Double fuck. 2020-04-17 23:05:41 +02:00
Nev3r
0c2fb80ec9 Fuck. 2020-04-17 22:41:04 +02:00
Nev3r
6c12e6701d Make the Lua interface return/set the first tags from the local taglists. 2020-04-17 22:30:16 +02:00
Nev3r
ae07b7c96c Netsynch the sector local taglists. 2020-04-17 22:29:26 +02:00
Nev3r
7904856e8e Remove presumably the remaining old tag references in the gamelogic. 2020-04-17 22:28:41 +02:00
Nev3r
b5eaad42fc Carry over a considerable case regarding accessing the old tag vars. 2020-04-17 18:15:25 +02:00
Nev3r
e3dfdb448e Add currently unused auxiliary function. 2020-04-17 18:14:15 +02:00
Nev3r
b690d35a99 Move the global taglist init functionality to the taglist files. 2020-04-17 12:52:44 +02:00
Nev3r
209b8e7678 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
dd46b1ab44 P_ConvertBinaryMap() line conversion now uses the first tag from taglists. 2020-04-17 11:16:01 +02:00
Nev3r
a5bc3fb507 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
61c3e12d63 Make a commented out debug code account for taglists. 2020-04-17 10:41:26 +02:00
Nev3r
e59480e4cf Portal lines now use the taglist's first element. 2020-04-17 10:34:24 +02:00
Nev3r
b9decb2837 Polyobject spawning now use the taglist. 2020-04-17 10:30:38 +02:00
Nev3r
4fc07473fd Skybox spawning now uses the taglists. 2020-04-17 10:05:50 +02:00
Nev3r
81be6b4067 Thing-based slope vertexes use taglists now. 2020-04-17 10:04:11 +02:00
Nev3r
944716c45a Add auxiliary functions to the taglist library. 2020-04-17 09:57:45 +02:00
Nev3r
c0b4090924 Clean up type inconsistency on tags. 2020-04-16 18:48:57 +02:00
Nev3r
1d572c5b2c Fix fuckup in the -1 tag bailout on the global tag lists. 2020-04-16 15:10:48 +02:00
Nev3r
786e448f16 Do not add -1 to the global taglists. 2020-04-15 10:17:14 +02:00
Nev3r
95c7690a40 Remove P_FindSpecialLineFromTag() 2020-04-15 10:16:49 +02:00
Nev3r
7d3d71c418 Get rid of the last case of P_FindSpecialLineFromTag() in the main code. 2020-04-15 10:05:59 +02:00
Nev3r
f9b1acb813 reworked Tag_FindLineSpecial() 2020-04-15 09:41:21 +02:00
Nev3r
2d9b0e4906 Fix the args in Tag_FindLineSpecial() being swapped. 2020-04-15 09:32:19 +02:00
Nev3r
439fde3434 Replace most P_FindSpecialLineFromTag() cases with Tag_FindLineSpecial(), which settle with the first found result. 2020-04-14 23:59:22 +02:00
Nev3r
d518703334 Replaces P_FindSectorFromTag() occurrences with its corresponding macro and vanishes it from existence. 2020-04-14 23:33:56 +02:00
Nev3r
25102ab4af Remove P_FindSectorFromLineTag() 2020-04-14 22:22:48 +02:00