Commit graph

4711 commits

Author SHA1 Message Date
fickleheart
7817c3d77b Merge remote-tracking branch 'remotes/steel/dontskipframes' into test-many-mrs 2019-03-09 21:24:14 -06:00
fickleheart
e250172ad4 Merge remote-tracking branch 'remotes/upstream/join-passwords' into test-many-mrs 2019-03-09 21:23:20 -06:00
fickleheart
20c0db1f22 Merge remote-tracking branch 'remotes/upstream/thunder-fixes' into test-many-mrs 2019-03-09 21:23:07 -06:00
colette
eec76cf4ec 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
416b723567 Fix improperly-resolved merge conflict 2019-03-09 21:08:29 -06:00
Alam Arias
d58cb1aae3 Merge branch 'next' into ping-stuff-take2 2019-03-09 22:02:11 -05:00
Alam Arias
50d0bf54e0 Merge branch 'master' into next 2019-03-09 22:00:25 -05:00
Alam Arias
cbe785d854 Please do not go past the doomdata_t space 2019-03-09 21:57:59 -05:00
fickleheart
766d4eec27 bah 2019-03-09 20:23:49 -06:00
Alam Arias
4bccc7a69f Merge branch 'master' into ping-stuff-take2 2019-03-09 20:40:50 -05:00
Alam Arias
6fb950002c Merge remote-tracking branch 'upstream/master' 2019-03-09 20:13:41 -05:00
Alam Ed Arias
60ca6ae06b TravisCI: add option for GCC 8.1 2019-03-09 19:41:56 -05:00
fickleheart
814c48805c Disable stacking thunder shields 2019-03-09 17:28:05 -06:00
fickleheart
84631b1393 Make P_NukeEnemies (including K_DoThunderShield) scale by mapscale 2019-03-09 17:24:20 -06:00
Alam Arias
1410c515cb Merge branch 'next' into join-passwords 2019-03-09 18:19:44 -05:00
Alam Arias
035ad5822c c is only for chat_in 2019-03-09 18:18:14 -05:00
Alam Arias
5500e4c2df fix VCHELP 2019-03-09 18:09:38 -05:00
fickleheart
d804dc3a34 Fix password auto-hiding if you type into it 2019-03-09 17:06:44 -06:00
Alam Arias
b1ec0442da Merge branch 'master' into ping-stuff-take2 2019-03-09 18:05:30 -05:00
fickleheart
3bb014ea42 Make password toggle only affect password fields 2019-03-09 17:03:52 -06:00
fickleheart
ad3a32f500 Handle capslock in just one place...? 2019-03-09 16:55:18 -06:00
fickleheart
7c7034a229 More... 2019-03-09 16:49:23 -06:00
fickleheart
5f0c4271d7 Use consts in place of some 16s 2019-03-09 16:46:55 -06:00
fickleheart
e4d99605eb Nudge lock over a tad 2019-03-09 15:27:23 -06:00
fickleheart
870a800d89 Toggle showing password with tab 2019-03-09 15:14:08 -06:00
Latapostrophe
b17c4e562e Change default showping from Warning to Always 2019-03-09 22:01:52 +01:00
fickleheart
1b6035e322 Add join password to server host menu 2019-03-09 15:00:48 -06:00
fickleheart
d5691b9289 Show kartspeed and password status on server browser 2019-03-09 14:30:04 -06:00
fickleheart
2954b68e12 Check password and etc before downloading files 2019-03-09 13:30:22 -06:00
fickleheart
6bba2f16c0 Move HandleConnect to the same place as other packets 2019-03-09 12:01:47 -06:00
TehRealSalt
4faaa932ec Fix macro expansion warning Sryder got 2019-03-08 19:06:27 -05:00
Steel Titanium
77649ef6d1 Always return false instead. 2019-03-08 18:51:55 -05:00
TehRealSalt
87e91ebb2c Kill invincibility item caps
It's a holdover from another era, our item changes have stacked up enough that we don't really need this cap anymore
2019-03-08 18:36:25 -05:00
Sal
4f8665c785 Merge branch 'colors-roundtwo' into 'next'
16 more colors

See merge request KartKrew/Kart-Public!101
2019-03-07 21:25:03 -05:00
Sal
fd92612382 Merge branch 'minor-item-tweaks' into 'next'
Assorted item tweaks

See merge request KartKrew/Kart-Public!85
2019-03-07 21:24:51 -05:00
Steel Titanium
0e2cefe251 Properly comment out the function 2019-03-07 18:52:27 -05:00
Steel Titanium
7731fe8c24 Fix unused function error 2019-03-07 18:20:57 -05:00
Steel Titanium
3acf674b8a Merge branch 'master' of git.magicalgirl.moe:KartKrew/Kart-Public into dontskipframes 2019-03-07 18:13:16 -05:00
wolfy852
4e0518a85a Merge branch 'master' into next 2019-03-07 00:23:17 -06:00
fickleheart
18dba65f17 Don't shoot asterisks off-screen on the join password screen 2019-03-06 23:34:30 -06:00
fickleheart
ddf2db8a36 Fix freeze when trying to host with a join password already set 2019-03-06 23:32:47 -06:00
fickleheart
0ed74b3066 Missed an include 2019-03-06 22:45:02 -06:00
fickleheart
219b240bcf Recycle oldest challenges first if all are taken 2019-03-06 22:36:13 -06:00
fickleheart
bc46c3540f Show message on incorrect password 2019-03-06 22:11:35 -06:00
fickleheart
52b743a18f Fix join password not recognizing shifted characters 2019-03-06 22:07:28 -06:00
fickleheart
b5c4866706 Add -remove option to joinpassword 2019-03-06 21:30:39 -06:00
Sally Cochenour
c18935fbdd Reorder colors, ensure colored names are set properly 2019-03-06 03:15:07 -05:00
Sally Cochenour
f5fe073627 Fix floating lob items 2019-03-06 01:53:52 -05:00
fickleheart
264454ca70 hblurgle spburgle this code sucks 2019-03-05 22:27:25 -06:00
Steel Titanium
dc1786203d Merge branch 'master' into dontskipframes 2019-03-05 22:11:00 -05:00