Commit graph

738 commits

Author SHA1 Message Date
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
toaster
1c01e1af14 Merge branch 'master' into 'chars_cleanup'
# Conflicts:
#   src/hu_stuff.c
2018-10-29 06:48:18 -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
TehRealSalt
193941945e The motherload: all of my Lua is hardcoded
This took like 6 straight hours of work, never ask me for anything ever again
2018-10-29 05:00:08 -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
toaster
3c04b2103b Stupidbad-big commit, but PLEASE don't ask me to re-do this on another branch, I swear to god. I know it makes things more difficult on you, and I'm sorry for that, but I'm definitely feeling the goddamn crunch right now and I wanna take a step back from this spaghetti nightmare and clear my head.
* Do that thing where the character icons are ALWAYS 1x sized, through having two seperate lumps.
* Revamp the S_SKIN parameters to be `facerank` (rankings - equivalent of half-scale old face), `facewant` (WANTED - equivalent of old face), and `facemmap` (equivalent of old iconprefix).
* Do that thing Oni wanted where it shows two postions above and two positions below your current ranking (and you) to the left of the screen, instead of always the top 4, with some limits to avoid drawing outside of everything.
* Replace the last few shitty Mario numbers (for the left rankings) with cool, new Oni numbers.
* Change a bunch of offsets and things so the tab rankings and the intermission work nicer with 9+ players.
2018-10-28 16:27:55 +00:00
TehRealSalt
6c5e7678d1 Use V_ORANGEMAP for blinking WANTED text in Battle splitscreen 2018-10-28 01:50:27 -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
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
bb7ef3798c Combine spinout & wipeout timers
Turns out they were only 1 tic apart originally, sooo
2018-10-26 01:07:54 -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
Sal
f5a9ae016a Merge branch 'karma-touchups' into 'master'
Karma touchups

See merge request KartKrew/Kart!59
2018-10-25 14:06:22 -04: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
TehRealSalt
b6f10baa00 Merge branch 'master' into fz-time-over 2018-10-24 21:20:51 -04:00
Sal
3c1325cedf Merge branch 'explosion-spinout-fix' into 'master'
Explosion spinout fix

See merge request KartKrew/Kart!60
2018-10-24 20:18:34 -04:00
Sal
a2fab299c1 Merge branch 'last-netgame-tweaks' into 'master'
Last netgame tweaks

See merge request KartKrew/Kart!57
2018-10-24 19:33:47 -04:00
TehRealSalt
51c94171bb Remove these 2018-10-24 18:14:25 -04:00
TehRealSalt
d91f6b09f8 Karma point changes
- Number of points needed to come back is now 2.
- Bombs no longer give extra points.
2018-10-24 17:29:13 -04:00
Sal
ec80cfc3d2 Merge branch 'new-spb' into 'master'
New SPB

See merge request KartKrew/Kart!56
2018-10-24 16:04:29 -04:00
Sal
5a6524fc93 Merge branch 'some_scaling_stuff' into 'master'
Two scale things I noticed.

See merge request KartKrew/Kart!51
2018-10-24 16:01:39 -04:00
TehRealSalt
5e41e6fb5b Partially revert Jawz x2 changes
Several races in a row with several people getting x2 Jawz in the same spot... sorry Oni, it's BAD. Kept the increase in the further behind spot, we'll see if it's any better
2018-10-23 21:13:14 -04:00
TehRealSalt
e11fe766ef fzboom.wad hardcode 2018-10-23 17:48:09 -04:00
TehRealSalt
988c0d07e3 Spread out SPB odds 2018-10-22 22:29:30 -04:00
TehRealSalt
a922a9b805 New item odds to accomedate new SPB behavior 2018-10-22 21:09:37 -04:00
TehRealSalt
14522752fe Minor mistakes on my part 2018-10-22 17:24:58 -04:00
TehRealSalt
1171e5b3e0 Don't destroy all of your balloons in 3 tics 2018-10-22 17:05:44 -04:00
TehRealSalt
e3d40a3878 Modify distx/disty to ensure it never goes too low 2018-10-22 16:08:46 -04:00
TehRealSalt
71452edda2 Merge branch 'master' into new-spb 2018-10-19 17:45:06 -04:00
toaster
df4e12ac15 No more whack-a-mole (not 100% certain all of these are correct, please check the diff closely before reinstating plusone sal) 2018-10-19 21:53:02 +01:00
toaster
285ae41a6e Two scale things I noticed.
* Change spacing of bustable FOF debris with scale (plus increase its default a bit for less lag).
* Make a few instances of scalespeed take mapheader scaling into account.
2018-10-19 21:32:29 +01:00
TehRealSalt
d93f09ccf4 Merge branch 'master' into net-screen 2018-10-19 15:59:13 -04:00
Sal
d0042f481f Merge branch 'specs_of_dust' into 'master'
Specs of dust

See merge request KartKrew/Kart!50
2018-10-19 15:50:58 -04:00
Sal
faad66969a Merge branch 'thundertweak' into 'master'
Thundertweak

See merge request KartKrew/Kart!49
2018-10-19 15:50:47 -04:00
Sal
de1d9770b9 Merge branch 'no-spectate-griefing' into 'master'
Prevent spectate griefing

See merge request KartKrew/Kart!43
2018-10-19 15:50:18 -04:00
Sal
d64295a19f Merge branch 'sweet-new-kicks' into 'master'
Sweet new kicks

See merge request KartKrew/Kart!39
2018-10-19 15:49:51 -04:00
Sal
3e2f4f2404 Merge branch 'remove-prints' into 'master'
Remove most gameplay prints

See merge request KartKrew/Kart!42
2018-10-19 15:49:01 -04:00
TehRealSalt
f559487527 SPB knockback is more punishing
Hopefully to prevent instances like the Megablock video, where SPB double-dips just because the 1st one wasn't enough but another is overkill
2018-10-18 20:49:30 -04:00
TehRealSalt
a0c32e771c Huge restructuring & more fine-tuned speed, following, & turn behavior 2018-10-18 19:51:36 -04:00
toaster
62d16b877f A bunch of spectator-joining-round tweaks.
* Re-enable the flashing-set thing on attempting to join with the item key. I spoke to Sal privately about this - turns out some keys ALWAYS send key presses instead of only sending one, and shift - what I have item bound to - is one of the problematic ones.
* Make the no-joining-game-after-20-seconds thing happen 20 seconds after the TIMER has started, not the level (ie, take starttime into account)
2018-10-18 18:13:00 +01:00
toaster
6f7a0a5acf Fix indentation. 2018-10-18 16:18:54 +01:00
toaster
9b05eb0b98 Play the traditional thundershield manifestation sound when a thundershield is manifested, plus a minor eye towards forward compatibility in the condition for manifestation. 2018-10-18 16:15:59 +01:00
TehRealSalt
2ae44ab10e New SPB
May not make it to R1, but oh well
2018-10-18 04:43:50 -04:00
TehRealSalt
d953d0402b Quick fix for attack/protect being too big 2018-10-16 21:39:39 -04:00