SteelT
d8bcc13fec
Merge branch 'master' into trick-panels
...
# Conflicts:
# src/d_player.h
# src/dehacked.c
# src/k_kart.c
# src/p_user.c
2020-09-18 00:54:45 -04:00
James R
325ae01e4b
K_DropRocketSneaker: MF2_DONTDRAW -> MFD_DONTDRAW
2020-08-19 16:46:24 -07:00
James R
8f2bfb63bc
Merge remote-tracking branch 'pub/next'
2020-08-19 16:45:31 -07:00
Sally Coolatta
0c412459bf
Merge branch 'master' into next
2020-08-17 02:05:31 -04:00
Sally Coolatta
d31c33e035
No previous prototype for K_DropKitchenSink
2020-08-16 21:18:33 -04:00
James R
b426ed81dd
dumbass doesn't test changes before pushing directly to next
...
(cherry picked from commit be14b8a564a89a5afb84ac19f1586f3db7f68367)
2020-08-14 08:27:25 -07:00
Sally Coolatta
7b4d84c3f3
Merge remote-tracking branch 'public/master'
2020-08-12 18:55:43 -04:00
Sally Coolatta
f8d1e75025
Merge remote-tracking branch 'public/next'
2020-08-12 18:50:41 -04:00
Sal
80d37b1939
Merge branch 'http-mserv' into 'master'
...
Make the HTTP Master Server official
See merge request KartKrew/Kart-Public!193
2020-08-10 16:49:47 -04:00
James R
8e493bddc3
Add http-mserv to fuck
2020-08-09 23:32:43 -07:00
Sal
15ff58280a
Merge branch 'maxnetnodes-2-electric-boogaloo' into 'master'
...
Bump MAXNETNODES to 127
See merge request KartKrew/Kart-Public!192
2020-08-09 22:28:50 -04:00
James R
3cb1a53b3f
Bump MAXNETNODES to 127
2020-08-09 18:26:34 -07:00
Sal
954a21123a
Merge branch 'indirectitemcooldown' into 'next'
...
Fix Shrink, SPB and Hyudoro cooldowns never resetting?
See merge request KartKrew/Kart-Public!191
2020-08-06 12:19:27 -04:00
Sally Coolatta
ddfd7a4772
Merge branch 'master' into next
2020-08-06 12:15:55 -04:00
AJ Martinez
e5463afb58
Fix Hyudoro cooldown never resetting
2020-08-06 10:51:53 -05:00
AJ Martinez
2422d1c5b7
Fix indirect item cooldown never resetting
2020-08-06 10:34:16 -05:00
Sal
a9861a6b63
Merge branch 'spinout-not-slow' into 'master'
...
Don't slow down on sneaker panels during spinout
See merge request KartKrew/Kart!313
2020-08-05 09:41:53 -04:00
Sal
8c6b8cd268
Merge branch 'master' into 'master'
...
Clarify addon-related messages
See merge request KartKrew/Kart-Public!190
2020-08-05 06:48:44 -04:00
AJ Martinez
4f1642bbce
Clarify addon-related messages
2020-08-05 00:40:56 -05:00
James R
b0c6b626cf
Don't slow down on sneaker panels during spinout
2020-08-04 02:11:52 -07:00
James R
ed2d40b98e
Unused parameter :)
2020-07-31 22:17:22 -07:00
Sal
21dfe49bf8
Merge branch 'antigrav-respawn' into 'master'
...
Antigravity fixes, round 2
See merge request KartKrew/Kart!305
2020-07-31 21:55:38 -04:00
Latapostrophe
de7147008e
Let's not try to outsmart the way mf2_objectflip works and just disable it entierely alongside mfe_verticalflip if the waypoint isn't flipped.
2020-07-31 18:13:28 +02:00
Sal
02e98c4d31
Merge branch 'hud-slidein' into 'master'
...
HUD slide in, and better splitscreen HUD support
See merge request KartKrew/Kart!306
2020-07-31 11:23:01 -04:00
Sally Coolatta
4847f71707
Make slower
2020-07-31 11:21:18 -04:00
Sal
7e1683fa5e
Merge branch 'sliptide-fix' into 'master'
...
Make sliptiding more effective again
See merge request KartKrew/Kart!307
2020-07-31 01:45:19 -04:00
Sally Coolatta
83b8556851
Old Flame Shield handling
2020-07-31 01:41:04 -04:00
Sally Coolatta
092db17f84
OK turns out my hunches were just totally wrong. THIS makes sliptiding really accurate to v1, and we ended up not liking handling stacking
2020-07-31 01:18:45 -04:00
Sal
35afda0173
Merge branch 'shadows-minor-things' into 'master'
...
Shadows minor things
See merge request KartKrew/Kart!308
2020-07-30 08:15:55 -04:00
Sally Coolatta
1008dcce36
Vertical flip for shadows
2020-07-29 23:55:36 -04:00
Sally Coolatta
72bfbefad3
SHORT fixes from vanilla for shadows
2020-07-29 21:28:09 -04:00
Sally Coolatta
903f118aac
Only spawn sliptides above your top speed
...
Looks a bit funky being able to do it at low speed using invincibility, plus it's not helping you to do this if you're going too slow :p
2020-07-29 12:47:55 -04:00
Sally Coolatta
ec9dc03725
Allow sliptides to spawn for any item that gives you a handling boost, since that's what lets it happen
2020-07-29 12:16:08 -04:00
Sally Coolatta
0ce492e103
Fix sliptiding being weakened after all of the boost stacking changes, by making handling bonuses stack using the same rules
2020-07-29 12:15:11 -04:00
Sally Coolatta
a0befdce2d
Fix drawing on others screens
2020-07-29 05:43:40 -04:00
Sally Coolatta
57822f6756
Merge master
2020-07-29 05:19:51 -04:00
Sal
0060a30bc4
Merge branch 'spindash' into 'master'
...
Spindash
See merge request KartKrew/Kart!303
2020-07-29 05:05:00 -04:00
Sally Coolatta
4044a153ca
Splitscreen support for the prestart counter
2020-07-29 05:00:12 -04:00
Sally Coolatta
1bbe4ede70
Duel graphic for 1v1s
...
Yu-Gi-Oh! Prison
2020-07-29 04:13:35 -04:00
Sally Coolatta
b39c8562a6
Fault HUD scrolls, faulting respawns you & holds you until the countdown's over
2020-07-29 01:47:00 -04:00
Sally Coolatta
c45a67c3f9
Pre start bulbs
2020-07-29 01:19:53 -04:00
Sally Coolatta
e53fe8c316
Fix player 2's position num in 2P
2020-07-28 04:49:34 -04:00
Sally Coolatta
3b6b0013c8
Add local ABCD tags for splitscreen
2020-07-28 04:49:15 -04:00
Sally Coolatta
69b6ba2f18
I tore apart the entire code to try and fix braking friction and gave up, so now it's back to v1
...
My rewrites clean up a LOT of weird/misleading behavior anyway, so I'm gonna push this regardless. Someone else will have to figure out another way to reimplement braking friction though -- we can't use it as is because it prevents being able to bump people.
2020-07-28 03:34:39 -04:00
Sally Coolatta
b08459cbee
Buffer time before countdown depends on player count, no intro spin in 1v1
2020-07-27 23:31:46 -04:00
Sally Coolatta
dfe4d4a219
No tethering off of the person who got the start boost
2020-07-27 02:29:43 -04:00
Sally Coolatta
c685f45563
Make it even stronger
2020-07-27 02:11:18 -04:00
Sally Coolatta
1b85f5b5fc
Don't Ebrake when you've just been bumped
2020-07-27 01:50:27 -04:00
Sally Coolatta
b4ae2ea896
Stronger top speed for the startup boost
2020-07-27 01:46:08 -04:00
Sally Coolatta
f3a607bf4f
Proper snapping for splitscreen!
2020-07-26 21:35:13 -04:00
