Commit graph

5314 commits

Author SHA1 Message Date
Sally Cochenour
33ac694729 Don't bump while flashing 2019-01-30 15:02:24 -05:00
Sally Cochenour
dded2e7656 Play hit confirm sound for shields 2019-01-30 14:42: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
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
Sal
73ce8f4e74 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
79002422bf Merge branch 'offroad-stuff' into 'next'
Offroad & wipeout stuff (AKA: piss off salty Metal mains even more)

See merge request KartKrew/Kart-Public!40
2019-01-29 23:17:00 -05:00
Sally Cochenour
33cef80987 Merge branch 'master' into offroad-stuff 2019-01-29 20:22:15 -05:00
Sally Cochenour
bfeccaebc0 Merge branch 'next' into offroad-stuff 2019-01-29 20:22:11 -05: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
Sal
0bdc0d0e78 Merge branch 'notluaconsoleplayer' into 'next'
Not Lua Consoleplayer

See merge request KartKrew/Kart-Public!38
2019-01-29 15:03:52 -05:00
Sal
c26da663f7 Merge branch 'i-gotta-get-more-sleep' into 'master'
Better cpusleep

See merge request KartKrew/Kart-Public!41
2019-01-29 15:03:13 -05:00
Sally Cochenour
1928721218 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
Sal
1fc76e48b5 Merge branch 'thin-intermission-names' into 'master'
Thin names for 9+ player intermission

See merge request KartKrew/Kart-Public!37
2019-01-28 13:38: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
toaster
56f67c9db5 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
2e232b67ba * 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
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
95251808d4 Thin names for 9+ player intermission 2019-01-27 17:52:53 -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
Sally Cochenour
10433c4e32 Merge branch 'master' into item-experiment 2019-01-27 15:14:56 -05:00
Sryder
fdc2cc9437 Merge branch 'master' of git@git.magicalgirl.moe:KartKrew/Kart-Public.git into next 2019-01-26 21:46:20 +00:00
Sryder
6fb2b733da Merge branch 'ip-allow-letters' into 'master'
Allow letters to be used in the "Specify IPv4 Address:" field

See merge request KartKrew/Kart-Public!36
2019-01-26 16:45:22 -05:00
ThatAwesomeGuy173
f12f154f87 Use actual characters instead of ASCII codes as per Sryder's suggestion 2019-01-26 14:15:37 -07:00
Sryder
ae64884e59 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
4e4d663b3e 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
5882f8ac66 Changed condition to being mid-air, changed print and changed the kick to a return 2019-01-26 19:40:12 +01:00
Sal
809138e285 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
004cde8a57 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
Latapostrophe
ae6373f014 Only prevent respawn if spun out in midair and added a Got_Respawn check to kick cheaters 2019-01-26 17:40:05 +01:00
Latapostrophe
60bbea9de1 No more ghetto check, and some more descriptive comments on the Hook 2019-01-26 16:55:26 +01:00
ThatAwesomeGuy173
ea13f606ca I accidentally the numpad
also reduced the range of usable characters
2019-01-26 02:41:05 -07:00
ThatAwesomeGuy173
1141c2c1f2 Allow letters to be used in the "Specify IPv4 Address:" field 2019-01-25 21:50:58 -07:00
Sryder
b838c1df19 Merge branch 'md2-crash-fix' into 'master'
Hopefully fix the MD2 crash reported

Closes #1

See merge request KartKrew/Kart-Public!35
2019-01-24 14:27:25 -05:00
Sryder
23b8646cbd Should hopefully fix the MD2 crash reported
I wasn't able to replicate it personally, but this should hopefully avoid it crashing where the RPT given pointed out.
2019-01-21 22:48:57 +00:00
toaster
e3836bf772 Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart-Public.git into majormods 2019-01-21 21:56:49 +00:00
toaster
7786e5b172 Fix everything Sal wanted changed. 2019-01-21 21:51:54 +00:00
toaster
963c4451b4 Fix incorrect condition for setting savemoddata to false. 2019-01-21 21:48:52 +00:00
Sal
0cd1ae5b2b Merge branch 'netticbuffer-crash-fix' into 'master'
Fix the netticbuffer command crashing 64-bit builds

See merge request KartKrew/Kart-Public!34
2019-01-21 15:52:27 -05:00
Sryder
8674c21476 Fix the netticbuffer command crashing 64-bit builds 2019-01-21 20:40:28 +00:00
Sryder
16ed8b4d78 Merge branch 'upstream-merge' into 'master'
Merge upstream SRB2 changes

See merge request KartKrew/Kart-Public!33
2019-01-20 17:15:02 -05:00
Alam Arias
d7a14d7fa9 Merge remote-tracking branch 'upstream/master' into upstream-merge 2019-01-20 17:03:17 -05:00
Alam Ed Arias
94748c3921 Merge branch 'apng-conditional-disable' into 'master'
Disable the APNG code if the version of libpng is greater than 1.4.

See merge request STJr/SRB2!457
2019-01-20 17:00:50 -05:00