fickleheart
606659dcff
Merge remote-tracking branch 'internal/master' into new-turnhax-and-latency-stuff
2019-01-15 19:55:42 -06:00
TehRealSalt
4b8a51d028
Merge branch 'next' of https://git.magicalgirl.moe/KartKrew/Kart-Public into next
2019-01-15 20:35:39 -05:00
TehRealSalt
0957d70451
Update file hashes
2019-01-15 20:35:20 -05:00
Sal
d755a479d5
Merge branch 'bump-maxskins' into 'next'
...
Bump MAXSKINS up to 64 + fix skin overflow error
See merge request KartKrew/Kart-Public!29
2019-01-15 20:30:33 -05:00
TehRealSalt
55e6797225
Update the (unused) SP menu stuff to use MAXSKINS
2019-01-15 20:09:55 -05:00
wolfy852
8f05182530
Only allow ESC and non-keyboard keys to abort connection
2019-01-15 18:47:13 -06:00
wolfy852
3c35f40572
Stop the keyboard from treating accelerate and break as menu keys
2019-01-15 03:02:52 -06:00
Sal
49a333e72a
Merge branch 'unfuck-splitscreen-hud' into 'next'
...
Cleaner splitscreen hud
See merge request KartKrew/Kart-Public!6
2019-01-15 03:47:29 -05:00
Sal
a17824ac76
Merge branch 'default-md2' into 'next'
...
Default model for players
See merge request KartKrew/Kart-Public!27
2019-01-15 03:42:19 -05:00
TehRealSalt
7c42a72fdd
Don't draw multiple WANTED posters in splitscreen
2019-01-15 03:41:33 -05:00
Sal
1af7314a83
Merge branch 'tiny-spb-fixes' into 'next'
...
Misc SPB fixes
See merge request KartKrew/Kart-Public!30
2019-01-15 03:37:00 -05:00
TehRealSalt
553f3a9295
Fix really dumb flags on MT_SPBEXPLOSION
2019-01-14 21:55:10 -05:00
TehRealSalt
1a10499779
Attempt to fix the stupid bug where SPB decides to not hurt
2019-01-14 21:38:38 -05:00
TehRealSalt
32030fae57
Reduce easing time, revert changing air speed
2019-01-14 21:37:53 -05:00
TehRealSalt
15174b0f02
Missed this
2019-01-14 18:24:25 -05:00
TehRealSalt
19329f9a4a
bump maxskins to 64, fix overflow error
2019-01-14 18:16:07 -05:00
TehRealSalt
ff1d433d1e
Tiny SPB fixes
...
- Fix typo that could potentially invalidate the wait phase
- Prevent dying during target phase causing it to redirect to someone else
- Ease speed back up to default whenever slowed down
- SPB intensity now biases against high drift sparks + acceleration, instead of only acceleration.
- Slow speed is scaled w/ SPB intensity too
2019-01-14 02:01:00 -05:00
TehRealSalt
e2b3cd181e
Gag spacing was not updated
2019-01-13 20:47:57 -05:00
Sal
327a11721c
Merge branch 'gamepad-tweaks' into 'next'
...
Gamepad Improvements: Round 2
See merge request KartKrew/Kart-Public!24
2019-01-13 20:32:17 -05:00
wolfy852
4d8cf39320
Allow any key to abort network connection, ignore non-keyboard keys in chat
2019-01-13 19:22:54 -06:00
Sal
e30d65213c
Merge branch 'polyobj_fix_public' into 'next'
...
Fix rendering gaps on polys with upper/lower textures
See merge request KartKrew/Kart-Public!26
2019-01-13 18:00:58 -05:00
wolfy852
077c151a0b
Revert "Enable d-pad on the vote screen"
...
Partial revert of commit d9b30a10e3 .
2019-01-12 05:37:07 -06:00
Latapostrophe
7e13cbd8ec
Forgot to trim whitespace
2019-01-12 12:28:15 +01:00
Latapostrophe
59c85425e2
Fixed WANTED poster drawing over minimap, WANTED cursor being colormapped, and splitscreen position shifting stuff
2019-01-12 12:27:30 +01:00
TehRealSalt
0351f6285e
Turn the "Music" section of the credits into only the people on Krew who contributes music
...
Meant to do this in song-credits, since individual songs are now properly credited there.
2019-01-12 04:13:49 -05:00
TehRealSalt
dff273d990
Minor misc fixes
2019-01-12 02:53:14 -05:00
fickleheart
3249851c3e
Fix rendering gaps on polys with upper/lower textures
2019-01-11 21:21:56 -06:00
Sal
b136d17f89
Merge branch 'dehacked-versioning' into 'next'
...
Update SOC version, make base SRB2 SOC throw a warning
See merge request KartKrew/Kart-Public!11
2019-01-11 20:25:00 -05:00
Sal
8cfe6434f7
Merge branch 'disable-xinput' into 'next'
...
-noxinput command line parameter
See merge request KartKrew/Kart-Public!21
2019-01-11 20:23:39 -05:00
fickleheart
e944ef9cac
i,m gowonna update my name in the cwedits uwu
2019-01-11 18:11:52 -06:00
wolfy852
ba9a6853d2
Fix the chat being incorrectly placed in splitscreen
2019-01-11 16:04:12 -06:00
wolfy852
93908a5610
Fix chat toggle not working
2019-01-11 02:38:49 -06:00
wolfy852
65a3b9f765
Merge remote-tracking branch 'remotes/public/next' into gamepad-tweaks
2019-01-11 00:18:45 -06:00
wolfy852
1c8c6387fc
-nohidapi parameter
...
Should fix problems where Switch Pro controllers suddenly had their mappings changed. Does not recognize controllers connected before game launch. Make sure to replug your controller after the game launches if using this param.
2019-01-10 23:12:06 -06:00
wolfy852
268a6d17f0
Merge remote-tracking branch 'remotes/public/next' into disable-xinput
2019-01-10 20:38:57 -06:00
wolfy852
6faae305e3
Merge remote-tracking branch 'remotes/public/next' into disable-xinput
2019-01-10 20:35:32 -06:00
Sal
dc7eae87db
Merge branch 'fix-chat' into 'next'
...
Fix splitscreen being forced into oldchat
See merge request KartKrew/Kart-Public!25
2019-01-10 18:43:14 -05:00
Sal
d7303b1b2d
Merge branch 'music-credits' into 'next'
...
In-game music credits
See merge request KartKrew/Kart-Public!23
2019-01-10 18:42:44 -05:00
wolfy852
5838c6cae8
Don't check splitscreen in OLDCHAT
2019-01-10 13:52:58 -06:00
wolfy852
d9b30a10e3
Enable d-pad on the vote screen, allow aborting connection with more joy buttons
2019-01-10 06:10:16 -06:00
wolfy852
d1bbebcbea
Fix player 2 not being able to play while the chat is open
...
Also attempts to fix the d-pad typing characters into the chat box.
2019-01-10 06:08:12 -06:00
TehRealSalt
dbc22fd87d
Merge branch 'next' into music-credits
2019-01-10 01:14:02 -05:00
Sal
69bd4dccf7
Merge branch 'kmd2-fallback' into 'next'
...
KMD2 Fallback
See merge request KartKrew/Kart-Public!22
2019-01-10 01:04:04 -05:00
TehRealSalt
a1daaf339b
Redone credits for joiners in a less stupid way, + redone start ambience in a less stupid way
2019-01-10 01:03:53 -05:00
TehRealSalt
6ac7e50d70
Remove this, doesn't work
2019-01-10 00:35:11 -05:00
TehRealSalt
66bb728363
Expose S_ShowMusicCredit to Lua
2019-01-09 21:17:24 -05:00
TehRealSalt
3491a22a94
Add disable for music credit showing on the change music linedef
2019-01-09 21:17:10 -05:00
TehRealSalt
171faa4ab4
Fix Music toggle trying to play a non-existent song in Kart
2019-01-09 21:13:06 -05:00
TehRealSalt
e05e543396
Accidental unselected change
2019-01-09 21:12:33 -05:00
TehRealSalt
6c5cc453a8
Show song credits if joining mid-game
...
Dunno if this works or not yet!
2019-01-09 21:01:56 -05:00