Commit graph

11860 commits

Author SHA1 Message Date
LJ Sonic
d0a0552576 Merge branch 'dontdothisinsoftwarelol' into 'next'
don't HWR_ClearAllTextures() in software (fixes #389)

Closes #389

See merge request STJr/SRB2!1440
2021-03-31 16:19:18 -04:00
LJ Sonic
211e24d8f0 Merge branch 'smoother-freelook' into 'next'
Smoother freelook in Software

See merge request STJr/SRB2!1444
2021-03-31 16:17:40 -04:00
LJ Sonic
553abd50ce Merge branch 'playercanenterspingaps' into 'next'
Do not let SF_NOJUMPSPIN characters enter sectors they could not enter if standing at full height (Closes #457)

Closes #457

See merge request STJr/SRB2!1432
2021-03-31 16:15:35 -04:00
LJ Sonic
02f91d8911 Merge branch 'fix-luafile-transfer' into 'next'
Prevent a single client from blocking Lua file transfers

See merge request STJr/SRB2!1435
2021-03-31 14:28:22 -04:00
LJ Sonic
6f2f727a80 Merge branch 'our-menu-system-sucks' into 'next'
Our menu system sucks. That's all I have to say.

See merge request STJr/SRB2!1445
2021-03-31 13:51:04 -04:00
LJ Sonic
2132b8690f Our menu system sucks. That's all I have to say. 2021-03-31 19:49:37 +02:00
LJ Sonic
9081a3586a Merge branch 'floorsprite-fixes' into 'next'
Floorsprite fixes

See merge request STJr/SRB2!1443
2021-03-31 12:36:39 -04:00
katsy
f314bb73ef Merge remote-tracking branch 'stjr/next' into dontdothisinsoftwarelol 2021-03-31 03:15:31 -05:00
Jaime Ita Passos
bb0e59c8a9 Smoother freelook in Software
Mhm hmm...
2021-03-30 22:52:50 -03:00
Jaime Ita Passos
316ecff003 [Software] A few floorsprite fixes
This fixes the texture of the floorsprite sometimes facing the wrong way, since plane rendering can change the view angle.
2021-03-29 23:04:13 -03:00
katsy
6f59a91bdc clear before switching, not after 2021-03-28 12:22:04 -05:00
katsy
9396edb245 don't HWR_ClearAllTextures() in software 2021-03-27 18:30:59 -05:00
Monster Iestyn
7abc5e10e5 Merge branch 'avoid-savemoddata' into 'next'
Fix addons with custom gamedata not loading

Closes #473

See merge request STJr/SRB2!1427
2021-03-26 13:06:49 -04:00
lachablock
b73e52476d Fix LUAh_PlayerHeight returning wrong default value 2021-03-26 18:01:55 +11:00
LJ Sonic
145155c3c7 Kick clients if they take too long to download a Lua file 2021-03-25 22:43:06 +01:00
LJ Sonic
addf0e3f13 Use a separate transfer status for disconnected nodes 2021-03-25 22:28:35 +01:00
SteelT
ce8ace610f Merge branch 'no-apng-compile-fix' into 'next'
Fix unused variable warning when USE_APNG is not defined

See merge request STJr/SRB2!1343
2021-03-25 14:02:23 -04:00
lachablock
c3caa55f22 Revise spinheight/gap entry conditions (again), let's keep things WAY simpler:
- PF_NOJUMPDAMAGE no longer affects height at all (you're welcome katsy).
- Characters with SF_NOJUMPSPIN will only use spinheight when panim is PA_ROLL. They cannot enter gaps when jumping with spinheight, unless also spinning or gliding.
- All other characters use spinheight when panim is PA_JUMP or PA_ROLL. They can enter gaps when jumping with spinheight.
2021-03-25 21:42:25 +11:00
lachablock
b5c61a8a2a Add PlayerHeight and PlayerCanEnterSpinGaps Lua hooks 2021-03-25 21:41:09 +11:00
lachablock
fdd02e35c8 Fix P_PlayerCanEnterGaps issues with polyobject collision 2021-03-25 15:58:52 +11:00
lachablock
cd72594d0e Revise conditions under which players use spinheight and enter gaps:
- players with SF_NOJUMPDAMAGE but *not* SF_NOJUMPSPIN now always use spinheight while jumping (i.e. even with PF_NOJUMPDAMAGE), as long as their panim is PA_JUMP or PA_ROLL
- players with SF_NOJUMPSPIN no longer use spinheight while jumping (but,)
- PA_ROLL is now an acceptable condition for using spinheight (but not for entering gaps, e.g. S3K shields will shrink the hitbox but not allow gap entry on their own)
- flying players now only use spinheight if they do not have SF_NOJUMPSPIN (you're welcome, EggpackRE)
- players with neither SF_NOJUMPSPIN nor SF_NOJUMPDAMAGE use the same conditions as in 2.2.9 prerelease, i.e. use spinheight and can enter gaps unless they have PF_NOJUMPDAMAGE
2021-03-25 15:57:35 +11:00
Monster Iestyn
b49eeac270 Merge branch 'custom3dcrash' into 'next'
Fix sigsegv caused by bad target check in A_Custom3DRotate

See merge request STJr/SRB2!1430
2021-03-24 14:24:21 -04:00
Monster Iestyn
5b746a4853 Merge branch 'fix-opengl-drawcroppedpatch' into 'next'
Fix OpenGL V_DrawCroppedPatch (Fixes #452)

Closes #452

See merge request STJr/SRB2!1412
2021-03-24 11:34:58 -04:00
lachablock
35cecad868 Do not let nonspin characters enter sectors they could not enter if standing at full height 2021-03-23 15:09:04 +11:00
katsy
959a60d858 fix sigsegv in A_Custom3DRotate 2021-03-21 16:09:11 -05:00
Monster Iestyn
0073f25170 Fix clobbering error in hw_md2.c by adding "volatile" to png_FILE.
(Apparently Kart made this exact fix 2 years ago and it was never backported?)
2021-03-21 19:49:32 +00:00
Monster Iestyn
ea58717772 Merge branch 'print-backtrace-ii' into 'next'
Fix compile warning on Windows

See merge request STJr/SRB2!1426
2021-03-21 12:55:44 -04:00
sphere
3a0be379d3 Avoid savemoddata being set in W_InitFile to fix addons with gamedata. 2021-03-15 18:11:02 +01:00
lachablock
f0e5b721ad Disallow write_backtrace on Windows entirely 2021-03-15 15:17:55 +11:00
Lach
7878e50218 Merge branch 'final-tweaks' into 'next'
More final tweaks for 2.2.9 I guess

See merge request STJr/SRB2!1417
2021-03-14 20:52:47 -04:00
Lach
14a2f60b4a Merge branch 'dropdropSHAdow' into 'next'
Papersprite dropshadows no longer askance

Closes #409

See merge request STJr/SRB2!1408
2021-03-14 20:52:25 -04:00
Lach
9a71a1b01e Merge branch 'opengl-renderflags-fix' into 'next'
Fix a few renderflags oversights in OpenGL

See merge request STJr/SRB2!1422
2021-03-14 20:51:57 -04:00
Lach
cde974e27c Merge branch 'ogl-blend-var-fix' into 'next'
Fix for #422

Closes #422

See merge request STJr/SRB2!1425
2021-03-14 20:51:40 -04:00
Hannu Hanhi
ff29b6d9b7 Fix wrong color on player models' first frame by updating variable after loading blend texture 2021-03-13 23:07:51 +02:00
LJ Sonic
2b576eade2 Remove misleading comment 2021-03-12 19:54:01 +01:00
Lachlan Wright
f42bf71f9a Merge branch 'ogl-compileshaders-bug' into 'next'
Remove misplaced SetShader call in CompileShaders (Fixes #402)

Closes #402

See merge request STJr/SRB2!1423
2021-03-09 00:14:17 -05:00
Lachlan Wright
0b689368e3 Merge branch 'sw-culling-inaccuracy' into 'next'
Use double precision in R_StoreWallRange sloped seg culling calculations (Fixes #434)

Closes #434

See merge request STJr/SRB2!1424
2021-03-09 00:13:53 -05:00
LJ Sonic
46103ff375 Merge branch 'print-backtrace' into 'next'
Print a backtrace when SRB2 crashes in a Unix-like environment.

See merge request STJr/SRB2!1288
2021-03-07 08:26:44 -05:00
Hannu Hanhi
c08012fe8a Use double precision in R_StoreWallRange sloped seg culling calculations
Fixes culling issues in CEZ2 skybox
2021-03-06 19:56:25 +02:00
Hannu Hanhi
f39eb1ec10 Remove misplaced SetShader call in CompileShaders 2021-03-06 19:38:17 +02:00
Jaime Ita Passos
06bad96b03 Fix a few renderflags oversights in OpenGL 2021-03-02 02:27:14 -03:00
Lachlan Wright
e24ed9bd75 Merge branch 'nogmever' into 'next'
Check if GME_VERSION is defined.

See merge request STJr/SRB2!1372
2021-03-01 17:50:48 -05:00
Lachlan Wright
5ede909a1f Merge branch 'fix-flipped-bounce' into 'next'
Fix CA_BOUNCE height when flipped (Fixes #428)

Closes #428

See merge request STJr/SRB2!1373
2021-03-01 17:49:54 -05:00
Steel Titanium
85bd18eeec Merge branch 'master' into next 2021-03-01 16:55:48 -05:00
Lachlan Wright
8ea7e3498d Merge branch 'marathon-pause-fix' into 'next'
Disable pausing during score screens in marathon mode

See merge request STJr/SRB2!1416
2021-03-01 16:51:28 -05:00
Lachlan Wright
4c4b4b1f68 Merge branch 'skincolor-modif-fix' into 'next'
Fix translation colormap cache rebuilding using the old translation enumerations (fixes #443, #449, #459)

Closes #443, #449, and #459

See merge request STJr/SRB2!1421
2021-03-01 16:49:20 -05:00
Lachlan Wright
b71a9478da Merge branch 'linkdraw-scale-fix' into 'next'
Fix thing scale mismatch in R_DrawVisSprite. (Fixes #458)

Closes #458

See merge request STJr/SRB2!1420
2021-03-01 16:49:10 -05:00
Lachlan Wright
032c40863d Merge branch 'revert-e305de03' into 'next'
Revert "Merge branch 'player-speed' into 'next'"

Closes #466 and #471

See merge request STJr/SRB2!1418
2021-03-01 16:49:00 -05:00
James R
0bd0b98909 Fix dependency file trying to be made for SRB2.res and not for interface/blua/hardware files 2021-02-28 17:02:08 -08:00
James R
2a9cb311b3 I forgot to add the dep directory 2021-02-28 16:14:54 -08:00