Commit graph

3440 commits

Author SHA1 Message Date
TehRealSalt cc2af8a329 Merge branch 'master' into net-screen 2018-10-05 16:13:25 -04:00
TehRealSalt 34aa3762c9 -splitscreen launcher option
Now you can join a game in splitscreen mode from a launcher
2018-10-04 23:55:28 -04:00
Sal 399cf59b8a Merge branch 'toast_misc' into 'master'
toast misc

Closes #11

See merge request KartKrew/Kart!19
2018-10-04 22:41:27 -04:00
TehRealSalt 85ed88ac20 Merge branch 'master' into net-screen 2018-10-04 20:16:25 -04:00
toaster fdf398d003 Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into toast_misc 2018-10-03 21:04:34 +01:00
TehRealSalt bb9e77f2a1 Add a few more splitscreen checks here 2018-10-03 13:43:36 -04:00
Sryder 76e0ff6dc7 Merge branch 'waypastpoint' into 'master'
Ghetto waypoint improvements

See merge request KartKrew/Kart!21
2018-10-02 18:20:17 -04:00
TehRealSalt d2ec4d2be5 Only play one player's roulette sounds at a time
Don't stack the sounds :WutFace:
2018-10-02 14:10:38 -04:00
toaster 2f082d8265 Revert "Just realised the inputwheel jittering in Sryder's videos was my fault, so fix this even better"
This reverts commit 8aff76b8c3.
2018-10-02 16:52:02 +01:00
toaster 4b9d5f251e Fix incorrect alignment of selected-level Ruby in vote drawer. 2018-10-02 16:51:17 +01:00
TehRealSalt 527642323e Splitscreen spectator info 2018-10-02 02:23:13 -04:00
TehRealSalt 7590153b67 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 506c70ce27 Don't scale player arrows in splitscreen 2018-10-02 01:28:48 -04:00
TehRealSalt ac521015ff 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 66c1b9d598 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 f5eee19d9b 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 24c615108f Merge branch 'master' into net-screen 2018-10-01 19:46:25 -04:00
toaster 445013b0f9 Wrong bracket level for flashing-set. 2018-10-01 22:44:17 +01:00
toaster 147b7a5786 Modified SPB to not route through P_DamageMobj (so wehave more control over the shield dropping/item obliteration, given Sryder picking up his own Thundershield...) 2018-10-01 21:48:52 +01:00
toaster d42736fe3d Include srb2.org in the credits per Rob's wishes. 2018-10-01 21:23:00 +01:00
Sryder 033667a0ee Merge branch 'keysmash' into 'master'
(Mic)key('s Dick) Smasher

See merge request KartKrew/Kart!18
2018-10-01 14:58:31 -04:00
toaster c9da6cd856 Minor HUD offset tweak for splitscreen eggnum. 2018-10-01 18:10:12 +01:00
toaster d0e629a8e2 Correct some inconsistencies I missed in the previous commit. 2018-10-01 13:51:23 +01:00
toaster 379772e5aa Allow respawning spectators before starttime is up because they no longer spawn in a condition that allows them to get an unfair advantage (drop dash or its ghetto 2.0-esque predecessor)
Also, some camera tweaks:
* Force chasecam when exiting, just like it's forced when you're dead and not a spectator.
* Force a horizontal camera angle aiming when spectator and dead, to avoid skybox bugs.
2018-10-01 13:25:13 +01:00
toaster 14a5ffbfd8 Based on netgame comments last night, update the tab rankings info to show less information in race. 2018-10-01 12:52:54 +01:00
toaster f1267f8ae1 Don't allow a new driftboost of lesser magnitude to completely cancel an existing driftboost. 2018-10-01 12:27:35 +01:00
toaster 0ec952d019 Add a SECTIONRACE map flag. So far, all it does is prevent the number of laps from exceeding the map default, but it's a base to work off of if we want to add any other changes specifically for section races in future. 2018-10-01 12:12:48 +01:00
toaster 487a2ecf2e Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into toast_misc 2018-10-01 11:46:13 +01:00
TehRealSalt 71e40f68cd Foolish error 2018-09-30 21:47:04 -04:00
TehRealSalt a4f3d4867d 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 9cf379f091 kartdebugnodes 2018-09-30 17:47:56 -04:00
TehRealSalt 5132c31e0f 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 bc807dccc4 Sorta messy menu to set splitscreen
Now this branch is completely functional!
2018-09-30 17:09:59 -04:00
TehRealSalt ad06b3c62f Proper G_GametypeHasSpectators for netgame splits 2018-09-30 16:35:05 -04:00
TehRealSalt 4da5c165f4 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 56ec3d0465 Probably should do this too... 2018-09-30 12:19:26 -04:00
TehRealSalt 7d8891f057 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 d705d2a606 Temporary testing measure
set splitscreen = 3 on host or connect
2018-09-30 11:22:56 -04:00
TehRealSalt f858b2aa11 RIP, didn't commit this 2018-09-30 11:22:31 -04:00
TehRealSalt 847924a47a Let's try what that comment suggests. 2018-09-30 11:22:10 -04:00
TehRealSalt 5628ffe360 HUD debugger (no cvar yet) 2018-09-30 11:21:41 -04:00
TehRealSalt fc93e5812d 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 3c567b39f1 Minor splitscreen+netgame fixes
Mainly related to drawing Battle arrows or Hyudoro
2018-09-30 01:23:59 -04:00
TehRealSalt 1d6215030e Online splitscreen
It WORKS, including kicking players in splitscreen
2018-09-30 00:51:03 -04:00
Sryder 005e3ce514 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 5322caa435 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 ab59504be0 Experimental: Making the ghetto waypoints we have right now their own mobj list in order to make them slightly less bullshit 2018-09-29 20:28:27 +01:00
toaster 1be13e8e2d Fix dehacked list incongruence. 2018-09-29 16:43:00 +01:00
toaster 2c1db167da 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 21ba9921da Some credits tweaks (alphabetical ordering plus new names, plus slight downwards adjustment of TYLER52) 2018-09-28 20:10:22 +01:00