Commit graph

5389 commits

Author SHA1 Message Date
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
Sryder
e45b2ea257 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
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
Steel Titanium
74bf3164f8 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2 into polyobj_fix_vanilia 2019-01-26 00:51:39 -05:00
ThatAwesomeGuy173
bcddbdbfbf Allow letters to be used in the "Specify IPv4 Address:" field 2019-01-25 21:50:58 -07:00
Sryder
5b9e6502f9 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
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
Sal
7dd4b0aea8 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
29f31cd9f8 Fix the netticbuffer command crashing 64-bit builds 2019-01-21 20:40:28 +00:00
Sryder
d28ab4df94 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
7b182d37b9 Merge remote-tracking branch 'upstream/master' into upstream-merge 2019-01-20 17:03:17 -05:00
Alam Ed Arias
b8b605a9c7 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
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
Sal
860157a94b Merge branch 'movementchecks' into 'master'
Movement input checks

See merge request KartKrew/Kart!122
2019-01-16 01:08:32 -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