Commit graph

6290 commits

Author SHA1 Message Date
fickleheart
63dd29564e Write respawn command usage to replays 2019-01-27 19:30:20 -06:00
fickleheart
5f0fc3f681 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
f1048d2b5a Fix crashing at the end of netreplays 2019-01-27 19:09:29 -06:00
fickleheart
4116c11152 Write skin/color/name changes to replay 2019-01-27 19:07:30 -06:00
fickleheart
c944a524d1 Fix invalid numlaps value being written when set to map default 2019-01-27 17:58:13 -06:00
fickleheart
08582fa7cc Fix spectators spawning as players in netreplays 2019-01-27 17:48:39 -06:00
fickleheart
cc5bcd1676 Reset oldcmd when recording netreplays 2019-01-27 17:09:25 -06: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
fickleheart
30649b0574 broken spectator stuff? 2019-01-27 16:23:34 -06:00
fickleheart
d9f1345701 [HACK] Save correct lap count on netreplays 2019-01-27 15:45:42 -06:00
fickleheart
5b4b5ec302 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
28da2d2a85 Store cmd.latency in replays 2019-01-27 15:09:58 -06:00
fickleheart
2ec0673af9 Fix players spawning in the wrong spots when watching replays 2019-01-27 14:34:22 -06:00
fickleheart
5a6ad744b1 Separate oldtic for each player 2019-01-27 14:34:19 -06:00
fickleheart
2b47af32fb Record all players' ticcmds in multiplayer 2019-01-27 14:34:01 -06:00
fickleheart
61ba4ac123 Fix compile errors 2019-01-27 14:33:57 -06:00
fickleheart
aea82da5fc lol test net replay stuff 2019-01-27 14:33:54 -06:00
fickleheart
11837576a1 I don't wanna deal with ghosts right now 2019-01-27 14:33:51 -06:00
fickleheart
7d881e7af1 Store initial player data in net replay 2019-01-27 14:33:45 -06:00
fickleheart
b0792aed46 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
10433c4e32 Merge branch 'master' into item-experiment 2019-01-27 15:14:56 -05:00
Steel Titanium
221ec15af0 How did I forget about this 2019-01-26 23:22:30 -05:00
Steel Titanium
34920c2951 Setup the tables even eariler.
I really hate that PlayerMenu status hack, but that's really the only
way I could think off to show the entires for Tails, Knuckles and the
Sonic&Tails pair.
2019-01-26 23:16:49 -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
Steel Titanium
31a884e542 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2 into polyobj_fix_vanilia 2019-01-26 00:51:39 -05:00
TehRealSalt
bcdfe2eb14 Update the SP menu stuff to use MAXSKINS
Co-authoered-by: Steel Titanium (steeltitanium1@gmail.com>
2019-01-26 00:22:05 -05: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
2f65d2860a Merge branch 'master' into next 2019-01-20 17:01:01 -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
Sryder
517a32e96d 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