Commit graph

3411 commits

Author SHA1 Message Date
TehRealSalt
2c3d586af1 Finish music in splitscreen now depends on the best player's rank
In offline splitscreen it should now always pick the win theme (the one that's timed with the signpost), and in online splitscreen it should now pick the best ranked local player (previously it'd always play the OK theme, unless if you time over'd)

Will also be extremely relevant for SMK-style cooperative grand prix!
2018-10-02 02:10:20 -04:00
TehRealSalt
5603f721cd Don't scale player arrows in splitscreen 2018-10-02 01:28:48 -04:00
TehRealSalt
eafcaffc47 Don't draw the challenger screen multiple times
Another minor bug that could only crop up in online splitscreen
2018-10-02 01:26:13 -04:00
TehRealSalt
1289c84af6 If multiple players are just joining, don't count them in the player count
Prevents awkward situations where only the last player of your node gets added immediately and not the others. Shouldn't affect anything otherwise?
2018-10-02 01:25:10 -04:00
TehRealSalt
e86a40ce12 Online splitscreen voting
Forgot I added in that quick edit to make it not send anything in splitscreen mode, oops!
2018-10-02 01:22:45 -04:00
TehRealSalt
63ed629c35 Merge branch 'master' into net-screen 2018-10-01 19:46:25 -04:00
Sryder
2b2a23ab68 Merge branch 'keysmash' into 'master'
(Mic)key('s Dick) Smasher

See merge request KartKrew/Kart!18
2018-10-01 14:58:31 -04:00
TehRealSalt
1fadc32f56 Foolish error 2018-09-30 21:47:04 -04:00
TehRealSalt
e307393b0f Change dummysplitplayers into splitplayers, unhide it, and set it when joining and not just hosting
Silly oversight
2018-09-30 18:07:05 -04:00
TehRealSalt
6a55d3f342 kartdebugnodes 2018-09-30 17:47:56 -04:00
TehRealSalt
ee7865a8bd I have no idea if this is an actual problem or not, but this was in the back of my mind from day 1 2018-09-30 17:17:33 -04:00
TehRealSalt
f9ed3bc219 Sorta messy menu to set splitscreen
Now this branch is completely functional!
2018-09-30 17:09:59 -04:00
TehRealSalt
9c37d7cacb Proper G_GametypeHasSpectators for netgame splits 2018-09-30 16:35:05 -04:00
TehRealSalt
c19803d445 Fix all of the joining ghost issues or desyncing
The answer was so obvious! Just add a XD that just calls CL_RemovePlayer! Duh!
2018-09-30 16:20:01 -04:00
TehRealSalt
641fbe842d Probably should do this too... 2018-09-30 12:19:26 -04:00
TehRealSalt
2c7fb156b6 Instead of directly using CL_RemovePlayer, do a silly loop around
Hopefully I don't have to keep this, just have to see if it works
2018-09-30 12:12:12 -04:00
TehRealSalt
2d7b130a7f Temporary testing measure
set splitscreen = 3 on host or connect
2018-09-30 11:22:56 -04:00
TehRealSalt
03108a242b RIP, didn't commit this 2018-09-30 11:22:31 -04:00
TehRealSalt
f8fc8def3f Let's try what that comment suggests. 2018-09-30 11:22:10 -04:00
TehRealSalt
77f6aa4140 HUD debugger (no cvar yet) 2018-09-30 11:21:41 -04:00
TehRealSalt
3afaf9f658 Add a message for when multiple players on one node get removed
Example:

Chrome has been kicked (Go away)
Shadow has left the game (Joined with Chrome)
Kryne has left the game (Joined with Chrome)
Vyce has left the game (Joined with Chrome)
2018-09-30 01:51:49 -04:00
TehRealSalt
9b245c7bef Minor splitscreen+netgame fixes
Mainly related to drawing Battle arrows or Hyudoro
2018-09-30 01:23:59 -04:00
TehRealSalt
3dfc5753f5 Online splitscreen
It WORKS, including kicking players in splitscreen
2018-09-30 00:51:03 -04:00
Sryder
fa7a2fc9ac Merge branch 'hack_the_de_damnit' into 'master'
Fix dehacked list incongruence

See merge request KartKrew/Kart!20
2018-09-29 16:52:41 -04:00
Sryder
0e04819573 Merge branch 'invert_dynamic_slopes' into 'master'
Flip dynamic slope toggle

See merge request KartKrew/Kart!17
2018-09-29 16:51:35 -04:00
toaster
c57a2b0724 Fix dehacked list incongruence. 2018-09-29 16:43:00 +01:00
toaster
7a4b6b6081 Correct that thing Lat` found where sometimes the controls menus'd get "stuck" replacing the second key every time, effectively only allowing one key until you clear it and try again.
Also, sounds.
2018-09-29 16:18:16 +01:00
toaster
2df598f148 Flip dynamic slope toggle. 2018-09-28 12:58:07 +01:00
toaster
79639c1104 Merge branch 'minimap_in_demos' into 'master'
Show minimap in demo playback

See merge request KartKrew/Kart!16
2018-09-23 18:14:09 -04:00
Sal
f69b3f3f59 Merge branch 'thundershield-hell' into 'master'
Thundershield hell

See merge request KartKrew/Kart!14
2018-09-23 18:08:59 -04:00
toaster
b7a62b9625 smoll to tiny 2018-09-23 23:07:38 +01:00
toaster
54234ba8d9 Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into thundershield-hell
# Conflicts:
#	src/info.c
#	src/info.h
#	src/sounds.c
#	src/sounds.h
2018-09-23 23:07:16 +01:00
Sal
824c9066e6 Merge branch 'itemdrop' into 'master'
Itemdrop

See merge request KartKrew/Kart!11
2018-09-23 17:51:28 -04:00
toaster
7f9052add0 You're right, this works fine 2018-09-23 22:34:59 +01:00
toaster
9a94a43fc3 Turns out Playing() evaluates to false when playing back demos. Who knew? 2018-09-23 19:58:15 +01:00
toaster
98e9767afb Merge branch 'addons_menu' into 'master'
Addons menu

See merge request KartKrew/Kart!8
2018-09-23 12:58:06 -04:00
toaster
383ba1d738 Forgot I did this optimisation! Updated for the new colours. 2018-09-23 16:39:07 +01:00
toaster
862c256e92 The pipeline halted for some reason, so here's the smallest possible legitimate change to bump it back into action: Replacing commenting-out with #ifdefing. 2018-09-23 16:13:58 +01:00
toaster
2025f23a09 Somehow butchered the code cleanliness (indentation/not taking advantage of a macro I defined specifically for this) here a little by accident - tidied up. 2018-09-23 13:34:49 +01:00
toaster
1331826600 Fix Sryder's crash (incorrect setting of dir_on when searching in subfolders).
Also, correct a minor copypaste failure in one of the I_Errors' messages.
2018-09-23 13:23:03 +01:00
toaster
fdb2315bca Add a scroll bar to the addons menu. Should hopefully make the temperature gauge a little less problematic... 2018-09-23 13:22:00 +01:00
toaster
b12c2516ec Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into itemdrop
# Conflicts:
#	src/dehacked.c
#	src/info.c
#	src/info.h
2018-09-23 11:47:29 +01:00
Sal
1d1705d4e7 Merge branch 'new-voices' into 'master'
New voices

See merge request KartKrew/Kart!15
2018-09-22 20:22:59 -04:00
TehRealSalt
a4ce0bebbd Doing this looks more appealing to me 2018-09-22 20:15:12 -04:00
TehRealSalt
d6399bc2bc Quick fix for other player's win/lose not playing 2018-09-22 20:14:32 -04:00
Sal
7a354f1b8f Merge branch 'this-is-a-sign' into 'master'
End sign on finish

See merge request KartKrew/Kart!13
2018-09-22 20:11:05 -04:00
TehRealSalt
a32f87fab2 New sparkles 2018-09-22 19:55:26 -04:00
TehRealSalt
67e1e9aab3 Set nogravity on landing
Means you can't have a finishline that moves up and down, but eh, thinking this might help the fallback measure disappearing
2018-09-22 19:03:38 -04:00
TehRealSalt
e6db552945 Better particle spread 2018-09-22 19:00:30 -04:00
TehRealSalt
8bc02a3ec6 raceexittime var 2018-09-22 18:59:26 -04:00