Commit graph

926 commits

Author SHA1 Message Date
wolfs
97aeb13db3 Merge branch 'fix-offroad' into 'next'
Fix drift sparks not generating on offroad with Hyudoro, Invincibility, or sneaker boosts

See merge request KartKrew/Kart-Public!62
2019-02-16 07:02:13 -05:00
wolfy852
fc6086cfd8 Merge branch 'master' into next 2019-02-16 06:00:31 -06:00
wolfy852
07e56e550e New visuals for ping and fps display alike [REDO] 2019-02-15 21:08:08 -06:00
Steel Titanium
de9e25d5b3
Add missing ifdefs 2019-02-14 20:59:07 -05:00
wolfy852
3a3dd42b89 Add pogospring to itemenabled 2019-02-13 05:37:13 -06:00
wolfy852
1ba39672d4 Fix drift sparks not generating on offroad with Hyudoro, Invincibility, or sneaker boosts 2019-02-10 22:55:27 -06:00
toaster
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
Sally Cochenour
1c3fe3ce83 Kill me 2019-02-06 01:31:42 -05:00
Alam Arias
cc363086f9 fixup EOL in kart files 2019-02-05 15:36:30 -05:00
Sal
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
Sally Cochenour
fd529f9363 fickle suggestions 2019-02-03 23:23:41 -05:00
toaster
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
toaster
503e4f977f Show WANTED and minimap in battle splits even when p1 is nuked. 2019-02-03 23:37:19 +00:00
toaster
068ee93422 gotta break a few eggboxes to fix a crash 2019-02-03 23:09:09 +00:00
Sally Cochenour
98af218d2c Merge branch 'next' into ingame-player-cap 2019-02-03 17:23:50 -05:00
Sally Cochenour
a6ac6ecdc5 Missed this 2019-02-03 17:15:33 -05:00
Sally Cochenour
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
toaster
06b3e265f5 Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart-Public.git into next 2019-02-02 21:12:49 +00:00
Sally Cochenour
d9f16d2aaf Offroad code cleanup 2019-02-02 01:43:32 -05:00
Sally Cochenour
6a14d79cf0 Offroad spark fix & sink 2019-02-02 00:58:51 -05:00
Sally Cochenour
34b027e8ba Shift around flashing bump stuff 2019-01-30 15:57:46 -05:00
Sally Cochenour
9984f0e217 Reorganize these checks 2019-01-30 15:43:45 -05:00
Sally Cochenour
f3644505be Increase target cone for Race 2019-01-30 15:41:15 -05:00
Sally Cochenour
3cb468aec8 Add delay to Jawz target switching, set Jawz target when fired 2019-01-30 15:39:29 -05:00
Sally Cochenour
a3cd131017 Don't bump while flashing 2019-01-30 15:02:24 -05:00
Sally Cochenour
a81546177d Speed updates based on number of orbiting items 2019-01-30 14:24:04 -05:00
Sally Cochenour
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
Latapostrophe
4c19c36fbb Small optimization + item throwing + battle stuff 2019-01-30 15:25:41 +01:00
Sally Cochenour
c1fde7bfb7 Thin the rest of this screen's stuff too 2019-01-30 01:21:20 -05:00
Sal
51fa9b7359 Merge branch 'item-experiment' into 'next'
Item experiment

See merge request KartKrew/Kart-Public!39
2019-01-30 01:19:16 -05:00
Sally Cochenour
70a70b8a97 Merge branch 'master' into offroad-stuff 2019-01-29 20:22:15 -05:00
Latapostrophe
4261e0b61a Start of a fix for antigrav 2019-01-30 00:30:48 +01:00
Sally Cochenour
9e8b038719 Merge branch 'master' into item-experiment 2019-01-29 15:07:04 -05:00
Sally Cochenour
fc512318bd Merge branch 'next' into item-experiment 2019-01-29 15:06:58 -05:00
Sally Cochenour
80d1c303e3 Reduce frequency of Eggman items, give some of those points to Orbinaut or Banana 2019-01-28 12:47:23 -05:00
Sally Cochenour
38ca2ab98a Sparks can't be started in offroad 2019-01-27 23:25:03 -05:00
Sally Cochenour
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
Sally Cochenour
5518a19945 Wipeout slowdown in offroad is static 2019-01-27 22:28:44 -05:00
Sally Cochenour
c53144ecd6 Wipeout slowdown is x2 strength 2019-01-27 21:58:44 -05:00
Sally Cochenour
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
Sally Cochenour
dd2b895e80 Remove offroad leniency bias
Everyone now has flat, equal 1-second leniency
2019-01-27 21:57:18 -05:00
Sally Cochenour
e9887b2675 Apply to TAB rankings too 2019-01-27 21:11:49 -05:00
Sally Cochenour
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
Sally Cochenour
e0f7ab6ad4 Merge branch 'master' into item-experiment 2019-01-27 15:14:56 -05:00
Sal
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
wolfy852
4f38982968 Use SHORT on just the vars 2019-01-18 16:17:54 -06:00
wolfy852
de316f1ee1 Fix SHORT being used as a cast instead of a macro 2019-01-18 15:38:06 -06:00
TehRealSalt
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
wolfy852
31c911e88f Fix position numbers being off in 1P 2019-01-16 19:53:09 -06:00
TehRealSalt
146f2a1c0a Don't show COOL for spectators 2019-01-16 01:55:07 -05:00
TehRealSalt
5e1aa0302f SHOULD be == 1, not < 2!!!! 2019-01-16 01:13:01 -05:00
fickleheart
0121d47049 Merge remote-tracking branch 'internal/master' into new-turnhax-and-latency-stuff 2019-01-15 19:55:42 -06:00
Sal
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
TehRealSalt
5cd8691a71 Don't draw multiple WANTED posters in splitscreen 2019-01-15 03:41:33 -05:00
Latapostrophe
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
Latapostrophe
8bbb63f52a Forgot to trim whitespace 2019-01-12 12:28:15 +01:00
Latapostrophe
23f99bd28d Fixed WANTED poster drawing over minimap, WANTED cursor being colormapped, and splitscreen position shifting stuff 2019-01-12 12:27:30 +01:00
TehRealSalt
2416d78224 Update comment to be more accurate 2019-01-12 05:12:20 -05:00
TehRealSalt
5ed4d0256e spacing & () 2019-01-12 05:03:05 -05:00
TehRealSalt
0ef5c2e388 Some house-cleaning 2019-01-12 05:01:36 -05:00
TehRealSalt
650522fc59 Don't increment ingame count without bumpers 2019-01-12 04:43:43 -05:00
TehRealSalt
24a32c2f51 Allow player-count modifiers in Battle 2019-01-12 04:31:35 -05:00
TehRealSalt
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
TehRealSalt
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
TehRealSalt
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
TehRealSalt
72bc1b48f6 Merge branch 'next' into music-credits 2019-01-09 03:08:20 -05:00
Sal
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
fickleheart
01d7dc35ff Merge remote-tracking branch 'internal/master' into new-turnhax-and-latency-stuff 2019-01-08 20:56:14 -06:00
fickleheart
1bacc4e395 Make starting boost timing compensate for latency 2019-01-08 20:27:54 -06:00
Sal
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
TehRealSalt
b713903208 Merge remote-tracking branch 'master' into next 2019-01-08 16:29:14 -05:00
SeventhSentinel
eebdda0833 Minimum speed to get drift sparks 2019-01-06 17:17:52 -05:00
SeventhSentinel
a10ac14462 turn these signed before abs-ing em 2019-01-05 00:42:36 -05:00
fickleheart
12b0e7d5da Send latency in players' ticcmds 2019-01-04 23:09:26 -06:00
SeventhSentinel
5d51754936 In-game music credits 2019-01-04 04:44:55 -05:00
Sal
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
Latapostrophe
9a030bfd40 More cleanups and WANTED stuff 2019-01-02 20:36:13 +01:00
SeventhSentinel
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
Latapostrophe
629067c5eb Cleaner code because I was a huge idiot 2018-12-29 21:46:40 +01:00
Latapostrophe
50808cc48c Alignment mistakes for nongreen 2018-12-29 11:17:51 +01:00
Latapostrophe
0114c2bc22 Clean up splitscreen huds to allow minimap 2018-12-29 10:59:34 +01:00
fickleheart
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
SeventhSentinel
7e936d18d2 Merge branch 'master' into mobj-scale-global 2018-12-27 13:58:42 -05:00
SeventhSentinel
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
SeventhSentinel
6d19be6412 Make SPB follow the same rules too 2018-12-13 09:34:27 -05:00
SeventhSentinel
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
SeventhSentinel
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
TehRealSalt
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
TehRealSalt
9bafdaf492 > 2
Same here
2018-12-05 22:54:06 -05:00
TehRealSalt
0bd0240464 < -2
I doubt this hurts anything, but might as well I guess
2018-12-05 22:53:34 -05:00
TehRealSalt
c2dfc1155f Set Shrink timer, don't add to it 2018-12-05 22:51:08 -05:00
Sal
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
TehRealSalt
97f2f858ad Give lap animation V_SNAPTOTOP as intended 2018-12-05 21:39:34 -05:00
TehRealSalt
b3b5b3f81d Beyond a certain threshold, forcefully give 2nd a SPB if one's not already out. 2018-12-05 19:09:05 -05:00
TehRealSalt
0a00a0cebb Revert "Add player taunt functions to Lua"
This reverts commit 09e9e2ba4d.
2018-12-04 11:39:45 -05:00
TehRealSalt
09e9e2ba4d Add player taunt functions to Lua
People have REALLY wanted these for their scripts
2018-12-03 20:28:07 -05:00
TehRealSalt
d9fa45d850 Back to numstarposts/2 2018-12-02 02:29:47 -05:00
Latapostrophe
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
Latapostrophe
5660e3fccd Fixed conflict, swapped trapitem and inflictor, and moved the (void)inflictor;s 2018-11-28 19:41:01 +01:00
TehRealSalt
7b475d0f91 Fix exit music occasionally being wrong on race exit, add K_KartUpdatePosition to Lua 2018-11-28 00:45:33 -05:00