Commit graph

14263 commits

Author SHA1 Message Date
Lactozilla
87d40fc3cc Use original portal's origin for the viewpoint displacement 2023-08-25 00:18:20 -03:00
Lactozilla
9335ee3031 Implement "copy portal to line" sector portal type 2023-08-24 17:36:38 -03:00
Lactozilla
ff5d53e54d Serialize sector portals 2023-08-24 16:04:31 -03:00
Lactozilla
6303e37fbe Use P_SetTarget here 2023-08-24 01:19:58 -03:00
Lactozilla
563233a55f Add editor definition for linedef type 6 2023-08-24 01:09:46 -03:00
Lactozilla
6d812b4a43 Implement Eternity Engine's plane portal and horizon portal types 2023-08-24 00:51:52 -03:00
Lactozilla
74ea880ca0 Refactor 2023-08-23 17:49:29 -03:00
Lactozilla
50506254e8 Support plane type 3 in the "copy portal" line special
SRB2 doesn't implement sector portals the way ZDoom does, but this ensures plane type 3 acts the same as plane type 2.
2023-08-23 16:31:03 -03:00
Lactozilla
e230d38aad Ensure sector portals are rendered when they would otherwise be missed 2023-08-23 15:46:48 -03:00
Lactozilla
395e9bdd20 Implement sector portal copying 2023-08-23 15:29:16 -03:00
Lactozilla
5b387ec94a Make linedef type 6 closer to ZDoom's Sector_SetPortal 2023-08-23 15:04:50 -03:00
Lactozilla
03daf721ef Allow sector portals to be displayed properly on sky sectors 2023-08-23 13:43:02 -03:00
Lactozilla
2b64698c4e Use different default viewpoint heights so that ceiling portals make more sense 2023-08-23 04:34:35 -03:00
Lactozilla
1506909a1f Reimplement sector portals 2023-08-23 04:24:06 -03:00
sphere
13ac83a208 Floor portal test, ported
Co-authored-by: Lactozilla <jp6781615@gmail.com>
2023-08-23 02:58:38 -03:00
Sal
3943a48a06 Merge branch 'fix-masked-seg-crash' into 'next'
Fix a possible crash in R_RenderMaskedSegRange

See merge request STJr/SRB2!2121
2023-08-23 04:31:23 +00:00
Sal
3160c3cb40 Merge branch 'objectplace-spritescale' into 'next'
Set spritexscale/spriteyscale in objectplace

Closes #1098

See merge request STJr/SRB2!2119
2023-08-23 04:30:58 +00:00
Lactozilla
55b4458001 Fix a possible crash in R_RenderMaskedSegRange
R_AllocTextureColumnTables wasn't checking if the tables were never allocated, making the renderer later attempt to render midtextures for drawsegs that don't contain actual midtextures.
2023-08-22 13:37:42 -03:00
spherallic
5548b67462 Set spritexscale/spriteyscale in objectplace 2023-08-22 16:32:21 +02:00
sphere
ac3e9fc999 Merge branch 'binary-thing-options' into 'next'
Clear thing flags for NiGHTS bumpers/hoops again

Closes #1097

See merge request STJr/SRB2!2118
2023-08-21 08:24:51 +00:00
sphere
4bd296f98f Merge branch 'issue933' into 'next'
Fix for issue #933 - special stage tokens should divert player until after the...

See merge request STJr/SRB2!1910
2023-08-21 08:20:43 +00:00
spherallic
40d9614c32 Clear thing flags for NiGHTS bumpers/hoops again 2023-08-21 00:43:01 +02:00
sphere
32a40e3dbe Merge branch 'alphabetsoup' into 'next'
Add supername parameter to S_SKIN: displays a custom super name on the GOT THEM ALL screen

See merge request STJr/SRB2!1642
2023-08-20 17:29:03 +00:00
katsy
1a0d9eab79 Add supername parameter to S_SKIN: displays a custom super name on the GOT THEM ALL screen 2023-08-20 17:29:03 +00:00
sphere
d4aac9a857 Merge branch 'fix-freebsd-build' into 'next'
Fix FreeBSD build errors

See merge request STJr/SRB2!2071
2023-08-20 17:19:39 +00:00
sphere
3d0457d58b Merge branch 'preserve-texture-col-frac' into 'next'
Use separate table for maskedtexturecol (resolves #635)

Closes #635

See merge request STJr/SRB2!2073
2023-08-20 17:19:18 +00:00
sphere
8b7978ec35 Merge branch 'color-tweaks' into 'next'
Small color tweaks

See merge request STJr/SRB2!2116
2023-08-20 17:18:58 +00:00
sphere
4a89fc77c1 Merge branch 'fof-rendering-mishaps' into 'next'
Fix a couple of FOF rendering issues

See merge request STJr/SRB2!2115
2023-08-20 17:17:41 +00:00
sphere
5069e77d20 Merge branch 'fix-misplaced-color' into 'next'
Resolve #1086

Closes #1086

See merge request STJr/SRB2!2114
2023-08-20 17:17:34 +00:00
sphere
5dba53009e Merge branch 'recap-flip-spin' into 'next'
Fix interpolation when curling up or scaling while flipped

Closes #983

See merge request STJr/SRB2!1979
2023-08-20 17:16:53 +00:00
sphere
b533594a33 Merge branch 'udmf-absolutez' into 'next'
Add absolute Z height flag for mapthings in UDMF

See merge request STJr/SRB2!2015
2023-08-20 17:16:02 +00:00
sphere
9d6578d42f Merge branch 'weaponshadow' into 'next'
Correct emerald & weapon ring/panel hitboxes, give drop shadows to weapon rings & panels

See merge request STJr/SRB2!2036
2023-08-20 17:15:44 +00:00
spherallic
b52a36f04c Small tweaks to Foundation and Midnight 2023-08-20 18:38:14 +02:00
spherallic
50fc1abf9a Revert invcolor tweaks for Red/Rosy/Lavender 2023-08-20 18:30:30 +02:00
Sally Coolatta
40c37ce4c2 Revert left/right movement 2023-08-20 12:05:58 -04:00
Sally Coolatta
9c8dd54751 Fix color grid not extending to the very bottom 2023-08-20 11:56:55 -04:00
spherallic
f62c2f4c75 Fix arg # typos for "visible from inside" checks 2023-08-20 17:55:06 +02:00
spherallic
259732cccb Make FOF fades use 0-255 alpha, not 1-256 2023-08-20 17:42:27 +02:00
Sally Coolatta
4d1e6df2d7 Fix color grid input bugs
There's still some slight awkwardness trying to wrap downwards into uneven row grids, but this is significantly better and this already took up way more time than I wanted it to.
2023-08-20 11:28:39 -04:00
Sally Coolatta
2f1db66e78 Fix drawing of final color 2023-08-20 07:37:10 -04:00
Sally Coolatta
91fc3302cd Merge branch 'master' into next 2023-08-20 07:32:09 -04:00
James R
909e07be65 Rename HAVE_STRLCPY to SRB2_HAVE_STRLCPY, fix non-glibc compile
- Fix compile with msvcrt
- Fix compile with SDL 2.28.2
2023-08-20 07:31:10 -04:00
Sally Coolatta
b5b7b7c1e3 Merge remote-tracking branch 'upstream/master' into next 2023-08-20 00:23:26 -04:00
Sal
ec559612b9 Merge branch 'nights-pull-emblem-fix' into 'next'
Don't NiGHTS pull emblems you can't collect

See merge request STJr/SRB2!2113
2023-08-20 04:03:07 +00:00
Sally Coolatta
9d9b6d83c2 Don't NiGHTS pull emblems you can't collect 2023-08-19 23:58:43 -04:00
Sal
3bcd1dc25a Merge branch 'write-color-properly' into 'next'
Fix P_WriteSkincolor

Closes #1068

See merge request STJr/SRB2!2112
2023-08-20 03:41:51 +00:00
Sally Coolatta
d589953fc4 Fix P_WriteSkincolor 2023-08-19 23:39:54 -04:00
Sal
b6f41bd7b8 Merge branch 'cheated-fixes' into 'next'
Level select cheat fixes

Closes #1090

See merge request STJr/SRB2!2111
2023-08-20 03:16:14 +00:00
Sal
7ef7de1bc5 Level select cheat fixes 2023-08-20 03:16:14 +00:00
Sal
f0b09dec6b Merge branch 'linux-render-switching-fix' into 'master'
fix linux renderer switching

See merge request STJr/SRB2!2110
2023-08-20 02:43:26 +00:00