stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2025-01-04 00:41:38 +00:00
Code Issues Projects Releases Packages Wiki Activity
5418 commits 60 branches 11 tags 94 MiB
Commit graph

4563 commits

Author SHA1 Message Date
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
toaster
d119c711e5 Improve readability of server browser add-ons message. 2019-01-18 14:11:59 +00:00
toaster
4b493b81a6 Add warning message when attempting to use the master server browser while modifiedgame is true. 
(We assume that if you're using an IP address connection, you're more of a power user.)
 2019-01-18 13:04:12 +00:00
toaster
15aafb00a9 Turns out modifiedgame was getting set during startup because of making it use G_SetGameModified. Uh, woops? 2019-01-18 13:01:40 +00:00
TehRealSalt
4c8737da08 Final v1.0.2 commit (probably) 
- Update chars.kart hash, AGAIN!
- Fix spectators being visible on minimap when F12ing people
- Optimize how splitscreen players are drawn on top of the minimap
- Remove duplicated cvar registrations
- Move cv_resynchattempts and cv_netticbuffer from D_ClientServerInit to D_RegisterServerCommands and D_RegisterClientCommands respectively, so they can save to config properly
- Increase "Frequent" gametype switch frequency even more
- "SRB2" version dehacked warning ignores srb2.srb
 2019-01-18 04:30:38 -05:00
toaster
dda94e4498 Remove irrelevant attempts at majormod setting for SOC events which explicitly can only happen if a gamedata is created. 2019-01-17 22:12:59 +00:00
toaster
66273898b7 * Refactor all instances of majormods = true; to route through G_SetGameModified, and catch a few spots I missed in the process. 
* Make G_SetGameModified only console-print for major mods.
* Add amnesty to "major mod" detection while loading files with custom savedatas.
* Improved the console prints for command `isgamemodified`.
 2019-01-17 22:01:28 +00:00
toaster
2f2d3768d5 * Increased leniency for SOC wrt "major mods". 
* If your file defines state and object freeslots in SOC, you are allowed to modify those freeslots IN ANY SOC SCRIPT IN THE SAME FILE without being marked as a "major mod".
	* If your file contains broken unlockables/emblems that don't actually have effect for any reason, it's not counted as a "major mod".
* Added add-ons menu message for adding a "major mod".
 2019-01-17 20:51:41 +00:00
wolfy852
d389cececa Update chars.kart hash 2019-01-16 20:02:40 -06:00
wolfy852
31c911e88f Fix position numbers being off in 1P 2019-01-16 19:53:09 -06:00
TehRealSalt
ad7b3dece0 Bump up the frequency of voting rule changes 
This is in our changelog, but I didn't actually get around to doing it. Would've been foolish to ship with that :V
 2019-01-16 16:19:16 -05:00
TehRealSalt
885d2e2965 Fix XD_REMOVEPLAYER not having a proper corresponding netxcmdname 
Caught while working on power levels -- turns out it wasn't a total waste of time when I should've been working on the rest of v1.0.2!
 2019-01-16 16:16:11 -05:00
toaster
a7445a7b71 Woops, didn't commit the most up-to-date g_game.c originally (old one didn't compile) 2019-01-16 15:27:23 +00:00
TehRealSalt
146f2a1c0a Don't show COOL for spectators 2019-01-16 01:55:07 -05:00
TehRealSalt
d4cf3f5dbc Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart 2019-01-16 01:15:21 -05:00
TehRealSalt
5e1aa0302f SHOULD be == 1, not < 2!!!! 2019-01-16 01:13:01 -05:00
TehRealSalt
86433d53cf Turn speed hack check into a function 2019-01-15 22:34:41 -05:00
fickleheart
f2c98b3639 Add driftturn checks to other players' movement 
(Can we make this into a function or something?)
 2019-01-15 21:09:53 -06:00
fickleheart
f5d491eda2 Merge remote-tracking branch 'remotes/internal/master' into movementchecks 
# Conflicts:
#	src/g_game.c
#	src/p_user.c
 2019-01-15 21:01:30 -06:00
TehRealSalt
0251814095 Minor whitespace 2019-01-15 21:56:46 -05:00
fickleheart
b28b7bf1bf Kick players who send cmds with invalid driftturn 2019-01-15 20:20:13 -06:00
fickleheart
e30222ebac Don't multiply driftturn by realtics 
(I also moved multiplying angleturn to a single spot)
 2019-01-15 20:19:25 -06:00
fickleheart
0121d47049 Merge remote-tracking branch 'internal/master' into new-turnhax-and-latency-stuff 2019-01-15 19:55:42 -06:00
TehRealSalt
46e5f308e7 Merge branch 'next' of https://git.magicalgirl.moe/KartKrew/Kart-Public into next 2019-01-15 20:35:39 -05:00
TehRealSalt
ea6ff29c43 Update file hashes 2019-01-15 20:35:20 -05:00
Sal
3597a94e3e Merge branch 'bump-maxskins' into 'next' 
Bump MAXSKINS up to 64 + fix skin overflow error

See merge request KartKrew/Kart-Public!29
 2019-01-15 20:30:33 -05:00
TehRealSalt
105958d29f Update the (unused) SP menu stuff to use MAXSKINS 2019-01-15 20:09:55 -05:00
wolfy852
3dbf6f7ad0 Only allow ESC and non-keyboard keys to abort connection 2019-01-15 18:47:13 -06:00
toaster
081872aa85 First steps at implementing a mechanism that allows you to load non-cheaty good-faith mods such as custom characters with no Lua scripting, and play record attack with them. Features a few bad hacks and a few more areas of improvement; I'll try to iron them out before they hit next or master. 2019-01-15 19:01:55 +00:00
wolfy852
f53594cf81 Stop the keyboard from treating accelerate and break as menu keys 2019-01-15 03:02:52 -06:00
Sal
f2b7d9f373 Merge branch 'unfuck-splitscreen-hud' into 'next' 
Cleaner splitscreen hud

See merge request KartKrew/Kart-Public!6
 2019-01-15 03:47:29 -05:00
Sal
5982e26bb5 Merge branch 'default-md2' into 'next' 
Default model for players

See merge request KartKrew/Kart-Public!27
 2019-01-15 03:42:19 -05:00
TehRealSalt
5cd8691a71 Don't draw multiple WANTED posters in splitscreen 2019-01-15 03:41:33 -05:00
TehRealSalt
c61fcc8db6 Fix really dumb flags on MT_SPBEXPLOSION 2019-01-14 21:55:10 -05:00
TehRealSalt
4ce528bea7 Attempt to fix the stupid bug where SPB decides to not hurt 2019-01-14 21:38:38 -05:00
TehRealSalt
0b299012f7 Reduce easing time, revert changing air speed 2019-01-14 21:37:53 -05:00
TehRealSalt
6ba69e9002 Missed this 2019-01-14 18:24:25 -05:00
TehRealSalt
e63d7537e0 bump maxskins to 64, fix overflow error 2019-01-14 18:16:07 -05:00
TehRealSalt
7d1e630007 Tiny SPB fixes 
- Fix typo that could potentially invalidate the wait phase
- Prevent dying during target phase causing it to redirect to someone else
- Ease speed back up to default whenever slowed down
- SPB intensity now biases against high drift sparks + acceleration, instead of only acceleration.
- Slow speed is scaled w/ SPB intensity too
 2019-01-14 02:01:00 -05:00
TehRealSalt
b560a90890 Gag spacing was not updated 2019-01-13 20:47:57 -05:00
Sal
9fb290577a Merge branch 'gamepad-tweaks' into 'next' 
Gamepad Improvements: Round 2

See merge request KartKrew/Kart-Public!24
 2019-01-13 20:32:17 -05:00
wolfy852
dead0475ce Allow any key to abort network connection, ignore non-keyboard keys in chat 2019-01-13 19:22:54 -06:00
Sal
75fa18b084 Merge branch 'polyobj_fix_public' into 'next' 
Fix rendering gaps on polys with upper/lower textures

See merge request KartKrew/Kart-Public!26
 2019-01-13 18:00:58 -05:00
Latapostrophe
148bd140c2 hook_cmd_running around the loop rather than inside 2019-01-13 20:16:53 +01:00
Latapostrophe
c2aa6d4de6 Expose some more Kart functions, freeplay and rankings bumpers are now hud stuff you can toggle, + experimental playercmd hook 2019-01-13 14:40:48 +01:00
wolfy852
31ccae60c9 Revert "Enable d-pad on the vote screen" 
Partial revert of commit 92a60b32de.
 2019-01-12 05:37:07 -06:00
Latapostrophe
8bbb63f52a Forgot to trim whitespace 2019-01-12 12:28:15 +01:00
Latapostrophe
23f99bd28d Fixed WANTED poster drawing over minimap, WANTED cursor being colormapped, and splitscreen position shifting stuff 2019-01-12 12:27:30 +01:00
TehRealSalt
2416d78224 Update comment to be more accurate 2019-01-12 05:12:20 -05:00
TehRealSalt
5ed4d0256e spacing & () 2019-01-12 05:03:05 -05:00
TehRealSalt
0ef5c2e388 Some house-cleaning 2019-01-12 05:01:36 -05:00
TehRealSalt
650522fc59 Don't increment ingame count without bumpers 2019-01-12 04:43:43 -05:00
TehRealSalt
24a32c2f51 Allow player-count modifiers in Battle 2019-01-12 04:31:35 -05:00
TehRealSalt
922f80b22f Uncap player-count item distribution modifiers 
Was an idea I had in development to make 16P less chaotic, but decided against it due to lack of testing and that it could backfire badly...
 2019-01-12 04:30:41 -05:00
TehRealSalt
761aada745 Turn the "Music" section of the credits into only the people on Krew who contributes music 
Meant to do this in song-credits, since individual songs are now properly credited there.
 2019-01-12 04:13:49 -05:00
TehRealSalt
89f12599c6 Minor misc fixes 2019-01-12 02:53:14 -05:00
fickleheart
87ede1e934 Fix rendering gaps on polys with upper/lower textures 2019-01-11 21:21:56 -06:00
Sal
e443285801 Merge branch 'dehacked-versioning' into 'next' 
Update SOC version, make base SRB2 SOC throw a warning

See merge request KartKrew/Kart-Public!11
 2019-01-11 20:25:00 -05:00
Sal
2bd88fd6f8 Merge branch 'disable-xinput' into 'next' 
-noxinput command line parameter

See merge request KartKrew/Kart-Public!21
 2019-01-11 20:23:39 -05:00
fickleheart
4213a9cbb6 i,m gowonna update my name in the cwedits uwu 2019-01-11 18:11:52 -06:00
wolfy852
88b5a056c8 Fix the chat being incorrectly placed in splitscreen 2019-01-11 16:04:12 -06:00
wolfy852
622509682a Fix chat toggle not working 2019-01-11 02:38:49 -06:00
wolfy852
d5e16dca63 Merge remote-tracking branch 'remotes/public/next' into gamepad-tweaks 2019-01-11 00:18:45 -06:00
wolfy852
a8e0805261 -nohidapi parameter 
Should fix problems where Switch Pro controllers suddenly had their mappings changed. Does not recognize controllers connected before game launch. Make sure to replug your controller after the game launches if using this param.
 2019-01-10 23:12:06 -06:00
wolfy852
d72fcaecc6 Merge remote-tracking branch 'remotes/public/next' into disable-xinput 2019-01-10 20:38:57 -06:00
wolfy852
7a50ea2554 Merge remote-tracking branch 'remotes/public/next' into disable-xinput 2019-01-10 20:35:32 -06:00
Sal
45a1508f0a Merge branch 'fix-chat' into 'next' 
Fix splitscreen being forced into oldchat

See merge request KartKrew/Kart-Public!25
 2019-01-10 18:43:14 -05:00
wolfy852
6c4decfef3 Don't check splitscreen in OLDCHAT 2019-01-10 13:52:58 -06:00
wolfy852
92a60b32de Enable d-pad on the vote screen, allow aborting connection with more joy buttons 2019-01-10 06:10:16 -06:00
wolfy852
73369679f5 Fix player 2 not being able to play while the chat is open 
Also attempts to fix the d-pad typing characters into the chat box.
 2019-01-10 06:08:12 -06:00
TehRealSalt
5b05eff41f Merge branch 'next' into music-credits 2019-01-10 01:14:02 -05:00
TehRealSalt
37e79ebfbd Redone credits for joiners in a less stupid way, + redone start ambience in a less stupid way 2019-01-10 01:03:53 -05:00
TehRealSalt
9975497a68 Remove this, doesn't work 2019-01-10 00:35:11 -05:00
TehRealSalt
cff7d2795d Expose S_ShowMusicCredit to Lua 2019-01-09 21:17:24 -05:00
TehRealSalt
d3a38a4375 Add disable for music credit showing on the change music linedef 2019-01-09 21:17:10 -05:00
TehRealSalt
2ccdd3e4b7 Fix Music toggle trying to play a non-existent song in Kart 2019-01-09 21:13:06 -05:00
TehRealSalt
ed36f5ac16 Accidental unselected change 2019-01-09 21:12:33 -05:00
TehRealSalt
565b8f87fb Show song credits if joining mid-game 
Dunno if this works or not yet!
 2019-01-09 21:01:56 -05:00
TehRealSalt
de72403fb9 Add MUSICDEF lump for defining custom songs & replacing existing songs 
Very rudimentary at the moment, but it's workable
 2019-01-09 21:00:45 -05:00
wolfy852
dbb7267f22 Missed a few spots 2019-01-09 15:53:59 -06:00
wolfy852
90148f79eb If kmd2.dat isn't found in srb2home, search the game's directory for it 2019-01-09 15:38:37 -06:00
fickleheart
a444a214d0 Here too 2019-01-09 09:07:41 -06:00
fickleheart
d20122327f Make sure cmd.latency is always 0 in mode attack? 2019-01-09 09:05:57 -06:00
TehRealSalt
72bc1b48f6 Merge branch 'next' into music-credits 2019-01-09 03:08:20 -05:00
wolfy852
5e682d612f -noxinput command line parameter 2019-01-09 01:38:28 -06:00
fickleheart
81a7cdf6e8 oops 2019-01-09 00:49:32 -06:00
Sal
0a34d4bafa Merge branch 'kart-public-travis-deployer' into 'next' 
Implement OSX and Debian installer building for Travis

See merge request KartKrew/Kart-Public!8
 2019-01-09 01:42:44 -05:00
Sal
2f30625c82 Merge branch 'drift-spark-adjustment' into 'next' 
Minimum speed to get drift sparks

See merge request KartKrew/Kart-Public!20
 2019-01-09 01:18:30 -05:00
fickleheart
acfe6c4616 Don't use netticbuffer for servers 2019-01-08 23:27:51 -06:00
fickleheart
26af4e8561 Save stored turn ranges in NetArchivePlayers 2019-01-08 23:27:39 -06:00
fickleheart
100ce5958b Merge remote-tracking branch 'internal/master' into new-turnhax-and-latency-stuff 2019-01-08 21:11:02 -06:00
fickleheart
01d7dc35ff Merge remote-tracking branch 'internal/master' into new-turnhax-and-latency-stuff 2019-01-08 20:56:14 -06:00
fickleheart
6792fd92aa Experimental nettic buffer to stop net-induced frame drops? 2019-01-08 20:55:33 -06:00
fickleheart
cd71e94785 Remove filthy filthy cheats 2019-01-08 20:36:06 -06:00
fickleheart
1bacc4e395 Make starting boost timing compensate for latency 2019-01-08 20:27:54 -06:00
TehRealSalt
5e8e08ad95 Misc level init fixes 2019-01-08 20:14:58 -05:00
Marco Z
7806c43ecf Kart Public Next merge 2019-01-08 18:43:49 -05:00
wolfy852
e528750444 Fix improperly resolved conflicts 2019-01-08 16:44:56 -06:00
wolfy852
ad01dcc5ac Merge remote-tracking branch 'remotes/public/next' into gamepad-tweaks 
# Conflicts:
#	CMakeLists.txt
#	appveyor.yml
#	src/command.c
#	src/command.h
#	src/d_clisrv.c
#	src/d_netcmd.c
#	src/dehacked.c
#	src/doomdef.h
#	src/hu_stuff.c
#	src/m_misc.c
 2019-01-08 16:32:24 -06:00
Sal
78ac038864 Merge branch 'mobjscale-global' into 'next' 
Add a global for mobjscale

See merge request KartKrew/Kart-Public!10
 2019-01-08 17:00:34 -05:00
TehRealSalt
b713903208 Merge remote-tracking branch 'master' into next 2019-01-08 16:29:14 -05:00
Sal
7f8609d335 Merge branch 'merge-srb2' into 'next' 
Merge SRB2 master & next (round 1)

See merge request KartKrew/Kart-Public!16
 2019-01-08 15:56:41 -05:00
Latapostrophe
a4641e1010 use PLAY as default player MD2 if avaiable. 2019-01-08 18:57:10 +01:00
wolfy852
bcf687c3af Compile flag for DEVELOP 2019-01-06 20:47:13 -06:00
SeventhSentinel
eebdda0833 Minimum speed to get drift sparks 2019-01-06 17:17:52 -05:00
wolfy852
e115dbf34f Cast animtimer to int before negating 
Stops a Visual Studio compile error.
 2019-01-06 03:02:12 -06:00
Sal
7176490d5e Merge branch 'kill-facefreed' into 'next' 
Remove facefreed/iconfreed

See merge request KartKrew/Kart-Public!15
 2019-01-06 02:02:54 -05:00