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
d380405b2f
Merge branch 'final-tweaks' into 'next'
...
A few minor tweaks before 2.2.9
See merge request STJr/SRB2!1403
2021-02-16 12:50:15 -05: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
LJ Sonic
d26a6a33c5
Merge branch 'hippo' into 'next'
...
Remove P_AproxDistance deprecation warning
See merge request STJr/SRB2!1402
2021-02-15 06:00:24 -05:00
SMS Alfredo
4430835a71
This might be dumb, but whatever
2021-02-14 20:49:03 -06:00
LJ Sonic
41fe113af4
Merge branch 'revert-redundant-hypot' into 'next'
...
Revert redundant hypot
Closes #450 and #451
See merge request STJr/SRB2!1400
2021-02-13 12:08:39 -05: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
481ddb6532
Merge branch 'fix-joiner-consoleplayer' into 'next'
...
Fix consoleplayer returning the server player during joining phase
See merge request STJr/SRB2!1396
2021-02-12 17:42:15 -05: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
SteelT
65f7745775
Merge branch 'credits-229' into 'next'
...
Add Logan to the credits
See merge request STJr/SRB2!1379
2021-01-13 19:08:09 -05: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
SteelT
cc20f279db
Merge branch 'lua-hud-crosshair' into 'next'
...
Let Lua toggle the crosshair
See merge request STJr/SRB2!1360
2021-01-07 15:56:56 -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
GoldenTails
0d1973075d
Nice UDB config there, SRB2.
2020-12-24 03:22:08 -06: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