Commit graph

17740 commits

Author SHA1 Message Date
Jaime Passos
578600156d Simplify the floor splat clipping code a bit 2020-10-14 21:20:37 -03:00
Steel Titanium
9888555431 Merge branch 'master' into next 2020-10-14 14:58:07 -04:00
Jaime Passos
04829fc613 Fix a crash in R_CalculateSlopeVectors called from R_RenderFloorSplat 2020-10-14 14:08:25 -03:00
Jaime Passos
d348ff079b Only create floor sprite slopes when needed, instead of always allocating them.
Has to be done manually in Lua. Use P_CreateFloorSpriteSlope, and P_DeleteFloorSpriteSlope when done with it.
2020-10-14 13:07:02 -03:00
sphere
ab9c85f76a Make record attack's quick retry more consistent. 2020-10-14 17:39:23 +02:00
James R
1363291a78 brug 2020-10-14 01:19:43 -07:00
James R
1347157e21 Merge branch 'fix-gzip-makefile-failure' into 'master'
Fix gzip failing to compress SRB2's objdump on non-Windows.

See merge request STJr/SRB2!1191
2020-10-14 03:11:26 -04:00
James R
9348dcbf98 Merge branch 'ffloorclip-2' into 'next'
Software 3D floor rendering optimization (second attempt)

See merge request STJr/SRB2!1184
2020-10-14 03:10:44 -04:00
James R
1f7f88cd1f Merge branch 'i-pity-you' into 'next'
Allow JumpSpin abilities to be used with non-ability shields

Closes #277

See merge request STJr/SRB2!1146
2020-10-14 03:08:20 -04:00
James R
dab116a0bd CODE 2020-10-13 21:44:48 -07:00
Jaime Passos
96fa912bae Implement object-defined floor sprite slopes. 2020-10-14 00:57:13 -03:00
James R
0d116b39c5 Compare height for step up on edge of sector
This is for slopes. When moving across a slope the height changes. Therefore
compare the height at the edge where slopes meet so only a wall will block the
player, and not a very steep slope.
2020-10-13 20:27:36 -07:00
Jaime Passos
3a76f04ac2 [Software] Use the light at the bottom of the object for splats 2020-10-13 23:14:05 -03:00
James R
36d0e58fc4 Don't need to set this actually 2020-10-13 19:11:18 -07:00
James R
e82ee6078d Apply step up/down to opposite plane too 2020-10-13 19:04:52 -07:00
Jaime Passos
f93e050569 Implement sloped floor sprites 2020-10-13 22:42:07 -03:00
Jaime Passos
bf9a8d9f3b Fix the wrong freeing function call being used in Patch_FreeData 2020-10-13 19:18:01 -03:00
Jaime Passos
53a5e75855 Correctly return the output patch's size in Picture_PatchConvert 2020-10-13 19:16:25 -03:00
Zippy_Zolton
76d2343aa7 Crosshair fix, no GAMEQUIT 2020-10-13 16:41:39 -05:00
Jaime Passos
394150fca4 Fix infinitely long splat spans 2020-10-13 17:03:50 -03:00
Zippy_Zolton
6c636b6130 more!!!!! :3 2020-10-13 14:23:56 -05:00
Jaime Passos
a6f2e8b9c6 Implement relative and absolute sprite offsets for objects (mobjs)
Added RF_ABSOLUTEOFFSETS and RF_FLIPOFFSETS
2020-10-13 12:57:36 -03:00
Zippy_Zolton
cef2aab8df good night 2020-10-13 02:19:20 -05:00
Zippy_Zolton
72efff4c7c More whitelists :D 2020-10-13 02:13:35 -05:00
Jaime Passos
e8dd79e5e2 Improve sorting between sprites and floor sprites 2020-10-13 02:24:18 -03:00
Jaime Passos
ecd3ef99fc Improve splat sorting:
Adjust the sort scale of splats
Do splat sorting in R_CreateDrawNodes if either vissprite is a splat, instead of if both are
2020-10-13 01:45:18 -03:00
Jaime Passos
cd87c6a5fb Fix splat sorting 2020-10-13 01:09:17 -03:00
Jaime Passos
3849b4ac6c Fix other uninitialized variable warnings 2020-10-13 00:14:27 -03:00
Jaime Passos
b7590971f4 Fix uninitialized variable warning 2020-10-12 22:08:45 -03:00
Jaime Passos
a91a55fb58 Fix floorsprites not being rendered when viewed from the bottom 2020-10-12 22:07:11 -03:00
James R
4c7400b27e Merge branch 'save-netvars' into 'next'
Save netvars

See merge request STJr/SRB2!1179
2020-10-12 19:03:01 -04:00
Jaime Passos
9bb09cdc8c OpenGL support for splats, fix some shadow draw bugs in Software 2020-10-12 19:53:21 -03:00
James R
975e042d66 Merge branch 'addfile-vararg' into 'next'
Give the addfile command variable argument support.

See merge request STJr/SRB2!1176
2020-10-12 18:32:20 -04:00
lachwright
72a7bb90c7 Merge remote-tracking branch 'origin/next' into i-pity-you 2020-10-13 09:24:09 +11:00
James R
c04d08460a Merge branch 'slight-shader-cleanup' into 'next'
Shader code cleanup

See merge request STJr/SRB2!1103
2020-10-12 18:22:08 -04:00
GoldenTails
33d026ed5a Futureproof against strict buildbots. 2020-10-12 17:14:32 -05:00
James R
06fc1c5e30 Merge branch 'penalty-of-death' into 'next'
I am going to die :D (closes #337)

Closes #337

See merge request STJr/SRB2!1183
2020-10-12 18:11:09 -04:00
James R
da41c5b79d Merge branch 'skip-credits-gone-wrong' into 'next'
Fix clients being able to skip credits AGAIN (closes #339)

Closes #339

See merge request STJr/SRB2!1182
2020-10-12 18:09:48 -04:00
James R
c9532c32e2 Merge branch 'specialstagecheck' into 'next'
A special stage is a special stage, even outside of coop.

Closes #211

See merge request STJr/SRB2!1180
2020-10-12 18:08:02 -04:00
James R
b566bb8ae3 Merge branch 'no-demo-visit' into 'next'
Don't count demo playback as visiting a level.

Closes #327 and #340

See merge request STJr/SRB2!1177
2020-10-12 18:05:43 -04:00
GoldenTails
e97a5d6087 Fix gzip failing to compress SRB2's objdump on non-Windows. 2020-10-12 16:59:47 -05:00
James R
dd0321142f Merge branch 'splitscreen-parameter' into 'next'
Add `-splitscreen` commandline parameter

See merge request STJr/SRB2!1175
2020-10-12 17:46:55 -04:00
James R
619484259f Merge branch 'ceilingz' into 'next'
Add P_CeilingzAtPos function

See merge request STJr/SRB2!1164
2020-10-12 17:44:51 -04:00
Jaime Passos
37ed2a6b26 Support spritexscale and spriteyscale in OpenGL
Fix papersprite scaling with spritexscale and spriteyscale in Software
2020-10-12 17:25:18 -03:00
Zippy_Zolton
aa38fe3f20 Whitelist the "X" shown in the HUD 2020-10-11 23:22:16 -05:00
Jaime Passos
b4b4738c94 Changes to sprite rendering:
- Added render flags (see r_defs.h)
- Implemented floor splats
- Drop shadow sprite rendering through render flags
2020-10-12 00:13:22 -03:00
Jaime Passos
3e06bd4985 Move calculation of rotated patch dimensions into its own function
Simplify rotation code when the pivot isn't in the center
2020-10-11 03:39:31 -03:00
James R
45f9df2951 Use the macro in sectorlines_num too 2020-10-10 17:40:01 -07:00
James R
bbb82166d3 Turn the lua sector lines hack into a macro 2020-10-10 16:43:09 -07:00
Jaime Passos
63bdcb294e Fix rotated flipped patches 2020-10-10 19:06:29 -03:00