Commit graph

11952 commits

Author SHA1 Message Date
Jaime Passos
bc3ac7615f Remove unnecessarily duplicated code in R_GetSpriteTranslation 2020-10-15 11:32:21 -03:00
Jaime Passos
8294479a5f Merge branch 'next' into allowshaders 2020-10-15 01:25:11 -03:00
Jaime Passos
4c59f8c615 Fix OpenGL GIF recording crashing with gif_localcolortable disabled 2020-10-15 01:14:16 -03:00
Jaime Passos
50bd8abc78 Fix precipitation 2020-10-15 00:03:32 -03:00
Jaime Passos
3bace37a25 Don't project if rot_y is less than a single fracunit 2020-10-14 21:26:23 -03:00
Jaime Passos
bf8bb383ab Simplify the floor splat clipping code a bit 2020-10-14 21:20:37 -03:00
Steel Titanium
b19764dc8e Merge branch 'master' into next 2020-10-14 14:58:07 -04:00
Jaime Passos
b4294220e5 Fix a crash in R_CalculateSlopeVectors called from R_RenderFloorSplat 2020-10-14 14:08:25 -03:00
Jaime Passos
e63efdac13 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
a2ff89f007 Make record attack's quick retry more consistent. 2020-10-14 17:39:23 +02:00
James R
b35633bb61 brug 2020-10-14 01:19:43 -07:00
James R
7952408c8e 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
cce55ccf90 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
f7e9772e10 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
Jaime Passos
ab526e47cc Implement object-defined floor sprite slopes. 2020-10-14 00:57:13 -03:00
Jaime Passos
a8a66f698a [Software] Use the light at the bottom of the object for splats 2020-10-13 23:14:05 -03:00
James R
bc23f582fe Don't need to set this actually 2020-10-13 19:11:18 -07:00
James R
5fca04c3dd Apply step up/down to opposite plane too 2020-10-13 19:04:52 -07:00
Jaime Passos
4b7bfce95e Implement sloped floor sprites 2020-10-13 22:42:07 -03:00
Jaime Passos
fccbc00cac Fix the wrong freeing function call being used in Patch_FreeData 2020-10-13 19:18:01 -03:00
Jaime Passos
63e471d902 Correctly return the output patch's size in Picture_PatchConvert 2020-10-13 19:16:25 -03:00
Zippy_Zolton
6fd226eb29 Crosshair fix, no GAMEQUIT 2020-10-13 16:41:39 -05:00
Jaime Passos
0e62cb2ada Fix infinitely long splat spans 2020-10-13 17:03:50 -03:00
Zippy_Zolton
5d699591c7 more!!!!! :3 2020-10-13 14:23:56 -05:00
Jaime Passos
4273896311 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
45b52e3729 good night 2020-10-13 02:19:20 -05:00
Zippy_Zolton
2ba1017dab More whitelists :D 2020-10-13 02:13:35 -05:00
Jaime Passos
87e5d63723 Improve sorting between sprites and floor sprites 2020-10-13 02:24:18 -03:00
Jaime Passos
95d0097df6 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
7dbd34345c Fix splat sorting 2020-10-13 01:09:17 -03:00
Jaime Passos
f2aca01e2b Fix other uninitialized variable warnings 2020-10-13 00:14:27 -03:00
Jaime Passos
1ea3bd8fff Fix uninitialized variable warning 2020-10-12 22:08:45 -03:00
Jaime Passos
453f49cb77 Fix floorsprites not being rendered when viewed from the bottom 2020-10-12 22:07:11 -03:00
James R
cb8f6097cf Merge branch 'save-netvars' into 'next'
Save netvars

See merge request STJr/SRB2!1179
2020-10-12 19:03:01 -04:00
Jaime Passos
831ccccdd6 OpenGL support for splats, fix some shadow draw bugs in Software 2020-10-12 19:53:21 -03:00
James R
58464771a8 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
6a73e81227 Merge remote-tracking branch 'origin/next' into i-pity-you 2020-10-13 09:24:09 +11:00
James R
d73fbd8616 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
87a5e1d30c Futureproof against strict buildbots. 2020-10-12 17:14:32 -05:00
James R
d7b8d5d0f3 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
5a5024faf4 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
d4bef36c19 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
d1c8d41f94 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
94f6d0b002 Fix gzip failing to compress SRB2's objdump on non-Windows. 2020-10-12 16:59:47 -05:00
James R
35c666514b 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
9538ca696a 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
b620f4835a 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
da27f720da Whitelist the "X" shown in the HUD 2020-10-11 23:22:16 -05:00
Jaime Passos
cc97e22e2f 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
b808b3ef41 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