Commit graph

11771 commits

Author SHA1 Message Date
LJ Sonic
c6da63d5ad Deprecate P_AproxDistance for Lua scripts 2021-02-13 18:04:27 +01:00
LJ Sonic
7e2c1284ab Use R_PointToDist2 for the Lua versions of P_AproxDistance and FixedHypot 2021-02-13 18:04:12 +01:00
LJ Sonic
6d44e1b0dd Revert "Use FixedHypot over P_AproxDistance"
This reverts commit 77f83de100.
2021-02-13 17:46:29 +01:00
LJ Sonic
048bcb9600 Revert "Use R_PointToDist2 instead"
This reverts commit 2b7e465ed6.
2021-02-13 17:45:54 +01:00
LJ Sonic
85cd429d1d Revert "Replace all instances of P_AproxDistance with FixedHypot"
This reverts commit 498ff708bb.
2021-02-13 17:45:20 +01:00
LJ Sonic
48fbcde2ac 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
70c0f8a644 Only call PlayerCmd hooks if added to game 2021-02-11 00:24:42 +01:00
LJ Sonic
c5f8454093 Fix consoleplayer returning the server player during joining phase 2021-02-11 00:10:15 +01:00
SteelT
262a5c9b3a 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
763e42625d 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
0d04b14bb3 Remove GLMipmap_t.nextmipmap 2021-01-27 21:23:20 -03:00
Jaime Ita Passos
7e28b7d3e9 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
fa696de12d 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
f27881ac16 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
05a75758ab 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
d61e5cc2df 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
2fcebc5eba 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
9a2a1d25d6 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
a1adf3dd19 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
9fc1379668 Revert "Move a few mobj spawn defaults to its own function"
This reverts commit 3f36a51f5b.

# Conflicts:
#	src/p_mobj.c
2021-01-17 23:17:46 +01:00
SteelT
87bcb9315a 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
8bc1904468 Put his name at the right order 2021-01-11 21:49:31 -03:00
Tatsuru
923cc0d8f2 Add Logan to the art credits 2021-01-10 23:17:40 -03:00
GoldenTails
f11850a0eb Fix a divby0 when you have SF_MULTIABILITY, CA_DOUBLEJUMP, and actionspd -FRACUNIT. 2021-01-10 10:01:31 -06:00
SteelT
76e4826626 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
3a43ede058 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
e242a87f01 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
cdbeb0dc7f Merge branch 'revert-bd82b024' into 'next'
Revert plane sorting changes

See merge request STJr/SRB2!1353
2021-01-07 16:20:30 -05:00
SteelT
d6c7d1cd8b 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
GoldenTails
e3c52f4a3b Pressing A Key Combination In The Console Crashes SRB2
get stryder7x in on this
2021-01-05 13:20:02 -06:00
Tatsuru
eb82ed7837 Allow water running in reverse gravity 2021-01-04 18:10:41 -03:00
LJ Sonic
dd1d2314f7 Let Lua toggle the crosshair 2020-12-29 21:36:15 +01:00
James R
c7647c7f6c 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
91904f1d42 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
James R
8624a4d6fa Merge branch 'fix-consvar-missing-initializer' into 'next'
Fix the "missing initializer" warning/error in the CVAR_INIT macro

See merge request STJr/SRB2!1350
2020-12-22 20:13:21 -05:00
SwitchKaze
d992b52577 Return nil on skincolor invalid field access 2020-12-21 15:48:49 -06:00
Jaime Ita Passos
3f1ae51936 Fix "missing initializer" warnings/errors in CVAR_INIT macros 2020-12-21 17:19:07 -03:00
GoldenTails
becb2faa01 Make sliding against objects actually work 2020-12-21 02:03:44 -06:00
GoldenTails
66aac9bd7a 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
Hannu Hanhi
266c3b9a00 Fix video mode 0 not getting centered 2020-12-21 00:03:20 +02:00
GoldenTails
a51fb151db Have A_ThrownRing check for a player too 2020-12-19 21:30:13 -06:00
GoldenTails
75f495ac5e Have A_DetonChase check for a player too 2020-12-19 21:12:09 -06:00
GoldenTails
4117196ba6 Actually check for a player smh 2020-12-19 20:33:29 -06:00
LJ Sonic
5884f803bb Fix TICCMD_RECEIVED being overridden by gamelogic 2020-12-16 17:35:39 +01:00
Nev3r
50192f59ff Merge branch 'lua-tag-iterator' into 'next'
Lua multitagging

See merge request STJr/SRB2!1292
2020-12-16 11:32:15 -05:00
Nev3r
9d99a7880e Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into lua-tag-iterator
# Conflicts:
#	src/doomtype.h
2020-12-16 17:27:44 +01:00
Nev3r
d27ed974b2 Merge branch 'fix-vibing-slopes' into 'next'
Fix vibing slope planes

See merge request STJr/SRB2!1335
2020-12-16 11:15:41 -05:00
Nev3r
7017200343 Merge branch 'plane-viewangle-fix' into 'next'
Restore the viewpoint's angle in R_DrawPlanes instead (related to #404)

See merge request STJr/SRB2!1326
2020-12-16 11:15:27 -05:00
Nev3r
4ece37d2ac Merge branch 'binarymap-slopevertices-fix' into 'next'
Replace the first entry in slope vertex thing taglists, instead of adding into them (related to #404)

See merge request STJr/SRB2!1333
2020-12-16 10:55:21 -05:00
Nev3r
38bc937887 Merge branch 'spritestuff2-archiving-fix' into 'next'
Fix archived mobjs having no default blend mode and sprite scales

See merge request STJr/SRB2!1300
2020-12-16 08:57:36 -05:00