fickleheart
b085355bdd
Move fov cvar out of OGL-specific code
2019-02-23 10:18:20 -06:00
wolfs
43f4888425
Merge branch 'fix_nonet' into 'master'
...
Fix NONET
See merge request KartKrew/Kart-Public!60
2019-02-16 06:11:43 -05:00
james
ae3bb592b9
Use less confusing player sorting key names
2019-02-09 18:10:54 -08:00
toaster
f6381c6f00
Fix NONET. I thought I did this already during development, but I guess it got broken near the end.
2019-02-09 09:58:48 +00:00
toaster
d3f739f64a
Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart-Public.git into next
2019-02-02 21:12:49 +00:00
toaster
b7ea18bb4e
Tweak incorrect capitalisation.
2019-02-01 18:51:15 -05:00
Sal
73ce8f4e74
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
Steel Titanium
366d320cc3
Remove CV_HIDEN flag for serversort
2019-01-29 13:27:43 -05:00
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
ThatAwesomeGuy173
f12f154f87
Use actual characters instead of ASCII codes as per Sryder's suggestion
2019-01-26 14:15:37 -07: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
ThatAwesomeGuy173
ea13f606ca
I accidentally the numpad
...
also reduced the range of usable characters
2019-01-26 02:41:05 -07:00
ThatAwesomeGuy173
1141c2c1f2
Allow letters to be used in the "Specify IPv4 Address:" field
2019-01-25 21:50:58 -07: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
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
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
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
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
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
Marco Z
74c57ad447
Kart Public Next merge
2019-01-08 18:43:49 -05:00
wolfy852
5c5e6a26dd
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
SeventhSentinel
e70d98d7a6
Merge remote-tracking branch 'srb2public/master' into merge-srb2
2019-01-05 18:42:58 -05:00
SeventhSentinel
1d58c6b8c2
merge srb2 next
2019-01-05 15:59:23 -05:00
Digiku
e42e1178ed
Increase M_ChangecontrolResponse message buffer by 25 chars
2019-01-04 19:38:36 -05:00
mazmazz
93e8751938
Better rewrite for addons draw adjustment [Kart]
2019-01-02 20:03:53 -05:00
mazmazz
5b663bfd28
Remove FIXUPO0 GCC pragma
2019-01-02 20:03:52 -05:00
mazmazz
c520447f77
Merge remote-tracking branch 'kart-public-gl/next' into kart-public-travis-deployer
2018-12-31 18:20:04 -05:00
mazmazz
f395aeda96
Increase ChangeControl text buffer to resolve buffer overflow with System Menu/GIF control config
2018-12-31 01:45:03 -05:00
mazmazz
61e8685713
Increase ChangeControl text buffer to resolve buffer overflow with System Menu/GIF control config
2018-12-31 01:43:47 -05:00
wolfy852
6fc90ada95
Fix an issue where gamepad options for player 4 ended up binding settings for player 3 instead.
2018-12-27 18:13:13 -06:00
wolfy852
f4d6a108d5
Merge remote-tracking branch 'remotes/SRB2/vanilla-hotplug-stableid' into gamepad-tweaks
...
# Conflicts:
# src/command.c
# src/command.h
# src/g_game.c
# src/m_menu.c
# src/sdl/i_system.c
# src/sdl/i_video.c
# src/sdl/sdlmain.h
This is NOT just a normal merge commit. I have adjusted the hotplugging code from stableid to account for the last two players, and also removed new 2.1 additions that were deemed irrelevant to Kart.
2018-12-27 16:21:51 -06:00
mazmazz
a25c755a6b
Also hide Chat Options if NONET
2018-12-26 16:41:39 -05:00
Digiku
15c9404f91
Merge branch 'addons-backport' into '2122-version'
...
Addons Menu backport to vanilla
See merge request STJr/SRB2!384
2018-12-23 18:08:06 -05:00
Digiku
77182e9278
Merge branch 'SRB2-CHAT' into '2122-version'
...
Chat and other multiplayer quality of life improvements.
See merge request STJr/SRB2!398
2018-12-23 17:53:54 -05:00
Latapostrophe
47a329807a
Merge branch 'next' into SRB2-CHAT
2018-12-23 22:53:24 +01:00
mazmazz
98b59f3f9d
Merge branch '2122-version' into execversion-filtercontrols
2018-12-23 14:30:24 -05:00
Latapostrophe
1b8be7f1a4
Merge branch 'master' into SRB2-CHAT
2018-12-23 10:26:08 +01:00
Latapostrophe
9e49a9ca5d
Remove mute boolean from playermsg hook, fix username stuff still being there, potential memory leaks, and added back the ip message.
2018-12-22 16:44:58 +01:00
Latapostrophe
09dbb6d631
Fixed various issues: added some free()s, lua_optboolean, other things, and also made sure chat can't send empty messages.
2018-12-22 12:34:17 +01:00
Monster Iestyn
d46e2ef51b
Merge branch 'master' into next
2018-12-21 17:41:19 +00:00
mazmazz
8207f126f4
Fix 2p control menu graying out
2018-12-20 16:38:58 -05:00
mazmazz
2cd851652a
Add G_FilterKeyByVersion() to setcontrol
2018-12-20 16:30:37 -05:00
mazmazz
6a87980afd
Mixed D&C fixes; replace a couple int's with INT32
2018-12-17 19:02:22 -05:00
Latapostrophe
4c88271cfb
2.1.21 and all of the kart additions. Woo.
2018-12-17 20:43:59 +01:00
mazmazz
a51130a8b9
Better rewrite for addons draw adjustment
2018-12-17 10:59:27 -05:00
mazmazz
e88db2e2b1
Use labs for long value
2018-12-16 19:47:02 -05:00