Commit graph

5706 commits

Author SHA1 Message Date
TehRealSalt
0f4fd73533 Try out boost stacking 2019-03-11 12:00:39 -04:00
TehRealSalt
5507a41d64 Make Grow not cancel if holding down from roulette 2019-03-11 11:10:53 -04:00
TehRealSalt
5afe936dd9 Remove Eggman monitor early detonation, allow using rings during the countdown 2019-03-11 11:01:01 -04:00
TehRealSalt
d11394f1bd Remove ring boost when hurt 2019-03-11 10:38:11 -04:00
TehRealSalt
c35e5cb095 Ring debt bump wipeout spawns hit sparks 2019-03-11 10:34:54 -04:00
Alam Arias
06cd65cc72 Merge branch 'master' into next 2019-03-11 10:01:57 -04:00
Alam Arias
ed0df9966d Fix compiling with VS 2019-03-11 09:58:37 -04:00
TehRealSalt
2d8f8b0791 Spawn ghost trails behind spilled rings, SPB spawns a trail of rings 2019-03-11 03:21:31 -04:00
TehRealSalt
13bedab061 Change HUD ring spin mechanic
Instead of spinning at max speed while boosting & slowing down after, the spinning speed depends on how much ring boost you're currently using. This means Tails/Chao's ring spins super fast, Metal/Omega's ring spins super slow.
2019-03-11 03:09:16 -04:00
wolfy852
82d93a95fd Remove P_CanRunOnWater 2019-03-11 00:28:30 -05:00
fickleheart
ebee7232c7 Make sure Fairy is before Popcorn 2019-03-11 00:10:03 -05:00
colette
f1cd65eccc Merge branch 'file-exploit-fix' into 'master'
Fix majormods not getting set for files added via -file

See merge request KartKrew/Kart!126
2019-03-10 22:24:33 -04:00
fickleheart
ba6975607a Move modified check on -file addons later in startup 2019-03-10 19:44:31 -05:00
wolfy852
f526955783 Fix the game getting flagged as modified by default
As a result, majormods trips for Lua and map replacements now, but modifiedgame isn't set for minor addons...
2019-03-10 19:27:45 -05:00
Sryder
fd59bfc341 Move FORCECLOSE definition to be out of NONET ifdef
Should this just be moved into d_net.h instead of defining it here and in d_net.c?
2019-03-11 00:13:43 +00:00
wolfy852
a24fe5e22d Attempt to fix replaced maps not marking the game as modified
What this ACTUALLY does is mark the game as modified by default.
2019-03-10 18:55:55 -05:00
Sryder
e59481735f Fix compile warnings. 2019-03-10 23:51:52 +00:00
colette
59374c56aa Merge branch 'join-passwords' into 'next'
join passwords

See merge request KartKrew/Kart-Public!104
2019-03-10 19:12:59 -04:00
fickleheart
a16243e84d Deduplicate character shifting code 2019-03-10 18:09:15 -05:00
fickleheart
f4486cb117 Remove unnecessary padding byte from stored challenge answers 2019-03-10 17:54:17 -05:00
fickleheart
40c77df793 Make sure we don't write kartspeed beyond SV_SPEEDMASK 2019-03-10 17:43:39 -05:00
fickleheart
892b4e77d9 Make noises on the password entry screen 2019-03-10 17:36:16 -05:00
fickleheart
7bd8effc65 Draw a padlock on-screen! 2019-03-10 17:25:55 -05:00
fickleheart
1cd8c15e8c Show notice of a password-protected server on the join screen 2019-03-10 17:00:27 -05:00
fickleheart
99a934e352 Properly close the connection on the server's side... 2019-03-10 16:22:03 -05:00
fickleheart
a2f849c49c Update packettypenames 2019-03-10 16:06:46 -05:00
fickleheart
ff7dd2699e Merge remote-tracking branch 'remotes/upstream/next' into join-passwords 2019-03-10 15:54:06 -05:00
colette
f5ed80b40c Merge branch 'color-def-fixes' into 'next'
Fix dehacked color list being wrong

See merge request KartKrew/Kart-Public!111
2019-03-10 16:53:45 -04:00
fickleheart
0c85666080 Fix dehacked color list being wrong 2019-03-10 15:48:55 -05:00
fickleheart
99cf366e6e Skip password check if node is already in-game? idk 2019-03-10 15:48:11 -05:00
fickleheart
f8a75cb4fc Improve stability when joining netgames maybe 2019-03-10 12:50:24 -05:00
fickleheart
6fe9a6bd06 Merge remote-tracking branch 'remotes/upstream/next' into join-passwords 2019-03-10 12:35:07 -05:00
colette
4bce1ed401 Merge branch 'dontskipframes' into 'master'
Don't skip frames in software mode

See merge request KartKrew/Kart-Public!103
2019-03-10 13:29:10 -04:00
TehRealSalt
f0cf1bb39b Merge branch 'rings' of https://git.magicalgirl.moe/KartKrew/Kart into rings 2019-03-10 06:15:30 -04:00
TehRealSalt
523e46b3fb Finally animate the spinning ring 2019-03-10 06:15:26 -04:00
colette
ddb083e856 Merge branch 'thunder-fixes' into 'next'
Thunder shield-related changes

See merge request KartKrew/Kart-Public!110
2019-03-10 03:51:33 -04:00
fickleheart
9f48006254 Try a partial disconnect instead 2019-03-09 23:56:13 -06:00
fickleheart
28e4cfdb6d Properly close and reopen the client connection for password challenges 2019-03-09 23:36:11 -06:00
wolfy852
19e515d439 Kill all skin flags but SF_HIRES 2019-03-09 23:18:55 -06:00
fickleheart
fe651ae79b Revert "Move HandleConnect to the same place as other packets"
This reverts commit 055d73c1e7.
2019-03-09 22:17:16 -06:00
colette
4cbc4b1835 Merge branch 'remove-pinvin' into 'next'
Kill invincibility item caps

See merge request KartKrew/Kart-Public!108
2019-03-09 22:16:25 -05:00
fickleheart
12750e06e3 Fix improperly-resolved merge conflict 2019-03-09 21:08:29 -06:00
Alam Arias
6560740234 Merge branch 'next' into ping-stuff-take2 2019-03-09 22:02:11 -05:00
Alam Arias
f251bd6d19 Merge branch 'master' into next 2019-03-09 22:00:25 -05:00
Alam Arias
28d101ac1a Please do not go past the doomdata_t space 2019-03-09 21:57:59 -05:00
fickleheart
00e5b59fe2 bah 2019-03-09 20:23:49 -06:00
Alam Arias
f17185289b Merge branch 'master' into ping-stuff-take2 2019-03-09 20:40:50 -05:00
Alam Arias
fd7f09b124 Merge remote-tracking branch 'upstream/master' 2019-03-09 20:38:36 -05:00
Alam Ed Arias
a2c1b63864 partly Revert "TravisCI: remove WFLAGS"
This reverts commit a22c9a999e.
2019-03-09 20:36:44 -05:00
Alam Ed Arias
a22c9a999e TravisCI: remove WFLAGS 2019-03-09 20:17:14 -05:00