stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-27 22:52:41 +00:00
Code Issues Projects Releases Packages Wiki Activity
12196 commits 173 branches 41 tags 186 MiB
Commit graph

12196 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
SwitchKaze
6267abac8a Fix console text bleeding 2021-03-25 12:43:30 -05: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
4a898bace6 Merge branch 'next' into monster-cleaning-up-again 2021-03-24 15:39:38 +00: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
Monster Iestyn
ee8acccd3c RETURN OF THE PORTS CHOPPING BLOCK: Destroy DOS! 
Remove all remaining traces of the following macros for the obsolete DOS port, which were missed previously:
* `DJGPP`
* `__DJGPP__`
* `DJGPPDOS`
* `PC_DOS`
* `WATTCP`

May get rid of `MSDOS` later once I get word on whether I should kill it or not
 2021-03-22 14:43:26 +00:00
Monster Iestyn
2aaaddae7c Fix mistake I made with my previous commit for r_skins.c 2021-03-22 14:17:22 +00:00
Monster Iestyn
571d6c5438 Merge branch 'next' into monster-cleaning-up-again 2021-03-22 13:53:53 +00: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
0c22fecafa Make horizontal springs above floors put the player in spring state. 2021-03-17 12:42:18 +01: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
Steel Titanium
d59de95262 Merge branch 'master' into next 2021-03-01 16:55:48 -05:00
Lachlan Wright
49c68d279d 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
b8873e8182 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
588a40453b 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
94c7124904 Merge branch 'revert-9649a9fb' 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
5f4e21ed3a 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
6d539626c4 I forgot to add the dep directory 2021-02-28 16:14:54 -08:00
Jaime Ita Passos
94fe7a3d8c Change I_Error message 2021-02-28 17:47:12 -03:00
Jaime Ita Passos
401271feb7 Fix translation colormap cache rebuilding using the old translation enumerations 
This was causing a buffer underwrite too. Lovely.
 2021-02-28 17:05:25 -03:00
Jaime Ita Passos
07ffe2599c Fix thing scale mismatch in R_DrawVisSprite 2021-02-28 16:23:40 -03:00
sphere
af79d45e66 Merge branch 'fix-implicit-tablecheck' into 'next' 
Fix "implicit declaration of function 'DEH_TableCheck'" warning

See merge request STJr/SRB2!1419
 2021-02-28 12:14:28 -05:00
sphere
a679212c5e Merge branch 'udb-config-bruh' into 'master' 
Nice UDB config there, SRB2.

See merge request STJr/SRB2!1354
 2021-02-28 11:57:30 -05:00
GoldenTails
a0396d5e43 Make it more async-signal-safe 2021-02-27 18:07:47 -06:00
GoldenTails
bdb28a06f4 Print the backtrace before showing the signal handler popup. 2021-02-27 18:07:47 -06:00
GoldenTails
5108f1f57b Use file descriptors and ditch file streams, for now. 2021-02-27 18:07:47 -06:00