Commit graph

933 commits

Author SHA1 Message Date
James
d272342db7 Shrink timer is consistent 20sec 2019-02-18 00:17:58 -05:00
fickleheart
60b952ea2a Add some P_MobjWasRemoved checks around code that shrink touches
It's the only place in the vanilla game where K_DropItems
is called that isn't from a direct collision with the player
it's being called on. It's also a syncfail that doesn't happen
anywhere else, and I saw my sync state appear to get slightly
corrupted when it happened. Let's see if this fixes anything...
2019-02-17 22:09:37 -06:00
wolfy852
096cd50bae Merge branch 'upsidedown-brain' into next
# Conflicts:
#	src/k_kart.c
#	src/k_kart.h
2019-02-17 20:45:12 -06:00
fickleheart
4df98e6e1f Simulate fractional precision on item odds
This notably prevents some items from disappearing
completely above 8 players in netgames.
2019-02-16 10:33:18 -06:00
wolfs
a1aff2ec9f Merge branch 'fix-battle-boost' into 'next'
Set flashing tics to 0 after boosting

See merge request KartKrew/Kart-Public!67
2019-02-16 08:31:08 -05:00
wolfy852
f8da7f3d8b Don't kill flashing tics for floor boosts 2019-02-16 07:03:56 -06:00
wolfy852
b8dc9127d5 Set flashing tics to 0 after boosting 2019-02-16 06:37:09 -06:00
wolfs
3fdbf2f476 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
eb55cddd35 Merge branch 'master' into next 2019-02-16 06:00:31 -06:00
wolfy852
db280e64a1 New visuals for ping and fps display alike [REDO] 2019-02-15 21:08:08 -06:00
Steel Titanium
dc433dee62 Add missing ifdefs 2019-02-14 20:59:07 -05:00
wolfy852
622402617d Add pogospring to itemenabled 2019-02-13 05:37:13 -06:00
wolfy852
87d749b43d Fix drift sparks not generating on offroad with Hyudoro, Invincibility, or sneaker boosts 2019-02-10 22:55:27 -06:00
toaster
cd53f3da1f 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
b5f582ed5a Kill me 2019-02-06 01:31:42 -05:00
Alam Arias
57ee9b4177 fixup EOL in kart files 2019-02-05 15:36:30 -05:00
Sal
dfe3034560 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
dad3677b9e fickle suggestions 2019-02-03 23:23:41 -05:00
toaster
e36328b631 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
fb35fcb831 Show WANTED and minimap in battle splits even when p1 is nuked. 2019-02-03 23:37:19 +00:00
toaster
0d81fb1141 gotta break a few eggboxes to fix a crash 2019-02-03 23:09:09 +00:00
Sally Cochenour
3d64a98684 Merge branch 'next' into ingame-player-cap 2019-02-03 17:23:50 -05:00
Sally Cochenour
f9a535b9b7 Missed this 2019-02-03 17:15:33 -05:00
Sally Cochenour
2c8c994324 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
d3f739f64a Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart-Public.git into next 2019-02-02 21:12:49 +00:00
Sally Cochenour
4679e48a3d Offroad code cleanup 2019-02-02 01:43:32 -05:00
Sally Cochenour
838c2aa68d Offroad spark fix & sink 2019-02-02 00:58:51 -05:00
Sally Cochenour
8409a0f42c Shift around flashing bump stuff 2019-01-30 15:57:46 -05:00
Sally Cochenour
f7516f0f00 Reorganize these checks 2019-01-30 15:43:45 -05:00
Sally Cochenour
7ff0245882 Increase target cone for Race 2019-01-30 15:41:15 -05:00
Sally Cochenour
50b23b7512 Add delay to Jawz target switching, set Jawz target when fired 2019-01-30 15:39:29 -05:00
Sally Cochenour
33ac694729 Don't bump while flashing 2019-01-30 15:02:24 -05:00
Sally Cochenour
29cb923c36 Speed updates based on number of orbiting items 2019-01-30 14:24:04 -05:00
Sally Cochenour
9870378c37 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
e5033da2a3 Small optimization + item throwing + battle stuff 2019-01-30 15:25:41 +01:00
Sally Cochenour
e2117f29e2 Thin the rest of this screen's stuff too 2019-01-30 01:21:20 -05:00
Sal
ec1cb23d5c 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
33cef80987 Merge branch 'master' into offroad-stuff 2019-01-29 20:22:15 -05:00
Latapostrophe
4a35b95fbf Start of a fix for antigrav 2019-01-30 00:30:48 +01:00
Sally Cochenour
4ea11d339f Merge branch 'master' into item-experiment 2019-01-29 15:07:04 -05:00
Sally Cochenour
c3d2b63467 Merge branch 'next' into item-experiment 2019-01-29 15:06:58 -05:00
Sally Cochenour
bbde175224 Reduce frequency of Eggman items, give some of those points to Orbinaut or Banana 2019-01-28 12:47:23 -05:00
Sally Cochenour
090ba300df Sparks can't be started in offroad 2019-01-27 23:25:03 -05:00
Sally Cochenour
753083a457 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
f12972c377 Wipeout slowdown in offroad is static 2019-01-27 22:28:44 -05:00
Sally Cochenour
240252fe08 Wipeout slowdown is x2 strength 2019-01-27 21:58:44 -05:00
Sally Cochenour
1c2ff9310e 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
60c62b7a93 Remove offroad leniency bias
Everyone now has flat, equal 1-second leniency
2019-01-27 21:57:18 -05:00
Sally Cochenour
d6e5be72e0 Apply to TAB rankings too 2019-01-27 21:11:49 -05:00
Sally Cochenour
f7d8c3877e 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