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 |
|
Sal
|
061ad6587b
|
Merge branch 'just-tumble' into 'master'
Tumble
See merge request KartKrew/Kart!345
|
2021-01-07 00:36:38 -05:00 |
|
Sally Coolatta
|
b2bf38718e
|
Minimum tics is back to tics
|
2021-01-07 00:32:38 -05:00 |
|
Sally Coolatta
|
03149d7810
|
Only do touch damage when confirming a bump
Should fix the mcdonalds rings
|
2021-01-06 23:16:02 -05:00 |
|
Sally Coolatta
|
cfda66103d
|
Merge branch 'master' into just-tumble
|
2021-01-06 23:02:51 -05:00 |
|
Sal
|
57e69603a4
|
Merge branch 'natural-camera-outrun' into 'master'
Add distance easing to the camera, so it doesn't jitter around too much when you're stuck.
See merge request KartKrew/Kart!310
|
2021-01-06 22:27:09 -05:00 |
|
Sal
|
542e0b88df
|
Merge branch 'hitlag-fixes' into 'master'
Try and fix hitlag damage, lightning shield, & punting mines
See merge request KartKrew/Kart!340
|
2021-01-06 21:09:07 -05:00 |
|
Sal
|
f1bee43338
|
Merge branch 'precip-fixes' into 'master'
Fix rain sound not playing (resolves #93)
Closes #93
See merge request KartKrew/Kart!339
|
2021-01-06 20:45:45 -05:00 |
|
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 |
|