lifning/SRB2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
11904 commits 1 branch 29 tags 122 MiB
Commit graph

10541 commits

Author SHA1 Message Date
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
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
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
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
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
GoldenTails 4016a2e062 Crash backtrace logging for NEWSIGNALHANDLER. 2021-02-27 18:07:47 -06:00
Jaime Ita Passos a1e0aa1812 Fix "implicit declaration of function 'DEH_TableCheck'" warning 2021-02-27 12:04:48 -03:00
Lachlan Wright 77feee73c3 Revert "Merge branch 'player-speed' into 'next'" 
This reverts merge request !1309
 2021-02-27 03:38:13 +00:00
Riku Salminen 8bcc71c629 Disable pausing during score screens in marathon mode 2021-02-26 15:43:53 +02:00
LJ Sonic 75d0e70236 Fix sector tags being signed in Lua 2021-02-25 23:41:43 +01:00
Zwip-Zwap Zapony 308ab0e079 Fix OpenGL V_DrawCroppedPatch 2021-02-21 22:16:38 +01:00
toaster 73758f50ff Fix dropshadows of papersprites drifting depending on angle relative to camera. Discovered in Kart internal for the paper item drops and ported back, hence the branch name. 2021-02-19 06:45:28 -05:00
James R 747c278bc2 Makefile: add a SILENT flag 
This makes it print nothing to stdout.

Also fixed some irregularities.
 2021-02-18 07:24:20 -08:00
James R 3d32f3145c Generate individual dependency files 
This removes Makefile.depends. Instead, '.d' files are included from the 'dep'
directory. This speeds up building because dependencies for every file don't
need to be regenerated if only one changes.

As a bonus, dependencies also won't be generated if only clean type targets
are going to be run. Also added a 'distclean' target, which cleans both
objects and dependency files.
 2021-02-18 06:23:18 -08:00
James R 3003c252d1 Makfile: don't print some messages twice 2021-02-18 06:23:12 -08:00
X.organic 0cbf9a791b
Fix indentation in MOBJCONSISTANCY conditional 2021-02-16 23:27:44 +01:00
X.organic 90611ed547
Fix MOBJCONSISTANCY and make it optional in DEBUGMODE 
MOBJCONSISTANCY checks confined to gamestate GS_LEVEL. DEBUGMODE
no longer implicitly enables them, making it netgame-compatible.
 2021-02-16 21:36:28 +01:00
X.organic 205ccc2727
Move Dehacked table sanity check to deh_tables.c 2021-02-16 19:46:31 +01:00
LJ Sonic 7133c703b4 Show an alternate ping icon when the player is disconnected 2021-02-15 22:19:48 +01:00
LJ Sonic 97daba68d0 Enable rejointimeout by default 2021-02-15 16:24:30 +01:00
LJ Sonic aa33d90215 Add rejointimeout to the server options 2021-02-15 16:23:57 +01:00
LJ Sonic 0b012d5db0 Make the names of disconnected players flicker in tab HUD 2021-02-15 16:21:26 +01:00
LJ Sonic b369243beb Use standard Lua naming scheme for polyobject list 2021-02-15 13:37:25 +01:00
SMS Alfredo 4430835a71 This might be dumb, but whatever 2021-02-14 20:49:03 -06:00
LJ Sonic 70850b0836 Deprecate P_AproxDistance for Lua scripts 2021-02-13 18:04:27 +01:00
LJ Sonic 758de501da Use R_PointToDist2 for the Lua versions of P_AproxDistance and FixedHypot 2021-02-13 18:04:12 +01:00
LJ Sonic a58df577fe Revert "Use FixedHypot over P_AproxDistance" 
This reverts commit c5474436af.
 2021-02-13 17:46:29 +01:00
LJ Sonic d2d1f83b62 Revert "Use R_PointToDist2 instead" 
This reverts commit e19196a86e.
 2021-02-13 17:45:54 +01:00
LJ Sonic 09d911a5b6 Revert "Replace all instances of P_AproxDistance with FixedHypot" 
This reverts commit 75633bde50.
 2021-02-13 17:45:20 +01:00
LJ Sonic dfc1767794 Only call PlayerCmd hooks if added to game 2021-02-11 00:24:42 +01:00
LJ Sonic 3dff1eb1b7 Fix consoleplayer returning the server player during joining phase 2021-02-11 00:10:15 +01:00
SteelT 6089550972 Merge branch 'gl-texture-management' into 'next' 
Manage uploaded OpenGL textures with an internal list

Closes #411

See merge request STJr/SRB2!1391
 2021-02-07 13:37:33 -05:00
James R 5b287f9cce Merge branch 'fix-doublejump-divby0' into 'next' 
Fix a divby0 when you have specific character stats.

See merge request STJr/SRB2!1374
 2021-01-31 01:17:41 -05:00
Jaime Ita Passos 8318935811 Remove GLMipmap_t.nextmipmap 2021-01-27 21:23:20 -03:00
Jaime Ita Passos d4044a4f82 Add PF_ColorMapped 
Not all surfaces have tint and fade colors. Checking for a specific surface flag, that tells the backend those colors are present, avoids uninitialized reads.
 2021-01-27 18:54:33 -03:00
Jaime Ita Passos 5501d495c7 OpenGL backend: Manage uploaded GPU textures with an internal list 
Indirectly fixes the game doing whatever after freeing a patch.
This commit implements a FTextureInfo struct type, instead of it being a typedef to the GLMipmap_s struct type.
 2021-01-27 17:48:57 -03:00
James R 29b6bd5df9 Merge branch 'fix-mobj-slidemove' into 'next' 
Make sliding against objects actually work (Fixes #400)

Closes #400

See merge request STJr/SRB2!1348
 2021-01-26 20:43:17 -05:00
LJ Sonic 36c193f317 Merge branch 'fix-boss2pogotarget' into 'next' 
Make several actions actually check for a player smh (Fixes #387)

Closes #387

See merge request STJr/SRB2!1340
 2021-01-25 18:11:38 -05:00
LJ Sonic 83947d4428 Merge branch 'redundant-hypot' into 'next' 
Replace P_AproxDistance with FixedHypot, and replace FixedHypot's algorithm with R_PointToDist2's

See merge request STJr/SRB2!1320
 2021-01-25 18:08:25 -05:00
LJ Sonic 2d3e302929 Merge branch 'mode0-centering' into 'next' 
Fix video mode 0 not getting centered

See merge request STJr/SRB2!1344
 2021-01-25 17:59:26 -05:00
LJ Sonic 14ee92ef67 Merge branch 'gl-levelflat-fix' into 'next' 
Fix a misuse of levelflat_t.picture in OpenGL

See merge request STJr/SRB2!1327
 2021-01-25 16:40:02 -05:00
LJ Sonic 41f1b3cfa3 Merge branch 'jimita-why-you-done-this!!!' into 'next' 
Fix mobj unarchiving code

See merge request STJr/SRB2!1384
 2021-01-22 18:26:26 -05:00
Lachlan Wright ea55a614d1 Merge branch 'flipped-waterrun' into 'next' 
Allow water running in reverse gravity

See merge request STJr/SRB2!1369
 2021-01-19 23:20:57 -05:00
Jaime Ita Passos f3ad648874 Revert "Move a few mobj spawn defaults to its own function" 
This reverts commit 6f9c48a305.

# Conflicts:
#	src/p_mobj.c
 2021-01-17 23:17:46 +01:00
Tatsuru 90b0242802 Put his name at the right order 2021-01-11 21:49:31 -03:00
Tatsuru fbcc0c25b3 Add Logan to the art credits 2021-01-10 23:17:40 -03:00
Hannu Hanhi d252f074b7 Render midtextures on two-sided lines with a z-buffer offset 
This will fix z-fighting issues when they overlap with FOFs.
 2021-01-10 21:33:54 +02:00
GoldenTails 59bc197f32 Fix a divby0 when you have SF_MULTIABILITY, CA_DOUBLEJUMP, and actionspd -FRACUNIT. 2021-01-10 10:01:31 -06:00
Zwip-Zwap Zapony 679bf5f999 Fix CA_BOUNCE when flipped 
Fix P_DoAbilityBounce() always using "max",
instead of "min" while upside-down and "max" while not
 2021-01-08 16:25:10 +01:00
SteelT 52c96239ba Merge branch 'fix-lua-consvars-with-functions' into 'next' 
Fix CV_RegisterVar returning LUA_GetErrorMessage to Lua when CV_CALL is involved. (Resolves #403)

Closes #403

See merge request STJr/SRB2!1346
 2021-01-07 16:33:39 -05:00
SteelT 4041e69fad Merge branch 'pressing-two-keys-in-the-console-crashes-srb2' into 'next' 
Pressing Ctrl+Backspace In An Empty Console Crashes SRB2

See merge request STJr/SRB2!1370
 2021-01-07 16:32:51 -05:00
SteelT da37d3c168 Merge branch 'fix-ticcmd-received' into 'next' 
Fix TICCMD_RECEIVED being overridden by gamelogic

See merge request STJr/SRB2!1337
 2021-01-07 16:31:45 -05:00
SteelT d9bdced3df Merge branch 'revert-8a30576d' into 'next' 
Revert plane sorting changes

See merge request STJr/SRB2!1353
 2021-01-07 16:20:30 -05:00
Steel Titanium c8627464c9 Check if GME_VERSION is defined. 
I made the assumption it would always be defined, which won't always be the case.
 2021-01-06 19:40:30 -05:00
GoldenTails 70eb3228f8 Pressing A Key Combination In The Console Crashes SRB2 
get stryder7x in on this
 2021-01-05 13:20:02 -06:00
Tatsuru 1752f6efc1 Allow water running in reverse gravity 2021-01-04 18:10:41 -03:00
LJ Sonic 0de3a64b59 Let Lua toggle the crosshair 2020-12-29 21:36:15 +01:00
James R 4d6b677765 Revert "Merge branch 'plane-sorting-fix-part-3' into 'next'" 
This reverts merge request !1235
 2020-12-23 03:02:31 +00:00
James R 0d1050f360 Merge branch 'next' into 'next' 
Return nil on skincolor invalid field access

See merge request STJr/SRB2!1351
 2020-12-22 20:13:45 -05:00
SwitchKaze ad8abcef09 Return nil on skincolor invalid field access 2020-12-21 15:48:49 -06:00
Jaime Ita Passos abf0ca6690 Fix "missing initializer" warnings/errors in CVAR_INIT macros 2020-12-21 17:19:07 -03:00
GoldenTails 147c38c5ce Make sliding against objects actually work 2020-12-21 02:03:44 -06:00
GoldenTails 971518d22e Have Lua_OnChange restore the stack to what it was before it was called. 
So we don't get Luas with access to LUA_GetErrorMessage.
 2020-12-20 21:43:14 -06:00