1ba39672d4
Fix drift sparks not generating on offroad with Hyudoro, Invincibility, or sneaker boosts
2019-02-10 22:55:27 -06:00
6da810a994
Merge remote-tracking branch 'remotes/upstream/master' into new_netreplays
...
# Conflicts:
# src/g_game.c
# src/k_kart.c
2019-02-06 20:47:35 -06:00
970a8ee89d
Fix off-by-one errors in item odds, and add a little assert to make an assumption in this function that was being violated more explicit.
2019-02-06 13:28:21 +00:00
1c3fe3ce83
Kill me
2019-02-06 01:31:42 -05:00
cc363086f9
fixup EOL in kart files
2019-02-05 15:36:30 -05:00
b36f73ee46
Merge branch 'ingame-player-cap' into 'next'
...
"In-game player" cap
See merge request KartKrew/Kart-Public!48
2019-02-04 15:44:50 -05:00
fd529f9363
fickle suggestions
2019-02-03 23:23:41 -05:00
55bb82eae8
Change order of operations so that fullscreen stuff is done in front of minimap, to match other two/three players in 3/4p.
2019-02-03 23:50:02 +00:00
503e4f977f
Show WANTED and minimap in battle splits even when p1 is nuked.
2019-02-03 23:37:19 +00:00
068ee93422
gotta break a few eggboxes to fix a crash
2019-02-03 23:09:09 +00:00
98af218d2c
Merge branch 'next' into ingame-player-cap
2019-02-03 17:23:50 -05:00
a6ac6ecdc5
Missed this
2019-02-03 17:15:33 -05:00
59730c5db6
In-game player cap & spectator queue
...
Force everyone beyond a certain point to spectate -- spectators get to queue up. In response to me doing a 1v1 match, tons of people wanting to join to watch, and just relying on honor system to prevent mid-joiners. Spectators are prioritized by how long they've been waiting. I'm thinking of hijacking base SRB2's team scramble for a scramble option later.
2019-02-03 16:43:11 -05:00
06b3e265f5
Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart-Public.git into next
2019-02-02 21:12:49 +00:00
d9f16d2aaf
Offroad code cleanup
2019-02-02 01:43:32 -05:00
6a14d79cf0
Offroad spark fix & sink
2019-02-02 00:58:51 -05:00
28b9c5fc7d
Fix P3 getting the wrong split flags in 3p splitscreen
2019-02-01 20:20:14 -06:00
34b027e8ba
Shift around flashing bump stuff
2019-01-30 15:57:46 -05:00
9984f0e217
Reorganize these checks
2019-01-30 15:43:45 -05:00
f3644505be
Increase target cone for Race
2019-01-30 15:41:15 -05:00
3cb468aec8
Add delay to Jawz target switching, set Jawz target when fired
2019-01-30 15:39:29 -05:00
a3cd131017
Don't bump while flashing
2019-01-30 15:02:24 -05:00
a81546177d
Speed updates based on number of orbiting items
2019-01-30 14:24:04 -05:00
bc4832aa40
Slower orbit, always have 1 orbit item deploy behind you, and higher gravity for Orbinaut/Jawz
2019-01-30 14:14:24 -05:00
4c19c36fbb
Small optimization + item throwing + battle stuff
2019-01-30 15:25:41 +01:00
c1fde7bfb7
Thin the rest of this screen's stuff too
2019-01-30 01:21:20 -05:00
51fa9b7359
Merge branch 'item-experiment' into 'next'
...
Item experiment
See merge request KartKrew/Kart-Public!39
2019-01-30 01:19:16 -05:00
70a70b8a97
Merge branch 'master' into offroad-stuff
2019-01-29 20:22:15 -05:00
4261e0b61a
Start of a fix for antigrav
2019-01-30 00:30:48 +01:00
9e8b038719
Merge branch 'master' into item-experiment
2019-01-29 15:07:04 -05:00
fc512318bd
Merge branch 'next' into item-experiment
2019-01-29 15:06:58 -05:00
80d1c303e3
Reduce frequency of Eggman items, give some of those points to Orbinaut or Banana
2019-01-28 12:47:23 -05:00
38ca2ab98a
Sparks can't be started in offroad
2019-01-27 23:25:03 -05:00
0ef442c004
Change offroad leniency from 1 second to 0.5 seconds, don't make friction more forgiving in offroad
2019-01-27 23:18:40 -05:00
5518a19945
Wipeout slowdown in offroad is static
2019-01-27 22:28:44 -05:00
c53144ecd6
Wipeout slowdown is x2 strength
2019-01-27 21:58:44 -05:00
8a97b28936
Wipeout slowdown timer is set to 20 tics if below, instead of adding up per bump.
2019-01-27 21:58:17 -05:00
dd2b895e80
Remove offroad leniency bias
...
Everyone now has flat, equal 1-second leniency
2019-01-27 21:57:18 -05:00
e9887b2675
Apply to TAB rankings too
2019-01-27 21:11:49 -05:00
55c6ab2581
Scale number of allowed invuln items w/ player count
...
0-5 players: 1 invincibility/grow allowed out at once
6-9 players: 2 invincibilities (how it was before)
10-13 players: 3 invincibilities
14+ players: 4 invincibilites
2019-01-27 17:51:46 -05:00
e0f7ab6ad4
Merge branch 'master' into item-experiment
2019-01-27 15:14:56 -05:00
910df92d5a
Merge branch 'expose-more-lua-stuff' into 'next'
...
More Lua stuff + PlayerCmd hook
See merge request KartKrew/Kart-Public!28
2019-01-26 13:19:41 -05:00
4f38982968
Use SHORT on just the vars
2019-01-18 16:17:54 -06:00
de316f1ee1
Fix SHORT being used as a cast instead of a macro
2019-01-18 15:38:06 -06:00
4c8737da08
Final v1.0.2 commit (probably)
...
- Update chars.kart hash, AGAIN!
- Fix spectators being visible on minimap when F12ing people
- Optimize how splitscreen players are drawn on top of the minimap
- Remove duplicated cvar registrations
- Move cv_resynchattempts and cv_netticbuffer from D_ClientServerInit to D_RegisterServerCommands and D_RegisterClientCommands respectively, so they can save to config properly
- Increase "Frequent" gametype switch frequency even more
- "SRB2" version dehacked warning ignores srb2.srb
2019-01-18 04:30:38 -05:00
31c911e88f
Fix position numbers being off in 1P
2019-01-16 19:53:09 -06:00
146f2a1c0a
Don't show COOL for spectators
2019-01-16 01:55:07 -05:00
5e1aa0302f
SHOULD be == 1, not < 2!!!!
2019-01-16 01:13:01 -05:00
0121d47049
Merge remote-tracking branch 'internal/master' into new-turnhax-and-latency-stuff
2019-01-15 19:55:42 -06:00
f2b7d9f373
Merge branch 'unfuck-splitscreen-hud' into 'next'
...
Cleaner splitscreen hud
See merge request KartKrew/Kart-Public!6
2019-01-15 03:47:29 -05:00
5cd8691a71
Don't draw multiple WANTED posters in splitscreen
2019-01-15 03:41:33 -05:00
c2aa6d4de6
Expose some more Kart functions, freeplay and rankings bumpers are now hud stuff you can toggle, + experimental playercmd hook
2019-01-13 14:40:48 +01:00
8bbb63f52a
Forgot to trim whitespace
2019-01-12 12:28:15 +01:00
23f99bd28d
Fixed WANTED poster drawing over minimap, WANTED cursor being colormapped, and splitscreen position shifting stuff
2019-01-12 12:27:30 +01:00
2416d78224
Update comment to be more accurate
2019-01-12 05:12:20 -05:00
5ed4d0256e
spacing & ()
2019-01-12 05:03:05 -05:00
0ef5c2e388
Some house-cleaning
2019-01-12 05:01:36 -05:00
650522fc59
Don't increment ingame count without bumpers
2019-01-12 04:43:43 -05:00
24a32c2f51
Allow player-count modifiers in Battle
2019-01-12 04:31:35 -05:00
922f80b22f
Uncap player-count item distribution modifiers
...
Was an idea I had in development to make 16P less chaotic, but decided against it due to lack of testing and that it could backfire badly...
2019-01-12 04:30:41 -05:00
37e79ebfbd
Redone credits for joiners in a less stupid way, + redone start ambience in a less stupid way
2019-01-10 01:03:53 -05:00
de72403fb9
Add MUSICDEF lump for defining custom songs & replacing existing songs
...
Very rudimentary at the moment, but it's workable
2019-01-09 21:00:45 -05:00
72bc1b48f6
Merge branch 'next' into music-credits
2019-01-09 03:08:20 -05:00
2f30625c82
Merge branch 'drift-spark-adjustment' into 'next'
...
Minimum speed to get drift sparks
See merge request KartKrew/Kart-Public!20
2019-01-09 01:18:30 -05:00
01d7dc35ff
Merge remote-tracking branch 'internal/master' into new-turnhax-and-latency-stuff
2019-01-08 20:56:14 -06:00
1bacc4e395
Make starting boost timing compensate for latency
2019-01-08 20:27:54 -06:00
78ac038864
Merge branch 'mobjscale-global' into 'next'
...
Add a global for mobjscale
See merge request KartKrew/Kart-Public!10
2019-01-08 17:00:34 -05:00
b713903208
Merge remote-tracking branch 'master' into next
2019-01-08 16:29:14 -05:00
eebdda0833
Minimum speed to get drift sparks
2019-01-06 17:17:52 -05:00
a10ac14462
turn these signed before abs-ing em
2019-01-05 00:42:36 -05:00
12b0e7d5da
Send latency in players' ticcmds
2019-01-04 23:09:26 -06:00
5d51754936
In-game music credits
2019-01-04 04:44:55 -05:00
220ef1a490
Merge branch 'waypoint-lap-option' into 'next'
...
Add waypoint lap field via Parameter field
See merge request KartKrew/Kart-Public!4
2019-01-03 00:58:09 -05:00
9a030bfd40
More cleanups and WANTED stuff
2019-01-02 20:36:13 +01:00
1987dec652
This would probably be fine, but lets make it consistent like every other instance of this.
2018-12-31 17:59:42 -05:00
629067c5eb
Cleaner code because I was a huge idiot
2018-12-29 21:46:40 +01:00
50808cc48c
Alignment mistakes for nongreen
2018-12-29 11:17:51 +01:00
0114c2bc22
Clean up splitscreen huds to allow minimap
2018-12-29 10:59:34 +01:00
90e553d81a
Use waypoint extrainfo to determine lap it works on
...
This can be useful to improve waypoint tracking on sprint maps.
2018-12-27 17:11:16 -06:00
7e936d18d2
Merge branch 'master' into mobj-scale-global
2018-12-27 13:58:42 -05:00
2cb2b02b73
Fix Ballhog under the last commit...
...
It actually uses trailing item's throw speeds instead of its own, oddly enough; I don't want to mess with the gameplay there, so I just gave it its own exception.
2018-12-13 09:47:14 -05:00
6d19be6412
Make SPB follow the same rules too
2018-12-13 09:34:27 -05:00
2422501ab9
Add a mapobjectscale global
...
Should be no different than it was before, now it's just less tedious to type :V
2018-12-12 21:55:59 -05:00
bbf8222767
Stupid Orbinaut bullshit
...
- Fix Orbinaut/Jawz not accepting top speed changes (This means back-spam being slower now for real works, and the speed buff on boosters for real works.)
- Make the top-speed buffs for boosters not work for back-spam
2018-12-12 21:25:18 -05:00
c599d84d6e
Actually, best of both:
...
Let Grow/Shrink revert itself when it changes to 0, as well as add a function for removing either. Means we don't have to modify every single > 0/< 0 check, and is overall cleaner.
2018-12-05 23:28:44 -05:00
9bafdaf492
> 2
...
Same here
2018-12-05 22:54:06 -05:00
0bd0240464
< -2
...
I doubt this hurts anything, but might as well I guess
2018-12-05 22:53:34 -05:00
c2dfc1155f
Set Shrink timer, don't add to it
2018-12-05 22:51:08 -05:00
261319b754
Merge branch 'force-spb' into 'master'
...
Beyond a certain threshold, forcefully give 2nd a SPB if one's not already out.
See merge request KartKrew/Kart!119
2018-12-05 21:43:59 -05:00
97f2f858ad
Give lap animation V_SNAPTOTOP as intended
2018-12-05 21:39:34 -05:00
b3b5b3f81d
Beyond a certain threshold, forcefully give 2nd a SPB if one's not already out.
2018-12-05 19:09:05 -05:00
0a00a0cebb
Revert "Add player taunt functions to Lua"
...
This reverts commit 09e9e2ba4d
2018-12-04 11:39:45 -05:00
09e9e2ba4d
Add player taunt functions to Lua
...
People have REALLY wanted these for their scripts
2018-12-03 20:28:07 -05:00
d9fa45d850
Back to numstarposts/2
2018-12-02 02:29:47 -05:00
54a7e65ff6
Moved (void)inflictor;s below and put scoremultiply at the top of all the damage funcs
2018-11-28 19:50:30 +01:00
5660e3fccd
Fixed conflict, swapped trapitem and inflictor, and moved the (void)inflictor;s
2018-11-28 19:41:01 +01:00
7b475d0f91
Fix exit music occasionally being wrong on race exit, add K_KartUpdatePosition to Lua
2018-11-28 00:45:33 -05:00
e2a9aeb34c
Require 3/5ths of checkpoints instead of 1/2
...
This broke MKSC in a minor way if you skip a specific item set and then take the big cut... I'll let it go anyway since its an improvement everywhere else.
2018-11-27 14:28:11 -05:00
ed4477705d
Separated the damage hooks into multiple more precise hooks for players.
2018-11-27 18:27:43 +01:00
92225748e5
Fix order so the new sound can actually play
2018-11-26 23:34:43 -05:00
ec279da272
classic lat forgot whitespaces meme
2018-11-26 21:24:57 +01:00
0175e5b6a5
Possible fix for lack of mobjdamage and shoulddamage lua functionalities on players.
2018-11-26 21:23:41 +01:00
732e0447a5
Merge branch 'master' into 102-gameplay
2018-11-26 10:14:41 -05:00
fcba636616
Merge branch 'deadtweaks' into 'master'
...
Update HUD anim counters when dead.
Closes #49
See merge request KartKrew/Kart!106
2018-11-26 08:03:17 -05:00
62b9754407
This sound doesn't exist yet, but I'm defining it anyway
2018-11-26 03:19:31 -05:00
b5bf8e09c3
Karma fireworks
...
Additionally:
- FZ boom no longer has that weird smoke bit before it spawns the smoke column
- Item blinking color is brighter
2018-11-26 02:17:14 -05:00
0f1206af6f
Shrink no longer causes old-style wipeout, getting squished reduces the timer on it.
...
Maybe this might help some of the desyncing, too! Mainly done for gameplay reasons, though :p
2018-11-25 20:14:01 -05:00
3c480277aa
Update HUD anim counters when dead.
...
* Split out the HUD-related counters from K_KartPlayerThink() into their own function.
* Called this function in P_DeathThink().
2018-11-25 13:48:46 +00:00
e5fef95d94
Sound volume distance indication now scales with mapheader scale.
2018-11-25 13:30:43 +00:00
d467399480
Keep track of the place SPB is following
...
This makes it so that if the SPB'd person is passed, then the person who's getting SPB'd won't get the increased item odds for the weird feedback loop.
2018-11-24 20:41:17 -05:00
fccdfc1bfd
Weaken slightly
2018-11-24 19:49:18 -05:00
a1f2b8f3f0
Merge branch 'master' into 102-gameplay
2018-11-24 17:44:20 -05:00
31aa96ecdc
Wrong var here
2018-11-24 17:27:48 -05:00
4fdaf448f2
Change how SPB rush works
...
Instead of enabling Frantic for the person in 2nd, it doubles the gap between them. Now it's 2nd's job to catch up and ruin 1st's day.
2018-11-24 02:56:39 -05:00
e265d910d3
Item roulette fun-times
...
- Colorize items, Combi-Catcher style, while the roulette is still going. Nice Chaotix reference, and tells you when the game's just lagged.
- Items blink when you first get them! They blink white when you wait out the whole roulette, red when you mash, or rainbow for enhanced items! Blinking prevents items from being stolen too, so items can't be literally stolen before you even have a chance to see what it was.
- New item roulette sound for mashing
- Fix TC_ limits in Lua
2018-11-23 19:15:14 -05:00
9e09dd7563
Don't show "Attack or Protect" for spectators
2018-11-23 16:00:21 -05:00
9c444b64a9
Fix divide by 0 bug
2018-11-23 15:45:46 -05:00
3f35ffd7c6
Franticized items for 2nd place VS SPB'd 1st
2018-11-22 23:38:54 -05:00
a30563da22
Buff indirect item cooldown to 30 sec, make sure the cooldown is set immediately
2018-11-21 19:30:00 -05:00
e07e89055d
Remove drift & pogo spring on hit and a few other places
2018-11-21 19:00:14 -05:00
b03d87c80a
Be more consistent with how we lock kartspeed/kartweight
...
- The skin values are now locked between 1 and 9.
- kartspeed & kartweight are no longer locked on skin-switch. Combined with the above, this results in no gameplay change, other than the character select showing the proper value.
- Values used for the engine sounds are locked. No longer can overflow into character voices or freeslotted sounds.
- Removed the overzealous weight locking when in offroad.
If we want to ACTUALLY lock speed/weight for Lua too then we should do that in the Lua stuff.
2018-11-20 02:59:10 -05:00
9b7eea408d
Change "player" to "user" to make it easier to read
2018-11-19 23:13:09 -05:00
0a3183aa82
Don't shrink spectators
...
Another typo here
2018-11-19 23:07:53 -05:00
c6053c8265
Don't do wipeout dust for spectators
2018-11-19 23:06:31 -05:00
555deddb6a
Offroad effect fixes
...
- Make dust retain some of your speed so it's more visible
- Only play effect when moving and on the ground
2018-11-19 22:45:12 -05:00
20ac8ed126
Mistake
2018-11-18 23:31:36 -05:00
b58cbd2c08
Move Shrink out of P_DamageMobj
2018-11-18 17:51:49 -05:00
a3211df748
Apply banana drag effect to offroad
2018-11-18 17:01:43 -05:00
b47d10645a
Merge branch 'show16playersinrankings' into 'master'
...
Fix the player in 16th not being visible in rankings
See merge request KartKrew/Kart!103
2018-11-18 16:02:32 -05:00
a6d48f0ef4
Fix the player in 16th not being visible in rankings
2018-11-18 20:05:17 +00:00
4ee48194c4
Fix the Memory Leak
...
The Kart Minimap heads I believe should use GTC_CACHE as they're shown in level, only(?) Not using it causes the memory to keep creeping up as more colourmaps are loaded but not freed, while OpenGL by extention endlessly keeps making new textures for the "new" colourmaps.
2018-11-18 14:43:31 +00:00
e4cb1bc430
Merge branch 'shrinkegg_fix' into 'master'
...
Fix Eggman shrink bug
Closes #38
See merge request KartKrew/Kart!89
2018-11-17 16:24:40 -05:00
176dc6e5ca
Fix the first digit of all exiting players in positions 10 or worse flashing the first-place rainbow.
2018-11-17 18:02:04 +00:00
8735dcd24b
Fix Eggman shrink bug.
...
Specifically: removed K_StripOther calls from touching fakes: No, none of these things need to be stripped! Also, poke K_StripOther just in case it eventually becomes relevant to have it.
2018-11-17 14:41:08 +00:00
5d6e15f8af
More cinematic title demos (hide most HUD elements, show a title logo in the bottom right hand corner).
2018-11-15 14:30:11 +00:00
514cd0794b
This effect assumed that it was spawned at base scale anyway...
2018-11-14 14:48:16 -05:00
f859139353
Final title screen
2018-11-14 00:30:51 -05:00
b009bddd3b
Lowered volume of drift sparks, made local
2018-11-12 17:18:39 -05:00
d0f21ca415
Merge branch 'sfx-clean'
2018-11-12 04:26:02 -05:00
93ab9850a3
Clean-up of unused/removed sfx, replacement of the last remaining Mario sfx, and new sfx in some spots
...
- Replaced eggitem landing sfx
- Replaced banana landing sfx
- Replaced item tossing sfx
- Replaced item clashing sfx
- Added sfx for drift spark tier changing
- Added sfx for brake drifting
- Reverted Mario Mode sound replacement back to vanilla
2018-11-11 17:30:30 -05:00
a0badacd22
* Fix spectators having the "YOU ARE THIS PERSON" highlight on the minirankings be done on the person in first.
...
* Apply the "YOU ARE THIS PERSON" highlight to all non-splitscreen circumstances that use the tiny player icons. (New locations: Tab rankings, intermission, completed votes.)
2018-11-10 12:31:41 +00:00
fa989f2f7f
Shorter Karma sticker
2018-11-10 01:03:34 -05:00
571ef7173e
Ranking face highlights
2018-11-10 00:01:44 -05:00
60dcd3470b
Separate grow & invincibility alarms, donated by VAda
2018-11-09 21:47:36 -05:00
ad625296c2
Buff the fuck out of item drop speed
...
no, dude, don't turn right back around and pick your shit right back up, stop
2018-11-09 15:37:33 -05:00
b0246d6cba
Prevent using kartdebug cvars in Time Attack.
...
(None of this should invalidate any of YOUR existing ghosts, because none of them use these obvious cheats like, say, setting kartdebugitem 2.)
2018-11-09 20:16:12 +00:00
3ad8d1c4ce
Lap emblem gets replaced with a stopwatch in Record Attack
2018-11-08 19:36:05 -05:00
ed1c108992
Merge branch 'master' into lua-improvement
2018-11-08 14:50:30 -05:00
94066638bc
Merge branch 'master' into lua-improvement
2018-11-08 14:49:56 -05:00
69287984db
Merge branch 'master' into staff_names
2018-11-08 14:47:38 -05:00
wolfy852