Commit graph

3461 commits

Author SHA1 Message Date
TehRealSalt
b5f409fcb8 Merge branch 'master' into net-screen 2018-10-07 18:54:22 -04:00
Sryder
db332478d5 Merge branch 'skill-option' into 'master'
-skill launcher option

See merge request KartKrew/Kart!34
2018-10-07 12:25:06 -04:00
Sryder
b46aa4201e Merge branch 'frameperfectegg' into 'master'
Frame Perfect Egg

See merge request KartKrew/Kart!31
2018-10-07 09:39:45 -04:00
Sryder
ce2980f228 Merge branch 'colors' into 'master'
Edit Pink, Navy, and Jet, add brown text

See merge request KartKrew/Kart!28
2018-10-07 09:39:22 -04:00
Sryder
b631a8436d Merge branch 'droptweaks' into 'master'
Droptweaks

See merge request KartKrew/Kart!27
2018-10-07 09:37:02 -04:00
toaster
977130dbf6 Halt frame-perfect egg crash.
(The code is slightly modified from what I put in bug-reports as a potential fix, but I'm glad I was on the right track.)
2018-10-05 23:24:26 +01:00
TehRealSalt
37b5a9327c Merge branch 'master' into net-screen 2018-10-05 16:13:25 -04:00
Sal
1c3ad7d12a Merge branch 'always-move-cam' into 'master'
Move camera less often

See merge request KartKrew/Kart!30
2018-10-05 11:47:55 -04:00
Sal
10c194d95b Merge branch 'chat-changes' into 'master'
Chat changes

See merge request KartKrew/Kart!26
2018-10-05 11:47:45 -04:00
Sryder
2488e3a6d9 Merge branch 'vsync-default-off' into 'master'
Disable VSync by default

See merge request KartKrew/Kart!29
2018-10-05 10:44:48 -04:00
Latapostrophe
d4bc7d14ba Say-team (key and command) now depend of G_GametypeHasTeams(), so you'll only have to modify this function to have say-team work in the gametypes of your choice. 2018-10-05 12:13:11 +02:00
TehRealSalt
bd812b6ece -skill launcher option
Requested by Sev(?), for map editing; sets kartspeed using the same name as Doom's difficulty launcher option
2018-10-04 23:58:44 -04:00
TehRealSalt
59c4400a60 -splitscreen launcher option
Now you can join a game in splitscreen mode from a launcher
2018-10-04 23:55:28 -04:00
Sal
b9550051da 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
b33ad2ad2a Merge branch 'master' into net-screen 2018-10-04 20:16:25 -04:00
TehRealSalt
a67e375fe9 Brown text colormap instead of teal, revert sky-blue 2018-10-04 18:07:56 -04:00
TehRealSalt
3b2728054d Always move the camera
According to wolfs, this improves fps. Let's confirm, shall we?
2018-10-04 17:50:50 -04:00
Sryder
eeb6003595 Disable VSync by default. I wouldn't be surprised if there are issues that arise from it, and I'm fairly sure its always been slightly spotty. 2018-10-04 21:08:47 +01:00
TehRealSalt
0a693789d6 Edit the text remaps
Lighter sky, lighter pink, steel is now called steel-blue
2018-10-04 14:30:54 -04:00
TehRealSalt
d1dc8a24f3 Dream is green, Olive is yellow 2018-10-04 14:28:38 -04:00
TehRealSalt
d65b02b176 Moved colors around yet again for nicer invincibility effect
- Ruby is closer to the pinks (and where purples would be if it wrapped around)
- Sapphire is closer to the cyans
- Dream is right before the teals
2018-10-03 21:18:07 -04:00
TehRealSalt
c99d9e7253 Edit Pink, Navy, and Jet 2018-10-03 20:48:44 -04:00
toaster
5006a54bf7 Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into toast_misc 2018-10-03 21:04:34 +01:00
toaster
304b8b343e Don't have all of your mines disappear into the aether if you have to shield-drop ONE, because they're not all out at once. (This is only really relevant to debug testing, given picking up additional HUD-dropped mines isn't very likely. 2018-10-03 20:56:43 +01:00
Latapostrophe
bfd88c59c6 Allow client to open chat and scroll even if muted. 2018-10-03 20:09:32 +02:00
TehRealSalt
4a33e1707e Add a few more splitscreen checks here 2018-10-03 13:43:36 -04:00
Sryder
6d54202674 Merge branch 'waypastpoint' into 'master'
Ghetto waypoint improvements

See merge request KartKrew/Kart!21
2018-10-02 18:20:17 -04:00
TehRealSalt
bf6c2ccce3 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
3e0124c3f4 Revert "Just realised the inputwheel jittering in Sryder's videos was my fault, so fix this even better"
This reverts commit 6835b17f69.
2018-10-02 16:52:02 +01:00
toaster
98768ac236 Fix incorrect alignment of selected-level Ruby in vote drawer. 2018-10-02 16:51:17 +01:00
TehRealSalt
52b644bab3 Splitscreen spectator info 2018-10-02 02:23:13 -04:00
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
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
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
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
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