Commit graph

8414 commits

Author SHA1 Message Date
Alam Ed Arias
c3694ab1fa Do not pass declarations in the middle of code 2019-12-27 15:34:54 -05:00
Alam Ed Arias
d044437334 while using pointer math, use the sizeu#() functions, %d does not handle size_t 2019-12-27 14:12:37 -05:00
Alam Ed Arias
ee7d68f297 atol() returns long, not size_t 2019-12-27 14:10:58 -05:00
Alam Ed Arias
c2e438e1a8 R_GetLinedefTransTable is needed by the hardware code 2019-12-27 14:10:38 -05:00
Nev3r
2fdd2290b1 Revert "Add disabled multitag parsing."
This reverts commit a5967c749a.
2019-12-19 17:41:21 +01:00
Nev3r
1d68daca78 Revert "Partial usage of multitag lists for sectors. The game still accesses sector tags directly though so that needs to be addressed."
This reverts commit 8b21b93fd9.
2019-12-19 17:40:52 +01:00
Nev3r
8b21b93fd9 Partial usage of multitag lists for sectors. The game still accesses sector tags directly though so that needs to be addressed. 2019-12-18 14:19:35 +01:00
Nev3r
8c0a1aa4d3 Convert wind/current. 2019-12-18 10:15:12 +01:00
Nev3r
f51dc1acba Convert scrollers. 2019-12-17 16:37:01 +01:00
Nev3r
a5967c749a Add disabled multitag parsing. 2019-12-17 16:16:26 +01:00
Nev3r
cf52de46fb Tokenizer does no longer ignore quotes; instead it captures all the characters contained within until it reaches the next quotes. 2019-12-17 14:34:55 +01:00
Nev3r
29a168f024 Fix memory leaks in textmap parsing. 2019-12-17 12:35:35 +01:00
Nev3r
b712b0d8f6 Disable remaining new taglist code. 2019-12-17 10:54:25 +01:00
Nev3r
4634a45eb5 Convert most linedef executor triggers. 2019-12-17 10:54:03 +01:00
Nev3r
92d02ec907 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-specials 2019-12-16 19:16:32 +01:00
Nev3r
d87d9eba8f Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-specials 2019-12-16 19:16:25 +01:00
Nev3r
e1ae74c56a Disable new unused multitag code for now. 2019-12-16 19:10:39 +01:00
Nev3r
3c2862ee34 Fix git merge conflict trolling regarding some rogue commit
Merge branch 'udmf-specials' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-specials

# Conflicts:
#	src/p_slopes.c
#	src/p_spec.c
#	src/r_defs.h
2019-12-16 19:10:17 +01:00
Nev3r
1864bc94ba Implemented the remaining FOF types, "for the most part", as per MascaraSnake's original words. 2019-12-16 18:21:11 +01:00
Monster Iestyn
130794cc4d Merge branch 'master' into next 2019-12-16 15:41:47 +00:00
Nev3r
91f4f6c77c Converted line specials 100-146 2019-12-16 14:44:19 +01:00
Nev3r
27aa1f9d51 Enable alpha reading for walls. 2019-12-16 13:30:06 +01:00
Nev3r
96cd14eeac Convert culling planes and fake floors. 2019-12-16 13:13:22 +01:00
Nev3r
67702a8995 Static function 2019-12-16 13:01:14 +01:00
Nev3r
e2394c1817 Convert translucent walls. 2019-12-16 13:01:01 +01:00
Nev3r
cae9793f52 Converted ropehang parameters. 2019-12-16 12:38:58 +01:00
Nev3r
31108219c2 Add gravity and gravity flip flag. 2019-12-16 12:32:22 +01:00
Nev3r
4bbfd36999 Does what the previous commit says it did, as I failed to commit the changes properly: "Add line args; add map conversion function; convert slope specials." 2019-12-16 10:42:07 +01:00
Nev3r
c5960a6490 Add line args; add map conversion function; convert slope specials. 2019-12-16 10:03:14 +01:00
James R
53c7df4818 Merge branch 'map-command-no-mapheaderinfo' into 'master'
Let the map command warp to maps without a level header

See merge request STJr/SRB2!528
2019-12-15 16:59:03 -05:00
James R
adc87640d9 Merge branch 'cmake-fixes' into 'master'
Various cmake adjustments

See merge request STJr/SRB2!538
2019-12-15 16:58:45 -05:00
James R
00e2c420f6 Merge branch 'dont-be-mean-to-tails-plz' into 'master'
Don't be mean to Tails plz (Pandora's Box Super cheat fix)

See merge request STJr/SRB2!540
2019-12-15 16:58:24 -05:00
Nev3r
2fb5eb843e Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-base 2019-12-15 19:12:28 +01:00
Nev3r
2248e910a5 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-base 2019-12-15 19:11:54 +01:00
Nev3r
4a609b5eef Add barebones multitag lists. They are not yet used anywhere for now. 2019-12-15 18:35:17 +01:00
Nev3r
95c0b791b0 Terrible non-sloped flat scaling, based on the X component of the scaling for software renderer. 2019-12-15 17:59:28 +01:00
Nev3r
4dd39e4063 Prevent bleeding between different-scale planes in software renderer. 2019-12-15 17:36:28 +01:00
Monster Iestyn
eb179e4d6a Remove anti-Tails restriction for the Allow super Pandora's Box cheat.
Despite popular belief, this was just some experimenting from 2.2 development that we forgot to remove!
2019-12-15 15:40:56 +00:00
Eidolon
d63ad82dc5 [cmake] Remove srb2dd target 2019-12-15 00:47:58 -06:00
Eidolon
11f5911943 [cmake] Use same executable names as Makefile 2019-12-15 00:39:04 -06:00
James R
1123b5debd Merge remote-tracking branch 'origin/master' into next 2019-12-14 15:28:25 -08:00
James R
4daf9666a2 Merge branch 'ripple2' into 'master'
Tilted ripple

See merge request STJr/SRB2!524
2019-12-14 17:52:54 -05:00
Jaime Passos
4d87bcca13 Move position of R_PlaneRipple in the file so this looks more organised 2019-12-14 19:50:40 -03:00
Jaime Passos
871ebef332 Merge remote-tracking branch 'origin/master' into ripple2 2019-12-14 19:36:54 -03:00
James R
14674223e8 Merge branch 'opengl-is-a-bad-renderer' into 'master'
OpenGL fixes

See merge request STJr/SRB2!519
2019-12-14 16:48:50 -05:00
James R
b121bc2b3b Merge branch 'fix-shield-hover' into 'next'
Stop characters from being able to activate their abilities when doing a shield ability!

See merge request STJr/SRB2!522
2019-12-14 16:48:12 -05:00
James R
64eb89fc56 Merge branch 'portalcullsector' into 'master'
Restore portal culling code that went gone by pure accident

See merge request STJr/SRB2!523
2019-12-14 16:47:51 -05:00
James R
e5714db75c Merge branch 'software-drawers-refactor' into 'master'
Optimize Software drawers

See merge request STJr/SRB2!533
2019-12-14 16:47:27 -05:00
James R
65a17a8f09 Merge branch 'customexitvars-rework' into 'next'
Rework G_SetCustomExitVars to allow skipstats 2

See merge request STJr/SRB2!534
2019-12-14 16:47:18 -05:00
Steel Titanium
b3d678a252 Merge branch 'master' into next 2019-12-14 16:44:56 -05:00