Commit graph

4486 commits

Author SHA1 Message Date
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
Sal 3f283fd2a9 Merge branch 'flying-sharks-suck' into 'next'
Flying sharks suck

See merge request KartKrew/Kart-Public!46
2019-02-02 01:45:42 -05: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
toaster b332a3e163 Tweak incorrect capitalisation. 2019-02-01 18:51:15 -05:00
wolfy852 85f3be5889 Comment out type 2019-02-01 15:45:53 -06:00
wolfy852 b5b4e1fcc8 Skip over type
CORRECTLY, this time.
2019-02-01 15:42:29 -06:00
wolfy852 7c18d130f2 Fix replay weirdness
Sryder's Pleasure Castle ghost tries to return to England with this line.
2019-01-31 23:21:00 -06:00
wolfy852 9ddea94590 Potentially fix 64-bit builds crashing on certain replays 2019-01-31 19:15:28 -06: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 9d51ef8e82 Play hit confirm sound for shields 2019-01-30 14:42: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
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
Sal cf06f108ed Merge branch 'majormods' into 'next'
Allow playing in Record Attack with minor add-ons

See merge request KartKrew/Kart-Public!31
2019-01-29 23:19:57 -05:00
Sal 036c1ee929 Merge branch 'expose-serversort' into 'master'
Expose serversort to console

See merge request KartKrew/Kart-Public!43
2019-01-29 23:16:43 -05:00
Sally Cochenour 70a70b8a97 Merge branch 'master' into offroad-stuff 2019-01-29 20:22:15 -05:00
Sally Cochenour eda13915a8 Merge branch 'next' into offroad-stuff 2019-01-29 20:22:11 -05: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
Steel Titanium e118ec9399 Remove CV_HIDEN flag for serversort 2019-01-29 13:27:43 -05:00
Sally Cochenour 1e61cc6152 Better cpusleep
- Default to 1, which means potential for a 1-frame loss every once in a while but no longer a complete cpu hog
- New minimum is 0, since -1 just did the exact same thing as 0.
2019-01-28 14:12:08 -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
toaster d3bf1d55ef You will never have Lua consoleplayer.
(This is a quick, cheap hack to make splitscreen not almost impossible to support in major mods like Wipezones.)
2019-01-28 17:28:15 +00:00
toaster ada4ce622f * Did some reviewing, turns out there's literally no reason to disable savemoddata when majormods gets tripped and it's just a stupid thing vanilla did for modifiedgame for some reason that we almost inherited with our new solution?
* Adjusted the save system to acknowledge the new status quo. Instead of trying to save modifiedgame in the file like some sort of extremely boneheaded honour system everyone and their mothers hacks around, we just use it to determine whether the save is for a mod with savedata or not (this keeps backwards compatibility based on how we were using it, anyways, especially with the *force* parameter...)
* Added a menu message for attempting to play a demo set on a map that isn't loaded, as opposed to letting it I_Error.
* Minor tweaks to addons menu representing modded status.
2019-01-28 16:32:07 +00: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 1f90a04623 Thin names for 9+ player intermission 2019-01-27 17:52:53 -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
Sryder 2c6799c52a Merge branch 'master' of git@git.magicalgirl.moe:KartKrew/Kart-Public.git into next 2019-01-26 21:46:20 +00:00
ThatAwesomeGuy173 eb29063ef1 Use actual characters instead of ASCII codes as per Sryder's suggestion 2019-01-26 14:15:37 -07:00
Sryder 90bdf11346 Merge branch 'no-cheese' into 'next'
No respawn cheese

See merge request KartKrew/Kart-Public!32
2019-01-26 16:08:36 -05:00
toaster ce09566e11 Do a bit more cleanup. Notably, prevent skins setting a bunch of things in preperation for this branch hitting the mainstream.
Also, make SF_RUNONWATER set off majormods. I was under strong pressure to remove it and almost did but honestly it's kind of endearing and I think like one character in Releases uses it..?
2019-01-26 19:13:49 +00:00
Latapostrophe f8fd2c5190 Changed condition to being mid-air, changed print and changed the kick to a return 2019-01-26 19:40:12 +01: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
toaster 1a21c5efbe Code cleanup as requested by Sal and Sryder.
* majormods and savemoddata cannot coexist as true values, so going through and making situations that involve both only reference one.
* Clean up comments in `dehacked.c`.
2019-01-26 16:58:45 +00:00