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
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
James R
14c6d93c0c
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
804e049579
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
73a7365798
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
503364f5f8
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
d999e436f1
GETFLAG
2020-12-14 20:23:24 -05:00
Zippy_Zolton
07034cf441
fixes spaces
2020-12-14 16:14:20 -06:00
Zippy_Zolton
9b8bacd088
Redone colormaps by SonicX8000
2020-12-14 12:52:24 -06:00
Jaime Ita Passos
3b36005ceb
Replace the first entry in the taglist, instead of adding into it
2020-12-14 14:13:24 -03:00
James R
d0f3a6d737
Better check for tag list userdata
2020-12-14 08:08:01 -08:00
James R
00dff6d283
Push "valid" only once
2020-12-14 05:53:57 -08:00
katsy
f09198788d
Merge remote-tracking branch 'stjr/next' into dusty
2020-12-14 05:39:35 -06:00
katsy
721170f5a0
lol
2020-12-14 05:32:51 -06:00
katsy
4521827e2c
you too
2020-12-14 04:06:28 -05:00
katsy
200e444016
go away whitespace
2020-12-14 04:05:14 -05:00
katsy
2bebaf12d0
add checks for new flag, make emergency jump call shieldspecial
2020-12-14 04:03:14 -05:00
katsy
dfbb1825f4
ditto
2020-12-14 04:02:17 -05:00
katsy
0ce9d9127a
add SF_NOSHIELDABILITY
2020-12-14 04:01:50 -05:00
katsy
2b23468359
remove amy
2020-12-14 02:36:00 -05:00
Zippy_Zolton
c247b94be7
Merge branch 'next' of https://github.com/STJr/SRB2 into text-color
2020-12-14 00:16:38 -06:00
Jaime Ita Passos
6160a2d0fe
Fix a misuse of levelflat_t.picture in OpenGL (Kitchen Sink SRB2 port)
2020-12-14 02:07:12 -03:00
Jaime Ita Passos
ca78fc69ca
Restore the viewpoint's angle in R_DrawPlanes instead
2020-12-14 01:14:55 -03:00
Jaime Ita Passos
7e0a1709de
Fix a crash in Picture_GetPatchPixel with PICFMT_DOOMPATCH formats
2020-12-14 00:53:42 -03:00
James R
760e083c30
Merge branch 'fix-playintro-crash' into 'next'
...
Fix intro crash
See merge request STJr/SRB2!1310
2020-12-13 22:17:25 -05:00