Commit graph

4569 commits

Author SHA1 Message Date
toaster 06b3e265f5 Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart-Public.git into next 2019-02-02 21:12:49 +00:00
fickleheart ce59b705a4 Play generic intermission music after netreplays
Mostly because I kept cycling to other people after the
top half finished and always got the lose music as a
result lol
2019-02-02 10:54:24 -06: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
fickleheart c407f811af Fix map name not showing right on replay intermission 2019-02-02 00:24:15 -06:00
Sally Cochenour 6a14d79cf0 Offroad spark fix & sink 2019-02-02 00:58:51 -05:00
fickleheart 71d1d10ef6 Play intermission after net replays 2019-02-01 21:06:52 -06:00
fickleheart e76e3f2281 something 2019-02-01 20:50:33 -06:00
fickleheart 28b9c5fc7d Fix P3 getting the wrong split flags in 3p splitscreen 2019-02-01 20:20:14 -06:00
fickleheart ba07224a8f Make replays single-view by default unless requested 2019-02-01 20:19:52 -06:00
fickleheart 3724d02e3b Allow changing all players' viewpoints in replays 2019-02-01 19:53:52 -06:00
fickleheart 4de79f13af Refactor view changes a bit 2019-02-01 19:46:58 -06:00
fickleheart 0ab690bc60 Draw player names in netreplays 2019-02-01 19:28:05 -06: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
fickleheart 09eef5f6b1 Make the join sync hack a little more robust 2019-02-01 07:50:42 -06:00
fickleheart 7f7dd0097b wip replay viewpoint stuff heck im tired zzz good night 2019-02-01 01:32:35 -06:00
fickleheart 43c4917e96 Tack on a timestamp to replay filenames 2019-02-01 01:01:14 -06:00
fickleheart e5be5e80ba Make joins/quits/enters/spectates sync in replays
I'm not 100% sure on joins. That P_RandomByte() call
looks ugly. It'll probably be a source of trouble.
2019-02-01 00:44:35 -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
fickleheart 6a131f368f Fix replay split breaking with less than four viewpoints 2019-01-31 23:03:44 -06:00
wolfy852 9ddea94590 Potentially fix 64-bit builds crashing on certain replays 2019-01-31 19:15:28 -06:00
fickleheart 0c11562209 4p split views test 2019-01-31 00:00: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
Sryder e63b6aee00 Fix Connection Timeouts during Wipes
Keep the connection alive with a specific packet to say we haven't timed out
2019-01-30 19:18:51 +00: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
fickleheart e13e6c5c9b Fix replay viewer discarding aim keys 2019-01-27 20:36:13 -06:00
Sally Cochenour e9887b2675 Apply to TAB rankings too 2019-01-27 21:11:49 -05:00
fickleheart d05a3a59c4 Write respawn command usage to replays 2019-01-27 19:30:20 -06:00
fickleheart f7e12165ba Write extra data before cmds
This will probably nip a possible issue
with player cmds getting read/wrote inconsistently
if a player joins or leaves.
2019-01-27 19:10:25 -06:00
fickleheart 49caebd2db Fix crashing at the end of netreplays 2019-01-27 19:09:29 -06:00
fickleheart c6248faa30 Write skin/color/name changes to replay 2019-01-27 19:07:30 -06:00
fickleheart 314b2769a9 Fix invalid numlaps value being written when set to map default 2019-01-27 17:58:13 -06:00
fickleheart 3a467889ae Fix spectators spawning as players in netreplays 2019-01-27 17:48:39 -06:00
fickleheart cf6e3a45d7 Reset oldcmd when recording netreplays 2019-01-27 17:09:25 -06: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
fickleheart 3cec3d9658 broken spectator stuff? 2019-01-27 16:23:34 -06:00
fickleheart 26770c5103 [HACK] Save correct lap count on netreplays 2019-01-27 15:45:42 -06:00
fickleheart ab226c1e39 Move where multiplayer replays are started
This particularly allows a server to record the
first map after startup as a replay. Players
joining mid-map can no longer record replays tho
2019-01-27 15:45:08 -06:00
fickleheart 894db0c6fd Store cmd.latency in replays 2019-01-27 15:09:58 -06:00
fickleheart 83738a20b7 Fix players spawning in the wrong spots when watching replays 2019-01-27 14:34:22 -06:00
fickleheart 6dcc4de979 Separate oldtic for each player 2019-01-27 14:34:19 -06:00
fickleheart 74c37ed06c Record all players' ticcmds in multiplayer 2019-01-27 14:34:01 -06:00
fickleheart 712dfdc3d1 Fix compile errors 2019-01-27 14:33:57 -06:00
fickleheart 1fb34ab65d lol test net replay stuff 2019-01-27 14:33:54 -06:00
fickleheart c9444116dd I don't wanna deal with ghosts right now 2019-01-27 14:33:51 -06:00
fickleheart dee45fdf62 Store initial player data in net replay 2019-01-27 14:33:45 -06:00
fickleheart 1f72df4edb Start with some strange multiplayer replay init stuff
Mostly just disabling the parts of the replay that assume
a single player, right now.

# Conflicts:
#	src/g_game.c
2019-01-27 14:33:38 -06: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
Latapostrophe 9028783190 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 72133b7498 No more ghetto check, and some more descriptive comments on the Hook 2019-01-26 16:55:26 +01:00
ThatAwesomeGuy173 fb6570cade I accidentally the numpad
also reduced the range of usable characters
2019-01-26 02:41:05 -07:00
ThatAwesomeGuy173 bcddbdbfbf Allow letters to be used in the "Specify IPv4 Address:" field 2019-01-25 21:50:58 -07:00
Sryder d959dd6934 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 d045af07b1 Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart-Public.git into majormods 2019-01-21 21:56:49 +00:00
toaster e9d95f07c1 Fix everything Sal wanted changed. 2019-01-21 21:51:54 +00:00
toaster fdbf750f48 Fix incorrect condition for setting savemoddata to false. 2019-01-21 21:48:52 +00:00
Sryder 29f31cd9f8 Fix the netticbuffer command crashing 64-bit builds 2019-01-21 20:40:28 +00:00
Alam Arias 7b182d37b9 Merge remote-tracking branch 'upstream/master' into upstream-merge 2019-01-20 17:03:17 -05:00
Sryder b18a8dbc8d Disable the APNG code if the version of libpng is greater than 1.4.
Since supposedly the current code *can't* work with newer versions of libpng that have the apng patch, it won't compile if that's what people have.
It seems like some distros are adding the apng patch to libpng and that'll make things annoying to compile for people.
I think it goes without saying, but if there's ever a fix to make newer libpng versions work with the APNG code then this can be reverted.
2019-01-20 18:50:28 +00:00
Latapostrophe e7d730e3b2 prevent the use of respawn to cheese items like SPB 2019-01-20 18:51:45 +01:00
Latapostrophe 1850123f8b Prevent the use of respawn to cheese SPB and other items 2019-01-20 18:50:07 +01:00
fickleheart c0c2ba4ca6 Fix clobbering error in MD2 texture code 2019-01-18 20:28:31 -06: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
toaster f8229b9dad whoopsie doodle, forgot gh wasn't allocated until after this section 2019-01-18 14:53:43 +00:00