Sal
25264d2634
Merge branch 'no-waypoint-sight-check' into 'master'
...
Waypoints use trace for blocking lines, instead of a sight check
See merge request KartKrew/Kart!342
2021-01-06 20:44:07 -05:00
Sal
d7c158099f
Merge branch 'slip-tide-stacked' into 'master'
...
Sliptiding now stacks your handling boosts
See merge request KartKrew/Kart!344
2021-01-06 20:30:58 -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
Sal
562716f787
Merge branch 'trick-panels' into 'master'
...
Trick panels
See merge request KartKrew/Kart!274
2021-01-06 18:31:21 -05:00
Sally Coolatta
7c86c686cf
Merge branch 'master' into hitlag-fixes
2021-01-06 18:30:23 -05:00
Sally Coolatta
c75b9cd89f
Merge branch 'master' into natural-camera-outrun
2021-01-06 17:57:04 -05:00
Sal
e2552d59d4
Merge branch 'trick-panels-changes' into 'trick-panels'
...
Trick panels changes
See merge request KartKrew/Kart!343
2021-01-06 17:17:10 -05:00
Sally Coolatta
5e5758a8e6
Sliptiding now stacks your handling boosts
...
Also removed the METABOLISM define because I'm pretty sure we all like it at this point
2021-01-06 16:48:36 -05:00
Sally Coolatta
56fba410ee
Waypoints use trace for blocking lines, instead of a sight check
2021-01-06 16:21:57 -05:00
Latapostrophe
834bd78eb5
Consider stuff unlocked if DEVELOP flag set
2021-01-06 22:10:23 +01:00
Latapostrophe
9d7e880d66
Buff side tricks slightly
2021-01-06 21:52:33 +01:00
Sally Coolatta
f2880241b4
Fix scale issues reintroduced by this branch
2021-01-06 15:25:39 -05:00
Latapostrophe
fe4d9ce889
New trick panel shit (but only the gameplay part)
2021-01-06 21:20:28 +01:00
Latapostrophe
74a39837bb
Merge conflicts
2021-01-06 18:33:42 +01:00
Latapostrophe
8db24b72f2
Merge branch 'trick-panels' of git.do.srb2.org:KartKrew/Kart into trick-panels
2021-01-06 18:02:18 +01: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
James R
617ffe0978
Merge branch 'block-monsters' into 'master'
...
Bring back block monsters, but as a line type instead of a flag
See merge request KartKrew/Kart!341
2021-01-05 03:43:51 -05:00
James R
c76ae9a4fd
Actually put it on line type 81
2021-01-04 18:55:33 -08:00
James R
6070d14fa5
Line special 11: block monsters for this line
2021-01-04 17:40:06 -08:00
James R
90507126e4
Move block line checks to a single function
2021-01-04 17:34:10 -08: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
SteelT
52e5de2bdc
Fix rain sound not playing.
...
Also fixed snow precip not picking any random state.
2020-12-24 14:49:30 -05: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
