LJ Sonic
|
9a2a1d25d6
|
Merge branch 'jimita-why-you-done-this!!!' into 'next'
Fix mobj unarchiving code
See merge request STJr/SRB2!1384
|
2021-01-22 18:26:26 -05:00 |
|
Latapostrophe
|
aee76fe88d
|
expose karthud to lua. bruh.
|
2021-01-21 22:18:00 +01:00 |
|
Lachlan Wright
|
a1adf3dd19
|
Merge branch 'flipped-waterrun' into 'next'
Allow water running in reverse gravity
See merge request STJr/SRB2!1369
|
2021-01-19 23:20:57 -05:00 |
|
Jaime Ita Passos
|
9fc1379668
|
Revert "Move a few mobj spawn defaults to its own function"
This reverts commit 3f36a51f5b.
# Conflicts:
# src/p_mobj.c
|
2021-01-17 23:17:46 +01:00 |
|
SteelT
|
87bcb9315a
|
Merge branch 'credits-229' into 'next'
Add Logan to the credits
See merge request STJr/SRB2!1379
|
2021-01-13 19:08:09 -05:00 |
|
Sal
|
320cdf2108
|
Merge branch 'keep-trick-bump' into 'master'
Keep trick when bonking walls
See merge request KartKrew/Kart!352
|
2021-01-13 02:59:59 -05:00 |
|
Sally Coolatta
|
94b8f97115
|
Keep trick when bonking walls
|
2021-01-13 02:42:55 -05:00 |
|
Sal
|
b19c8a43c7
|
Merge branch 'drip' into 'master'
Ripple on regular ass sectors
See merge request KartKrew/Kart!351
|
2021-01-13 02:06:29 -05:00 |
|
James R
|
802dd22de4
|
Sector Parameters Ripple
Upper Unpegged - Ripple on floor plane
Lower Unpegged - Ripple on ceiling plane
|
2021-01-12 22:33:49 -08:00 |
|
James R
|
0292464611
|
Let sector flags control plane ripple effect
|
2021-01-12 22:16:55 -08:00 |
|
Sally Coolatta
|
8289bf252f
|
Chengi's menu selectors
- Menu BG image is defined by menu option
- Menu BG image slides in
- Gamemode menu options are now like Chengi's mockup
|
2021-01-13 01:16:14 -05:00 |
|
Tatsuru
|
8bc1904468
|
Put his name at the right order
|
2021-01-11 21:49:31 -03:00 |
|
Sally Coolatta
|
521eff868c
|
Chengi's new background added
|
2021-01-11 01:02:16 -05:00 |
|
Sally Coolatta
|
2af75a2bd1
|
Fix merge conflicts
|
2021-01-11 00:06:34 -05:00 |
|
Sally Coolatta
|
a14cf1f029
|
Merge branch 'master' into new-menus
|
2021-01-10 21:31:09 -05:00 |
|
Tatsuru
|
923cc0d8f2
|
Add Logan to the art credits
|
2021-01-10 23:17:40 -03:00 |
|
Sal
|
9639e5bab3
|
Merge branch 'deadzone-initialisation-ass' into 'master'
Initialise y-axis for the deadzone function
See merge request KartKrew/Kart!350
|
2021-01-10 16:06:42 -05:00 |
|
Sryder
|
f2b706aa2f
|
Initialise y-axis for the deadzone function
|
2021-01-10 20:22:51 +00:00 |
|
SteelT
|
fb09b3051e
|
Merge branch 'netcode-ticqueue-fix' into 'master'
Replace BACKUPTICS with TICQUEUE
See merge request KartKrew/Kart!349
|
2021-01-10 15:19:30 -05:00 |
|
SteelT
|
151acf4f68
|
Replace BACKUPTICS with TICQUEUE
Seems to help with the very frequent timeouts. Still weird issues with node/netcmd being resent or something...
|
2021-01-10 15:12:44 -05:00 |
|
GoldenTails
|
f11850a0eb
|
Fix a divby0 when you have SF_MULTIABILITY, CA_DOUBLEJUMP, and actionspd -FRACUNIT.
|
2021-01-10 10:01:31 -06:00 |
|
SteelT
|
329eae3ee3
|
Merge branch 'tumble-changes' into 'master'
Weaker tumble, some effects + tumble on spring panel fail
See merge request KartKrew/Kart!348
|
2021-01-10 01:40:37 -05:00 |
|
SteelT
|
4889cfe1cc
|
Merge branch 'master' into tumble-changes
|
2021-01-10 00:56:48 -05:00 |
|
James R
|
33b6c320b2
|
Reset tumbleLastBounce so the final bounce always happens
|
2021-01-09 19:47:41 -08:00 |
|
James R
|
9a2bdc090c
|
Make trick panel tumble penalty condition stricter
|
2021-01-09 19:47:12 -08:00 |
|
James R
|
12626cc883
|
Play tumble falling sound if downward momentum is at least 10 fracunits, except on last two bounces
|
2021-01-09 19:47:04 -08:00 |
|
James R
|
0663f8fa5a
|
Max tumble height 50 -> 40
|
2021-01-09 19:02:37 -08:00 |
|
Sal
|
1d28003be3
|
Merge branch 'fix-deadzones-2' into 'master'
Nicer Handling of aim deadzone for kart
See merge request KartKrew/Kart!347
|
2021-01-09 16:15:25 -05:00 |
|
Latapostrophe
|
3cd4c87df5
|
Weaker tumble, some effects + tumble on spring panel fail
|
2021-01-09 21:58:35 +01:00 |
|
Sryder
|
0be892ba0d
|
Turn the aim axis into a digital one, as we only use it for throwing items and the vote screen
Turn axis still has the same deadzone handling as before, meaning it gradients away from the deadzone properly.
|
2021-01-09 12:09:00 +00:00 |
|
Zwip-Zwap Zapony
|
ff28a5365d
|
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
|
76e4826626
|
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
|
3a43ede058
|
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
|
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 |
|