Commit graph

4424 commits

Author SHA1 Message Date
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
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
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
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
Sryder
8674c21476 Fix the netticbuffer command crashing 64-bit builds 2019-01-21 20:40:28 +00:00
Alam Arias
d7a14d7fa9 Merge remote-tracking branch 'upstream/master' into upstream-merge 2019-01-20 17:03:17 -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
fickleheart
6cb8818a46 Fix clobbering error in MD2 texture code 2019-01-18 20:28:31 -06:00
wolfy852
71d5b148c9 Use SHORT on just the vars 2019-01-18 16:17:54 -06:00
wolfy852
245f0afd12 Fix SHORT being used as a cast instead of a macro 2019-01-18 15:38:06 -06:00
toaster
5dac9c4731 whoopsie doodle, forgot gh wasn't allocated until after this section 2019-01-18 14:53:43 +00:00
toaster
b912ae36c2 Improve readability of server browser add-ons message. 2019-01-18 14:11:59 +00:00
toaster
51b20073a2 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
0eca0e6613 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
815d287cbe 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
88dc2569e4 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
4a87838f06 * 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
e61665b612 * 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
79557b2b76 Update chars.kart hash 2019-01-16 20:02:40 -06:00
wolfy852
409f698331 Fix position numbers being off in 1P 2019-01-16 19:53:09 -06:00
TehRealSalt
c5a2a95ef1 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
bee3dfdc8d 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
6238a144b8 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
9546c1b139 Don't show COOL for spectators 2019-01-16 01:55:07 -05:00
TehRealSalt
1f7b41de9c Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart 2019-01-16 01:15:21 -05:00
TehRealSalt
b02324988a SHOULD be == 1, not < 2!!!! 2019-01-16 01:13:01 -05:00
TehRealSalt
cd312e73f5 Turn speed hack check into a function 2019-01-15 22:34:41 -05:00
fickleheart
26a014dc11 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
03f9459257 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
654580d48b Minor whitespace 2019-01-15 21:56:46 -05:00
fickleheart
b3c890df63 Kick players who send cmds with invalid driftturn 2019-01-15 20:20:13 -06:00
fickleheart
31d9a86b6f Don't multiply driftturn by realtics
(I also moved multiplying angleturn to a single spot)
2019-01-15 20:19:25 -06:00
fickleheart
606659dcff Merge remote-tracking branch 'internal/master' into new-turnhax-and-latency-stuff 2019-01-15 19:55:42 -06:00
TehRealSalt
4b8a51d028 Merge branch 'next' of https://git.magicalgirl.moe/KartKrew/Kart-Public into next 2019-01-15 20:35:39 -05:00
TehRealSalt
0957d70451 Update file hashes 2019-01-15 20:35:20 -05:00
Sal
d755a479d5 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
55e6797225 Update the (unused) SP menu stuff to use MAXSKINS 2019-01-15 20:09:55 -05:00
wolfy852
8f05182530 Only allow ESC and non-keyboard keys to abort connection 2019-01-15 18:47:13 -06:00
toaster
0037f5c91d 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
3c35f40572 Stop the keyboard from treating accelerate and break as menu keys 2019-01-15 03:02:52 -06:00
Sal
49a333e72a 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
a17824ac76 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
7c42a72fdd Don't draw multiple WANTED posters in splitscreen 2019-01-15 03:41:33 -05:00
TehRealSalt
553f3a9295 Fix really dumb flags on MT_SPBEXPLOSION 2019-01-14 21:55:10 -05:00
TehRealSalt
1a10499779 Attempt to fix the stupid bug where SPB decides to not hurt 2019-01-14 21:38:38 -05:00
TehRealSalt
32030fae57 Reduce easing time, revert changing air speed 2019-01-14 21:37:53 -05:00
TehRealSalt
15174b0f02 Missed this 2019-01-14 18:24:25 -05:00
TehRealSalt
19329f9a4a bump maxskins to 64, fix overflow error 2019-01-14 18:16:07 -05:00