Commit graph

3784 commits

Author SHA1 Message Date
TehRealSalt
0c0a53b2d6 Lap hands touch-up 2018-11-01 16:15:25 -04:00
TehRealSalt
04dc2978ab Added judging hands (if'd out) 2018-10-31 23:10:38 -04:00
TehRealSalt
94429a1cb6 Fix offsets, add colormapping 2018-10-31 22:38:43 -04:00
Sal
9db0c385f1 Merge branch 'toast_pokes' into 'master'
toast-pokes

See merge request KartKrew/Kart!65
2018-10-30 15:01:04 -04:00
toaster
081c9c36e5 Make dropped floatingitems not carry player momentum (sorry for leaving this so long, Oni!) 2018-10-29 14:43:21 +00:00
toaster
4766d3fbea Merge branch 'master' into 'toast_pokes'
# Conflicts:
#   src/hu_stuff.c
2018-10-29 07:04:35 -04:00
Sal
76778baa90 Merge branch 'grow-shrink-fixes' into 'master'
Invincibility item & Shrink fixes

See merge request KartKrew/Kart!68
2018-10-29 05:32:20 -04:00
Sal
916fb49be6 Merge branch 'splitscreen-tuneup' into 'master'
Splitscreen tuneup

See merge request KartKrew/Kart!67
2018-10-29 05:30:49 -04:00
Sal
02e74a3010 Merge branch 'div-sounds' into 'master'
Divide sound with number of local players

See merge request KartKrew/Kart!66
2018-10-29 05:26:51 -04:00
TehRealSalt
fc156e6fb5 Preface with splitscreen checks 2018-10-29 05:26:17 -04:00
Sal
79dd2236aa Merge branch 'spinout-speedup' into 'master'
Spinout speedup

See merge request KartKrew/Kart!63
2018-10-29 05:24:50 -04:00
TehRealSalt
c6d18edf7c Move lap animation up slightly
(I'm not gonna remember to do this later either)
2018-10-28 13:52:25 -04:00
TehRealSalt
6c5e7678d1 Use V_ORANGEMAP for blinking WANTED text in Battle splitscreen 2018-10-28 01:50:27 -04:00
TehRealSalt
ab518c611c Even better: base it off how much timer is left
So instead of prioritizing a specific track, the person who activated their powerup the latest gets their music. That should be a nicer solution for when multiple players are activating their powerups at the same time.
2018-10-28 01:38:01 -04:00
TehRealSalt
a8e549e0c5 More smoothly decide which invincibility music to use
Less P_RestoreMusic conflicts in splitscreen, just see the Toxic Palace video for an example :V
2018-10-28 01:22:26 -04:00
TehRealSalt
2f9fa0250d This didn't commit with for some reason... 2018-10-28 01:02:49 -04:00
TehRealSalt
88831ae79f Fix invincibility item cap
It was supposed to be capped at 2 invincibility items at a time, not 3. (may consider scaling with number of players, just not for R1)
2018-10-28 01:02:30 -04:00
TehRealSalt
c5cfc84a8c Fix up respawning so that it takes respawning with Shrink into account 2018-10-28 00:58:49 -04:00
TehRealSalt
0f69bb3865 No more rescaling gfx for countdown/finish 2018-10-27 23:14:11 -04:00
TehRealSalt
c0098eecbe Show LOSE/COOL in splitscreen again
Looked goofy offline, with 1 WIN and 3 LOSEs, but now that there's COOL and online splitscreen I thought it should come back
2018-10-27 22:43:57 -04:00
TehRealSalt
8d7d84e72a This bothers me, so I might as well do it while I'm in here. 2018-10-27 21:48:50 -04:00
TehRealSalt
7e15e8b55d "if !splitscreen" instances that SHOULD be "if netgame" 2018-10-27 21:45:04 -04:00
TehRealSalt
89cd20bd70 Higher default scale, WANTED indicator scales properly 2018-10-27 20:56:11 -04:00
TehRealSalt
02c425696f Reduce camspeed in splitscreen 2018-10-27 20:44:05 -04:00
toaster
18c649caca Fix and then subsequently disable the zoom tube angle setting stuff. 2018-10-27 22:05:15 +01:00
toaster
92b6f8bb50 Fix the issue with sliding I identified this morning.
Also, apply it to being in a zoom tube, too! For extra forwards compatibility with all the terrible SRB2 Riders ports that are almost an inevitability.
2018-10-27 21:41:45 +01:00
toaster
e92d03ee94 As requested by Jeck:
* gr_md2 on the menu.
* Disable interpolerated model option completely for now.

Also, tweaked the GL menus a bit to suck less, since I was ferreting around in that area.
2018-10-27 21:16:19 +01:00
toaster
558ca6cfec Make it so hitting enter on the ipv4 option doesn't close all menus with the warning, only if you start trying to connect. 2018-10-27 20:44:18 +01:00
toaster
88b13212d9 Minor things that annoyed me to NO GOOD END.
* Tweak the demo info layout (holding tab while demoplayback) to better match the Viewpoint text in MP.
* Make the tab rankings view support widescreen better, including the spectator ticker (but not the player name layout).
* Make the tab rankings view always have a darkened background, to get around the fact we can't darken it based on player state for battle.
* Remove FREE PLAY from tab rankings.
2018-10-27 20:43:33 +01:00
toaster
f35374defc Fade stuff!
* Make the white intro fade always drawn, rather than potentially disable-able through tab or HUD disable.
* Slightly increase the darkness of the intermission fade, since its current value had a negative effect on SKINCOLOR_SAPPHIRE.
2018-10-27 20:39:41 +01:00
TehRealSalt
32ada811b2 Merge branch 'master' into div-sounds 2018-10-26 01:15:10 -04:00
TehRealSalt
bb7ef3798c Combine spinout & wipeout timers
Turns out they were only 1 tic apart originally, sooo
2018-10-26 01:07:54 -04:00
TehRealSalt
46164a7f46 More consistent face-forward
Needs it to still land in a close ballpark, so the timer changes are still needed, but  this makes it less prone to error
2018-10-26 01:07:14 -04:00
TehRealSalt
2096b56da2 CRITICAL BUGFIX
Make sure flashing tics don't go down WHILE you're in a hit animation (wipeout, squished)
2018-10-26 00:56:02 -04:00
TehRealSalt
0492ddc3ad Adjust spinout times to face your forward about 90% of the time 2018-10-26 00:55:20 -04:00
TehRealSalt
bd79aaf847 Speed up spinout based on timer left 2018-10-26 00:51:58 -04:00
TehRealSalt
95875289b8 - Reduce volume reduction
- Don't apply to sounds without an origin mobj
2018-10-25 22:53:58 -04:00
Sal
f5a9ae016a Merge branch 'karma-touchups' into 'master'
Karma touchups

See merge request KartKrew/Kart!59
2018-10-25 14:06:22 -04:00
Sal
7f42cbc942 Merge branch 'chat-changes' into 'master'
New chat mode (Window Hidden) + Player join/leave/rename messages in chat + new console backcolours for console & chat

See merge request KartKrew/Kart!55
2018-10-25 14:06:11 -04:00
Latapostrophe
ef08560bf4 Reimplemented the splitscreen chat fix 2018-10-25 20:02:43 +02:00
Latapostrophe
bd1c7e2bc6 Fixed the menu highlight thing 2018-10-25 19:41:14 +02:00
Latapostrophe
35f576c166 Spectate / enter game in chat + New console colours + Highlight chat scroll arrow + small cleanup for consolefill 2018-10-25 13:21:44 +02:00
Latapostrophe
612ff4059c Merge branch 'master' into chat-changes 2018-10-25 11:14:49 +02:00
TehRealSalt
6f76b2b827 Fix merges
(Don't bother me hastily to merge something in again, please)
2018-10-24 21:51:43 -04:00
Sal
b122df3e27 Merge branch 'fz-time-over' into 'master'
F-Zero time over hardcode

See merge request KartKrew/Kart!62
2018-10-24 21:40:07 -04:00
TehRealSalt
a57c6af1f0 Merge branch 'master' into fz-time-over 2018-10-24 21:39:02 -04:00
Sal
862f2389dc Merge branch 'lat-hardcode' into 'master'
Midnight Channel + Mementos hardcode

See merge request KartKrew/Kart!61
2018-10-24 21:26:02 -04:00
TehRealSalt
268fa6337e Fullbright explosion and fire 2018-10-24 21:25:22 -04:00
TehRealSalt
b6f10baa00 Merge branch 'master' into fz-time-over 2018-10-24 21:20:51 -04:00
TehRealSalt
db6e1f9b94 Extra safety
The turn action happens on (k_timeovercam > 2*TICRATE). This ensures it happens immediately, although it was probably fine as is
2018-10-24 21:18:15 -04:00