Commit graph

11888 commits

Author SHA1 Message Date
sphere
194d0b8201 Merge branch 'interfission' into 'next'
Cache teamflags/icons before drawing if they don't exist yet (closes #511)

Closes #511

See merge request STJr/SRB2!1459
2021-04-19 14:33:23 -04:00
sphere
315582bd6c Merge branch 'fix-blendtables' into 'next'
Fix blend tables generation

See merge request STJr/SRB2!1458
2021-04-19 14:33:12 -04:00
sphere
d871612a72 Merge branch 'openglol' into 'next'
Fix HWR_DrawSprite sigsegv

See merge request STJr/SRB2!1454
2021-04-19 14:33:03 -04:00
katsy
7b83345c75 need to create the patches here if they don't already exist 2021-04-14 19:29:53 -05:00
Jaime Ita Passos
0d4d2ed6d8 Fix blend tables generation 2021-04-13 12:11:31 -03:00
katsy
23759c67aa move HWR_GetMappedPatch earlier 2021-04-12 21:26:29 -05:00
sphere
bcd3245b76 Merge branch 'blendmode-revision' into 'next'
Blending changes

See merge request STJr/SRB2!1446
2021-04-11 08:18:12 -04:00
sphere
0d628c351a Update Zone Builder configuration. 2021-04-10 17:44:42 +02:00
sphere
00e81cac8e Merge branch 'badflags' into 'next'
Fix CTF flag patch garbage (resolves #506)

Closes #506

See merge request STJr/SRB2!1453
2021-04-10 11:34:07 -04:00
sphere
1d863408c7 Merge branch 'dedicated-scoretally-crash-fix' into 'next'
Fix dedicated server crashing when exiting special stage (Fixes #453)

Closes #453

See merge request STJr/SRB2!1451
2021-04-10 11:34:00 -04:00
sphere
d18ef87465 Merge branch 'gl-deletetexture-fix' into 'next'
Fix a OpenGL backend DeleteTexture crash (Fixes #499)

Closes #499

See merge request STJr/SRB2!1448
2021-04-10 11:33:53 -04:00
katsy
876daa7d6e fix ctf flag garbage 2021-04-07 04:57:18 -05:00
Steel Titanium
77f2b1f682 Prevent redudant result patch caching on competition 2021-04-07 01:11:39 -04:00
Steel Titanium
a501b7b00d Reorganize the switch block, add missing int_comp case 2021-04-07 00:55:08 -04:00
James R
1db163f942 Merge branch 'master' into next 2021-04-06 16:19:15 -07:00
James R
e39bf7503f Makefile: fix object file not depending on headers
BRUH MOMENT
2021-04-06 03:55:57 -07:00
Steel Titanium
101b6e46d4 Even more bruhs 2021-04-05 22:56:03 -04:00
Steel Titanium
33b7075d46 bruh 2021-04-05 22:50:22 -04:00
Steel Titanium
35c0f8b5cc Correct function name comment 2021-04-05 22:44:16 -04:00
Steel Titanium
397fdef034 Load intermission patches in Y_LoadIntermisionData 2021-04-05 22:34:52 -04:00
Lach
c99e53d735 Merge branch 'dashmode-crash' into 'next'
Fix jet fume crash when dashmode is above DASHMODE_MAX

See merge request STJr/SRB2!1450
2021-04-05 21:30:16 -04:00
James R
a01a420aa0 Brackets 2021-04-05 18:10:34 -07:00
Sally Coolatta
3dd04b90c6 Fix jet fume crash when dashmode is above DASHMODE_MAX
I would like to use higher dashmode values for extra leniency, the jet fume kicks and screams when this happens.
2021-04-05 16:59:02 -04:00
LJ Sonic
2c1b383c4a Merge branch 'uppercase-tty' into 'next'
Let uppercase letters thru dedicated console

See merge request STJr/SRB2!1449
2021-04-05 07:33:42 -04:00
James R
84191252d2 Remove code that converts uppercase letters to lower, when coming from dedicated console 2021-04-04 17:01:54 -07:00
Hannu Hanhi
e9213b2b41 Fix a OpenGL backend DeleteTexture crash 2021-04-04 21:29:15 +03:00
LJ Sonic
99c773f39e 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
4ef3477054 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
a584d7edea 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
933fad7702 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
95b333a6d4 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
4b15b52dfc Our menu system sucks. That's all I have to say. 2021-03-31 19:49:37 +02:00
LJ Sonic
7ab1a82d09 Merge branch 'floorsprite-fixes' into 'next'
Floorsprite fixes

See merge request STJr/SRB2!1443
2021-03-31 12:36:39 -04:00
katsy
d1700bbf18 Merge remote-tracking branch 'stjr/next' into dontdothisinsoftwarelol 2021-03-31 03:15:31 -05:00
Jaime Ita Passos
7e6bc97240 Smoother freelook in Software
Mhm hmm...
2021-03-30 22:52:50 -03:00
Jaime Ita Passos
59be35e533 Rename functions, make more efficient, fix subtractive in Software 2021-03-30 22:12:31 -03:00
Jaime Ita Passos
eece82c481 Blend modes revision
This changes how blend modes render, and includes fixes.
2021-03-30 17:03:05 -03:00
Jaime Ita Passos
4025a1d517 [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
d6eaf7e0ff clear before switching, not after 2021-03-28 12:22:04 -05:00
katsy
55d63000f4 don't HWR_ClearAllTextures() in software 2021-03-27 18:30:59 -05:00
Monster Iestyn
df9b5c4312 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
8162d90c94 Fix LUAh_PlayerHeight returning wrong default value 2021-03-26 18:01:55 +11:00
LJ Sonic
854e43ea7c Kick clients if they take too long to download a Lua file 2021-03-25 22:43:06 +01:00
LJ Sonic
b6e5837161 Use a separate transfer status for disconnected nodes 2021-03-25 22:28:35 +01:00
SteelT
fa8947ad8f 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
000e865f80 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
6ea9653681 Add PlayerHeight and PlayerCanEnterSpinGaps Lua hooks 2021-03-25 21:41:09 +11:00
lachablock
b1a9262889 Fix P_PlayerCanEnterGaps issues with polyobject collision 2021-03-25 15:58:52 +11:00
lachablock
f99d89742a 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
7511911846 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