Commit graph

12682 commits

Author SHA1 Message Date
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
GoldenTails
3b4a52b8b8 Allows Lua to transport you to a different map in place of a Special Stage. 2021-01-04 00:03:18 -06:00
katsy
c19539248a add sprung flag to steam 2020-12-31 04:38:26 -06:00
Hannu Hanhi
ed82b94e64 Take slopes into account in FOF wall cutoff in HWR_ProcessSeg 2020-12-29 23:29:00 +02:00
LJ Sonic
0de3a64b59 Let Lua toggle the crosshair 2020-12-29 21:36:15 +01:00
GoldenTails
50d46e1fa6 Set the target of a spawned ghost to where it came from. 2020-12-27 00:21:09 -06:00
GoldenTails
9327e96e4d Pause the console refresh while startup wads are loading. 2020-12-26 17:19:14 -06: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
James R
9b6108b7dc 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
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
Hannu Hanhi
6c330bbf16 Fix video mode 0 not getting centered 2020-12-21 00:03:20 +02:00
GoldenTails
08146c9cad Have A_ThrownRing check for a player too 2020-12-19 21:30:13 -06:00
GoldenTails
60564197af Have A_DetonChase check for a player too 2020-12-19 21:12:09 -06:00
GoldenTails
f9e5681a6b Actually check for a player smh 2020-12-19 20:33:29 -06:00
Jaime Ita Passos
1254f691ee Fix unused variable warning when USE_APNG is not defined 2020-12-19 17:40:18 -03:00
Jaime Ita Passos
4717261459 Optimize Picture_GetPatchPixel 2020-12-19 17:32:45 -03:00
GoldenTails
81ee4a75e3 Copy colormaps so Lua cannot modify cached colormaps! (And Z_Free them on garbage collection.) 2020-12-18 02:24:20 -06:00
GoldenTails
f91489bcb6 Make the colormap returned by v.getColormap() writable.
I mean it was already readable anyway...
2020-12-18 02:24:20 -06:00
James R
4713b25837 Bit array conflicts 2020-12-16 08:44:03 -08:00
James R
353692fa79 Merge remote-tracking branch 'origin/next' into hooklib-refactor 2020-12-16 08:43:49 -08:00
LJ Sonic
b82cee780a Fix TICCMD_RECEIVED being overridden by gamelogic 2020-12-16 17:35:39 +01:00
Nev3r
8c97583779 Merge branch 'lua-tag-iterator' into 'next'
Lua multitagging

See merge request STJr/SRB2!1292
2020-12-16 11:32:15 -05:00
Nev3r
b642682dde 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
98e67871f5 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
ce89eb64ba 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
5b1732baa3 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
c97056f9ce 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
Nev3r
60b3465002 Merge branch 'text-color' into 'next'
Improved text colormaps (Closes #222 and #359)

Closes #222 and #359

See merge request STJr/SRB2!1202
2020-12-16 08:50:30 -05:00
Zippy_Zolton
45976d2304 magenta and green sonicx 2020-12-15 22:19:57 -06:00
Jaime Ita Passos
fa9db2d644 Fix vibing slope planes
I messed up the multiplication order for texture scaling: it multiplied a floating point number with a fixed point number, instead of multiplying two floats and then converting the result into a fixed point number.
2020-12-16 00:26:08 -03:00
James R
84e9020eed Merge branch 'shieldless' into 'next'
Add new skin flag SF_NOSHIELDABILITY

See merge request STJr/SRB2!1331
2020-12-15 21:00:53 -05:00
James R
a36908a5ce Merge branch 'amys' into 'next'
fix amy meeting herself in mario mode

See merge request STJr/SRB2!1330
2020-12-15 20:57:16 -05:00
James R
f9ce70a6b3 Merge branch 'picfmt-fixes' into 'next'
Fix a crash in Picture_GetPatchPixel with PICFMT_DOOMPATCH formats

See merge request STJr/SRB2!1324
2020-12-15 20:55:52 -05:00
James R
019082cf7a Merge branch 'dusty' into 'next'
Make fiery spindust fullbright

See merge request STJr/SRB2!1317
2020-12-15 20:53:29 -05:00
Zippy_Zolton
29495ad436 Merge branch 'next' of https://github.com/STJr/SRB2 into text-color 2020-12-15 19:51:40 -06:00
James R
00c5d70bfc Merge branch 'drain-antiri' into 'next'
Make Ring Drain sectors play the depletion sound instead of the ring sound

See merge request STJr/SRB2!1315
2020-12-15 20:51:39 -05:00
James R
cab089c5b1 Merge branch 'gl-colormap-update' into 'next'
Fix animated skincolors in OpenGL (resolves #187, #247, #301, #370)

Closes #187, #247, #301, and #370

See merge request STJr/SRB2!1301
2020-12-15 20:50:45 -05:00