LJ Sonic
b220d0a759
Merge branch 'prerelease' into prerelease-fun
2021-03-31 22:32:34 +02:00
LJ Sonic
bcbbf1ec47
Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2.git into prerelease
2021-03-31 22:31:38 +02: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
612a424069
Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2.git into prerelease
2021-03-31 21:53:59 +02:00
LJ Sonic
ee69804497
Update BETAVERSION
2021-03-31 20:31:43 +02: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
ad8543e3ea
Merge branch 'prerelease' into prerelease-fun
...
# Conflicts:
# src/m_menu.c
2021-03-31 19:39:39 +02:00
LJ Sonic
6f38fba82e
Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2.git into prerelease
2021-03-31 18:48:49 +02:00
LJ Sonic
5a3c1c253e
fun
2021-03-31 18:44:10 +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
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
Monster Iestyn
91187f91be
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
0405b3922c
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
42cfcbf7be
fix sigsegv in A_Custom3DRotate
2021-03-21 16:09:11 -05:00
Monster Iestyn
b882aea2e4
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
ce0190a21f
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
95eff8cbc5
Avoid savemoddata being set in W_InitFile to fix addons with gamedata.
2021-03-15 18:11:02 +01:00
lachablock
36c2be283c
Disallow write_backtrace on Windows entirely
2021-03-15 15:17:55 +11:00
Lach
91c9d667e1
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
cf42a62b7e
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
6ab5432713
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
5f120c29df
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
746c84e0b5
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
efdfa55328
Remove misleading comment
2021-03-12 19:54:01 +01:00
Lachlan Wright
c589fe85e4
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
d97de6d3bd
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
0765004188
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
8cc49a0f2e
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
caab4e96cd
Remove misplaced SetShader call in CompileShaders
2021-03-06 19:38:17 +02:00
Jaime Ita Passos
f6cb1798cc
Fix a few renderflags oversights in OpenGL
2021-03-02 02:27:14 -03:00
Lachlan Wright
e03700fc2a
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
fc1bc94d9a
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
