Commit graph

11847 commits

Author SHA1 Message Date
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
Steel Titanium
024d92eb2a 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
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
GoldenTails
c2e762bb5d Nice UDB config there, SRB2. 2020-12-24 03:22:08 -06: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
Jaime Ita Passos
7380ccde60 Fix unused variable warning when USE_APNG is not defined 2020-12-19 17:40:18 -03: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
Nev3r
ad03fe852a 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
ffef054dee magenta and green sonicx 2020-12-15 22:19:57 -06:00
Jaime Ita Passos
ad224acfca 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
f3fa2c4f32 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
3a7941391f 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
ec52d9bb73 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
cf454b0d77 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
1b4b7271ea Merge branch 'next' of https://github.com/STJr/SRB2 into text-color 2020-12-15 19:51:40 -06:00
James R
8b1c1a7ac2 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
ef3102e75a 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
James R
bde40c36b1 Merge branch 'team-elementalfire' into 'next'
Player-Colored Elemental Fire for competitive gametypes

See merge request STJr/SRB2!1312
2020-12-15 20:47:45 -05:00
James R
4ffe8f429d Merge branch 'intermission-double-free-fix' into 'next'
Fix double free occuring when unloading the intermission patches

See merge request STJr/SRB2!1304
2020-12-15 20:44:57 -05:00
James R
b98d27a1ba Merge branch 'circuit-finallap' into 'next'
Final lap text for circuit

See merge request STJr/SRB2!1303
2020-12-15 20:42:59 -05:00
James R
57155643b1 Merge branch 'gme-spc-fix' into 'next'
Fix SPC looping on libgme versions >= 0.6.3

See merge request STJr/SRB2!1302
2020-12-15 20:40:10 -05:00
katsy
284e32074d GETFLAG 2020-12-14 20:23:24 -05:00
Zippy_Zolton
d90d18f33c fixes spaces 2020-12-14 16:14:20 -06:00
Zippy_Zolton
a5d7823f5e Redone colormaps by SonicX8000 2020-12-14 12:52:24 -06:00
Jaime Ita Passos
7367316c06 Replace the first entry in the taglist, instead of adding into it 2020-12-14 14:13:24 -03:00
James R
8b0d2bb158 Better check for tag list userdata 2020-12-14 08:08:01 -08:00
James R
20c6259821 Push "valid" only once 2020-12-14 05:53:57 -08:00
katsy
a39949077b Merge remote-tracking branch 'stjr/next' into dusty 2020-12-14 05:39:35 -06:00
katsy
ead6180ef5 lol 2020-12-14 05:32:51 -06:00
katsy
03c9543db9 you too 2020-12-14 04:06:28 -05:00
katsy
f76803d8c0 go away whitespace 2020-12-14 04:05:14 -05:00