Commit graph

3787 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
TehRealSalt
9e068f8c03 Address toast review
- Re-add highlighting to the header text, and shift it back up slightly
- Move the viewpoint loop break out of a while and into the main loop
2018-10-01 19:23:38 -04:00
toaster
b23d0d12a8 Wrong bracket level for flashing-set. 2018-10-01 22:44:17 +01:00
toaster
9f5b2bdeb8 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
Monster Iestyn
7d076d799c Merge branch 'linux-better-mem-report' into 'master'
Use MemAvailable instead

See merge request STJr/SRB2!281
2018-10-01 16:25:21 -04:00
toaster
76a2079671 Include srb2.org in the credits per Rob's wishes. 2018-10-01 21:23:00 +01: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
Latapostrophe
6146314415 Fix /me and sayteam, except sayteam now actually doesn't do anything anymore. 2018-10-01 20:23:56 +02:00
toaster
05332a4f0f Minor HUD offset tweak for splitscreen eggnum. 2018-10-01 18:10:12 +01:00
toaster
b5e090f0df Correct some inconsistencies I missed in the previous commit. 2018-10-01 13:51:23 +01:00
TehRealSalt
32bb288b84 DrawFill supports splitscreen offset flags 2018-10-01 08:41:44 -04:00
toaster
2cce9a0fcb 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
b7421c72eb 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
664544379f Don't allow a new driftboost of lesser magnitude to completely cancel an existing driftboost. 2018-10-01 12:27:35 +01:00
TehRealSalt
abb21fc79c Goodbye cvar 2018-10-01 07:21:02 -04:00
toaster
ae0e569cfb 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
72be55c5d6 Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into toast_misc 2018-10-01 11:46:13 +01:00
TehRealSalt
1fadc32f56 Foolish error 2018-09-30 21:47:04 -04:00
TehRealSalt
8768e96afa Please don't punish offline practice 2018-09-30 21:46:12 -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
Monster Iestyn
f3ebe6585e Move player + player mobj existence checks to top of P_MoveChaseCamera. This is the only place it makes sense to even check them tbh.
While I'm at it, let's also use the "mo" variable instead of player->mo throughout the function (to be consistent)
2018-09-30 22:18:48 +01: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
dd5247811f 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
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
585ee5ba06 Some credits tweaks (alphabetical ordering plus new names, plus slight downwards adjustment of TYLER52) 2018-09-28 20:10:22 +01:00
toaster
2df598f148 Flip dynamic slope toggle. 2018-09-28 12:58:07 +01:00
TehRealSalt
aaee15b5eb "TICRATE*1"?! 2018-09-27 18:44:14 -04:00
TehRealSalt
a641bba641 No mashing in Record Attack 2018-09-27 18:42:42 -04:00
TehRealSalt
ddf310d135 Talk key is a two-way toggle for non-keyboard binds 2018-09-27 18:32:48 -04:00