Commit graph

609 commits

Author SHA1 Message Date
Alam Ed Arias
5a12d65150 Merge branch SRB2:next into fix-opengl-saturation 2023-10-23 18:37:40 +00:00
Alam Ed Arias
a60ac0508f Merge remote-tracking branch 'origin/next' into gitlabcirunnertest 2023-10-15 21:43:35 -04:00
Alam Ed Arias
bc852fa099 remove unused variables that was only set 2023-10-15 14:34:53 -04:00
LJ Sonic
2a896538d9 Merge branch 'netcode-rerefactor' into 'next'
Re-delete netcode

See merge request STJr/SRB2!2083
2023-09-18 16:47:28 +00:00
Gustaf Alhäll
fc20508295
Fix saturation not being applied on colormaps in OpenGL 2023-09-18 18:16:10 +02:00
Zwip-Zwap Zapony
91a17fdbdd Use decimal instead of octal vertex IDs 2023-08-25 10:42:25 +02:00
Zwip-Zwap Zapony
f42c2403f9 Interpolate radius/height when scaling mobjs 2023-08-25 10:42:12 +02: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
spherallic
07ef7c4639 Prevent FOF alpha from wrapping around in OpenGL 2023-08-17 20:15:03 +02:00
Zwip-Zwap Zapony
db59ec5998 Fix interpolation when curling up while flipped
Also fix scaling interpolation while flipped, and fix the NiGHTS Drone flip interpolation on its first tic
2023-08-17 17:39:24 +02:00
LJ Sonic
0b17e3c418 Move netcode files to a new folder 2023-07-27 15:38:42 +02:00
Nev3r
022ddcf363 Merge branch 'models-plus-final' into 'next'
3D models support for spritexoffset, spriteyoffset, spritexscale, spriteyscale, parity with sprite rollangle

See merge request STJr/SRB2!1840
2023-07-24 12:46:10 +00:00
Sal
13c30ace2e Merge branch 'lua-texture-offsets-expose' into 'next'
Exposed floor/ceiling offsets and light reference to Lua.

See merge request STJr/SRB2!1884
2023-07-24 10:42:07 +00:00
James R
a71a7f2710 Support spritexoffset/spriteyoffset for 3D models 2023-07-24 05:01:28 -04:00
Sally Coolatta
b6129a6d42 Add R_SpriteRotationAngle function
Gets the rotation angle for the mobj's sprite. Meant for pitch & roll later, but that part is if'd out currently and just returns mobj->rollangle
2023-07-24 04:47:07 -04:00
Sally Coolatta
7c2a241042 Remove the need for setting rotation axis in spriteinfo for models
Now it just does it like Software
2023-07-24 04:40:15 -04:00
sphere
f428759150 Merge branch 'bbox' into 'next'
Hitbox Renderer

See merge request STJr/SRB2!1838
2023-07-14 13:14:56 +00:00
spherallic
34ce172a90 Allow toggling PF_NoDepthTest for OpenGL hitboxes 2023-07-14 15:03:43 +02:00
Zwip-Zwap Zapony
8b931da6f3 Draw hitboxes last in OpenGL 2023-07-14 12:51:16 +00:00
Ace Lite
2240742720 Merge branch SRB2:next into lua-texture-offsets-expose 2023-07-06 18:35:00 +00:00
MascaraSnake
8c31d279cf Implement per-texture offsets in UDMF 2023-06-28 01:07:52 +02:00
sphere
b8a25ae53c Add interpolation to hitbox viewer, tweak hitbox colors 2023-06-13 00:05:58 +00:00
sphere
5307c1635d Merge branch 'interpolate-maria' into 'next'
Interpolate Shadows when Scaling Mobjs

See merge request STJr/SRB2!1986
2023-06-12 23:39:23 +00:00
spherallic
264ec02223 Merge branch 'next' into bbox 2023-05-26 03:06:30 +02:00
sphere
ce504d4e8e Merge branch 'mobj-dispoffset' into 'next'
Turn dispoffset into a mobj field

See merge request STJr/SRB2!1708
2023-05-25 20:59:43 +00:00
Zwip-Zwap Zapony
3f5e7ff0d0 Interpolate shadows when scaling mobjs 2023-05-25 15:09:53 +02:00
spherallic
1470d099e3 Update copyright year & credits 2023-03-31 14:53:31 +02:00
Eidolon
9a9a16183f Disable floor splat slope interpolation
Getting these to interpolate correctly is proving to be an absolute
ordeal and I would rather have them look correct-but-not-interpolated
than completely broken.
2023-02-24 18:49:09 -06:00
spherallic
3bc519ed65 Merge branch 'next' into bbox 2023-01-27 14:59:39 +01:00
Lach
42fa7f4723 Invert OpenGL rollangle for papersprites to match software renderer behaviour 2023-01-26 15:29:35 +11:00
LJ Sonic
379cc4207a Revert "Merge branch 'netcode-refactor' into merging"
This reverts merge request !1920
2023-01-15 17:57:23 +00:00
LJ Sonic
41fb0c8943 Merge branch 'netcode-refactor' into merging 2023-01-15 17:45:06 +01:00
Arthur
636e6d8c14 MSVC project file works again! Supports Visual Studio 2022.
Also fixed issues with the d_netcmd.c file/folder adding logic.
2022-12-31 19:35:07 -05:00
LJ Sonic
717e0d5a17 Move netcode files to a new folder 2022-12-31 14:10:19 +01:00
Ace Lite
656f7f94ac hw_main.c ceiling_y/xoffs renamed 2022-11-25 23:06:22 +00:00
Ace Lite
3217984f55 c-side offset/angle variable renamed 2022-11-25 23:01:27 +00:00
James R
bfaf2bc6f3 OpenGL hitbox renderer
I apologize for that vertex array.
2022-11-22 18:13:38 -08:00
Eidolon
84bc03d24e Merge branch 'po2-32x32-fix' into 'next'
Add PO2 flat cases for sizes smaller than 32x32 (resolves #624)

Closes #624

See merge request STJr/SRB2!1873
2022-11-16 01:40:54 +00:00
Lactozilla
86a052537e Add PO2 flat cases for sizes smaller than 32x32 2022-11-16 01:40:54 +00:00
Lactozilla
4558cc1c1f Fix HWR_SplitWall and sloped midtextures
- Fix bugs with HWR_SplitWall and sloped midtextures
- Clean up HWR_ProcessSeg and HWR_SplitWall
- Determine if the midtexture is visible earlier
- Ensure opaque midtextures always use PF_Masked
2022-11-15 09:55:59 +00:00
Zwip-Zwap Zapony
59399e9fcf Uncap water ripples 2022-11-13 16:15:15 +01:00
Eidolon
e32b8a41e5 Only interpolate shadowcasters if they exist 2022-11-12 15:14:04 -06:00
Eidolon
88667400ee Merge branch 'fix-splat-interp' into 'next'
Fix splat interp and sprite angle

See merge request STJr/SRB2!1858
2022-11-12 21:05:44 +00:00
Alam Ed Arias
f5e1d9722f Merge branch 'master' into next 2022-11-11 22:03:58 -05:00
Alam Ed Arias
9b4d6a2109 Fix Typo 2022-11-11 21:46:28 -05:00
Alam Ed Arias
7e0fa2d34c Cleanup whitespace changes from SRB2_release_2.2.9 2022-11-11 21:19:25 -05:00
James R
04855a85dc Use angle between viewz and mobj z to determine splat sprite angle 2022-11-11 17:35:31 -06:00
James R
877d5450d5 Use interpolated mobj x/y/z/angle for splats
# Conflicts:
#	src/hardware/hw_main.c
#	src/r_things.c
2022-11-11 17:35:27 -06:00
Eidolon
07665ae502 hwr: Use UDMF FOF_SPLAT for splat flats and walls 2022-11-09 17:40:43 -06:00
Eidolon
0f2fe5983e hwr: Use lightlevel on transparent planes 2022-11-09 17:31:49 -06:00