Commit graph

6300 commits

Author SHA1 Message Date
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
a037977f09 Merge branch 'master' into next 2019-03-09 20:37:17 -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
Alam Arias
afaa620f6b Merge remote-tracking branch 'upstream/master' 2019-03-09 20:13:41 -05:00
Alam Ed Arias
d386febf56 TravisCI: add option for GCC 8.1 2019-03-09 19:41:56 -05:00
Sryder
662bee1b4e Roulette Code: Electric Boogaloo 2019-03-10 00:04:09 +00:00
Sryder
60d2b6e37d Item roulette code proves once again to be one of the most fragile pieces of code I've seen
I assume we just need to move these other places to match the super ring ID moving.
2019-03-09 23:54:40 +00:00
fickleheart
1743d35fc2 Disable stacking thunder shields 2019-03-09 17:28:05 -06:00
fickleheart
26b7efddb4 Make P_NukeEnemies (including K_DoThunderShield) scale by mapscale 2019-03-09 17:24:20 -06:00
Alam Arias
9aff7ba875 Merge branch 'next' into join-passwords 2019-03-09 18:19:44 -05:00
Alam Arias
8502a5823f c is only for chat_in 2019-03-09 18:18:14 -05:00
Alam Arias
ef603143c9 fix VCHELP 2019-03-09 18:09:38 -05:00
fickleheart
bc647657f4 Fix password auto-hiding if you type into it 2019-03-09 17:06:44 -06:00
Alam Arias
18233eba23 Merge branch 'master' into ping-stuff-take2 2019-03-09 18:05:30 -05:00
fickleheart
c31cc7cae5 Make password toggle only affect password fields 2019-03-09 17:03:52 -06:00
fickleheart
acf1827d9e Handle capslock in just one place...? 2019-03-09 16:55:18 -06:00
fickleheart
60296de106 More... 2019-03-09 16:49:23 -06:00
fickleheart
f388416264 Use consts in place of some 16s 2019-03-09 16:46:55 -06:00
TehRealSalt
8c79e57f89 Don't lose rings with a shield on hit 2019-03-09 16:39:43 -05:00
fickleheart
d4f340ff7b Nudge lock over a tad 2019-03-09 15:27:23 -06:00
TehRealSalt
955e5d9c80 Nope, disable ring respawn again 2019-03-09 16:21:51 -05:00
fickleheart
d711e39518 Toggle showing password with tab 2019-03-09 15:14:08 -06:00
TehRealSalt
d6d5d44153 Fix misc mistakes 2019-03-09 16:05:39 -05:00
Latapostrophe
dca6d8094a Change default showping from Warning to Always 2019-03-09 22:01:52 +01:00
fickleheart
180bc0eaee Add join password to server host menu 2019-03-09 15:00:48 -06:00
fickleheart
640b9016d7 Show kartspeed and password status on server browser 2019-03-09 14:30:04 -06:00
fickleheart
283bb3aa66 Check password and etc before downloading files 2019-03-09 13:30:22 -06:00
fickleheart
055d73c1e7 Move HandleConnect to the same place as other packets 2019-03-09 12:01:47 -06:00
Latapostrophe
00ddf6e9f3 Fix boost / rocket sneakers for antigrav 2019-03-09 17:25:42 +01:00
TehRealSalt
db8f23561d Minor (but important!) polishing
- Thunder Shield now attracts rings
- Colorize the ring counter at max yellow
- Rings in the collecting animation are considered for determining if you can't pick up rings anymore, preventing a LOT of rings being deleted from the map over time.
- Flung rings don't lose speed over time anymore
- Flund rings last way longer
- Using rings is much less touchy (holding the button from before an item roulette will let you continue using them until you let go, using certain items won't make you use a couple rings afterwards)
- 0 rings is now counted as debt when getting hit, making debt easier to get out of (getting hit by a spike now would put you at -2 instead of -5)
- Move Super Ring toward the end of the item (so I don't have to modify gfx.kart to fix dropped items)
2019-03-09 04:33:46 -05:00