vivlim/Kart-Public
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
5845 commits 50 branches 7 tags 75 MiB
Commit graph

407 commits

Author SHA1 Message Date
fickleheart d05a3a59c4 Write respawn command usage to replays 2019-01-27 19:30:20 -06:00
fickleheart c6248faa30 Write skin/color/name changes to replay 2019-01-27 19:07:30 -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 1fb34ab65d lol test net replay stuff 2019-01-27 14:33:54 -06: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
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
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
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
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 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
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 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
TehRealSalt 72bc1b48f6 Merge branch 'next' into music-credits 2019-01-09 03:08:20 -05:00
Marco Z 7806c43ecf Kart Public Next merge 2019-01-08 18:43:49 -05:00
SeventhSentinel 49f2d65e95 Fix errors from merge 2019-01-06 01:00:30 -05:00
SeventhSentinel 73542c008c merge srb2 next 2019-01-05 15:59:23 -05:00
SeventhSentinel 5d51754936 In-game music credits 2019-01-04 04:44:55 -05:00
mazmazz e7ffd86c6e Fixx GCC 4.4 array-bounds compile errors 2019-01-02 20:58:52 -05:00
Digiku 8d56c2f486 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
Latapostrophe b7d7472a88 Merge branch 'next' into SRB2-CHAT 2018-12-23 22:53:24 +01:00
Latapostrophe 1b61e15b1b Merge branch 'master' into SRB2-CHAT 2018-12-23 10:26:08 +01:00
Latapostrophe c7060aa5ad 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
Digiku 28c8ad3dbb Merge branch 'jump-spin-axes' into 'next' 
Feature: Jump/Spin axes

See merge request STJr/SRB2!389
 2018-12-20 16:57:05 -05:00
mazmazz 7f8d16d3cd Add DEVELOP build flag to version string 2018-12-20 02:27:30 -05:00
Latapostrophe a31b85e124 Some messages relevant to discussions now go in the chat. 2018-12-19 16:44:57 +01:00
TehRealSalt c69cfefb6d 2.2 backport of jump/spin axes 
Needs the config default-changing shenanigans done still, not sure how to tackle that yet. Now the game is TOTALLY playable from a fresh install if you just plug in a controller.
 2018-12-16 17:45:49 -05:00
Latapostrophe 25e6d5388c merge conflict 2018-12-16 16:48:15 +01:00
mazmazz f0967520ed Compile fixes; enable PK3 support in addons menu 
* Add missing vars highlightflags, recommendedflags, warningflags from Kart
* V_GetStringColormap() use vanilla behavior because Kart behavior glitches for us
* V_GetStringColormap() made non-static
 2018-12-15 21:44:39 -05:00
mazmazz 37950341ec Merge remote-tracking branch 'public-gitlab/next' into addons-backport 2018-12-15 20:52:46 -05:00
mazmazz b32f50648d Merge branch 'addons_menu' into 'master' 
Addons menu

See merge request KartKrew/Kart!8
 2018-12-15 20:46:42 -05:00
mazmazz df89781623 Windows string adjustment 2018-12-06 15:42:58 -05:00
mazmazz ba60989c00 Adjust version strings 2018-12-06 15:39:19 -05:00
mazmazz f0c7848e50 Use proper DD define for use_joystick 2018-12-06 06:50:18 -05:00
mazmazz 9055c9aeab Hex instead of octal colors 2018-12-05 13:08:25 -05:00
mazmazz c5b349ddc4 More concise bitness check 2018-12-05 13:06:56 -05:00
mazmazz 1ea2fa447a Make the ifdefs cleaner 2018-12-05 13:00:42 -05:00
mazmazz 389c2d4ea1 _WINDOWS instead of _WIN32 for DD 2018-12-05 12:55:05 -05:00
mazmazz a6dcd5555e Add various flags to version string 2018-12-05 11:43:33 -05:00
Monster Iestyn ae14fd2f85 Fix motd being broken for admins 
It turns out the game was sending the full size of the motd buffer (254) rather than just the size of the string made, therefore sending a load of garbage and making the game apparently execute unknown or illegal net commands
 2018-12-04 21:09:28 +00:00
Monster Iestyn e353e2ef70 Merge branch 'next' into 21-version 2018-12-04 17:19:36 +00:00
Monster Iestyn f2b0db5a1c Merge branch 'master' into next 2018-12-04 17:18:19 +00:00
mazmazz c799584f3d Change joystick default to auto-use joystick 1 and joystick 2 if plugged in (like Kart) 2018-12-03 23:36:36 -05:00
TehRealSalt 919667ed39 Just do MapChange hook on G_InitNew 
Everything that's supposed to call it also calls this...
 2018-12-03 00:33:35 -05:00
TehRealSalt aa16edec1d Merge remote-tracking branch 'srb2public/next' into merge-next 2018-12-03 00:31:23 -05:00
Monster Iestyn 33c1ac33f5 Merge branch 'next' into 21-version 
# Conflicts:
#	src/d_netcmd.c
 2018-12-02 15:45:07 +00:00
Jimita 6d7689c1a7
Merge branch 'next' into lua_mapchange 2018-11-30 15:10:59 -02:00
MPC 54cae84849 Change MapChange so Lua returns the map number you change 2018-11-30 14:01:40 -03:00
TehRealSalt d3ecdeb364 Do 800 instead 2018-11-30 03:36:44 -05:00
Sal ce14755156 Merge branch 'rename-cmds' into 'master' 
Rename "giveadmin" and "removeadmin" to "promote" and "demote"

See merge request KartKrew/Kart!117
 2018-11-29 11:18:57 -05:00
wolfy852 f2072b973b Rename "giveadmin" and "removeadmin" to "promote" and "demote" 2018-11-29 07:58:26 -06:00
TehRealSalt 5534017954 Merge remote-tracking branch 'srb2public/next' into merge-next 2018-11-29 08:49:50 -05:00
wolfy852 c517862f7e I must be some kind of idiot. 2018-11-29 07:34:05 -06:00
Wolfy b59718d3ad Remove hardcoded limit on admins 
# Conflicts:
#	src/d_netcmd.c
 2018-11-29 07:05:49 -06:00
Wolfy b8ce51bff2 Multiple admins 
# Conflicts:
#	src/d_netcmd.c
#	src/d_netcmd.h
 2018-11-29 06:46:59 -06:00
toaster 2c8855cd5f Upper-bound restrict the setting of numlaps for sectionrace levels mid-game 2018-11-28 16:45:45 +00:00
Sal 28488cc0dc Merge branch 'netcode-vars-strict' into 'master' 
Make netcode var defaults stricter, add Advanced Server Options

See merge request KartKrew/Kart!110
 2018-11-27 12:27:47 -05:00
Sal cc8af2acdb Merge branch 'better-buffering' into 'master' 
Better vote level buffering

See merge request KartKrew/Kart!109
 2018-11-27 12:25:02 -05:00
TehRealSalt f0b042a4b6 Advanced Server Options menu 
More accessible way of modifying ping limit, timeouts, max file send, etc now that the defaults are stricter
 2018-11-27 12:10:46 -05:00
Monster Iestyn cd57be640c Merge branch '21-controls' into 'next' 
Default control changes for 2.1.21

See merge request STJr/SRB2!343
 2018-11-27 11:50:42 -05:00
TehRealSalt 969801ef09 SEVERELY nerf jointimeout & resynchattempts, too 
All of these previous defaults are "this is an insane time to reach, by that point you might as well disconnect"
 2018-11-27 11:23:28 -05:00
Alam Ed Arias 9a042cd5e2 Merge branch 'master' into next 2018-11-26 19:49:19 -05:00
MonsterIestyn b53cd70201
Merge branch 'next' into PK3-BackportNext 2018-11-26 18:56:51 +00:00
TehRealSalt 478f895ea0 Remove previous commit's votebuffer, allow an external optional buffer to be passed into G_RandMap 
I meant to fix the previous method, but I didn't even understand how it knew it was in a vote or not... so I just did it my own way :V

(Shouldn't FLUSHMAPBUFFEREARLY be on now...?)
 2018-11-26 04:27:31 -05:00
mazmazz 930835f1a2 Dummy out OpenGL loading screen; fix console toggle so it doesn't actually show 2018-11-25 21:47:56 -05:00
Monster Iestyn 1b2aea81dc Merge branch 'master' into next 2018-11-25 20:39:17 +00:00
mazmazz ea7162a76a Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
TehRealSalt 92d5a6b8fb Quick patch-over to dedicated server husk bug 
Whenever a 16th player would join, it would wrap around and overwrite the dedicated server ghost host player. This is possibly a bug in vanilla as well, but it'd only occur at 32 players so it's no wonder no one figured that out. :V

As a quick patch, I just capped cv_maxplayers to MAXPLAYERS-1 in dedicated servers only. To fix this for real, we'd need to give dedicated servers their own player & node instead of clumping in into the start of the normal ones.
 2018-11-25 07:10:45 -05:00
Nev3r 6f5e3d42ff Merge branch 'PK3-Backport' into 'PK3-BackportNext' 
Pk3 backport

See merge request Nev3r/SRB2!1
 2018-11-24 06:02:19 -05:00
Nev3r c548aaa347 Backported PK3 support to 2.1 
Hopefully I'm not missing anything.

Signed-off-by: Nev3r <apophycens@gmail.com>
 2018-11-23 16:58:16 +01:00
TehRealSalt c2c799c885 Change defaults of these 
nettimeout being 10 seconds is INSANITY, and maxping of 500 is when it starts being unplayable (I could also be bargained to raise it to 750 or 1000 though). Not sure if jointimeout causes any freezing, if it does then I'd also like to lower that
 2018-11-22 20:54:28 -05:00
mazmazz 17ff7e69a0 Add chasefreelook to separate third and first person mouselook 2018-11-22 17:05:24 -05:00
toaster c6268253eb The oft-promised buffer fixes. Also, making it so the gametype switch for "Sometimes" is every 10 maps, not a full buffer round (now that it doesn't add to the buffer when you first see it). 
Unfortunately, the code didn't turn out nearly as nice as I'd desired, but things don't always work out.

In addition: For some reason, I rolled Tinkerer's Arena twice within three hits of the Dice voting option, so something's wrong and this branch needs proper, rigorous investigative testing but I don't know what and I'm way too tired (both physically and metaphysically) to investigate any further.
 2018-11-22 17:10:36 +00:00
TehRealSalt 5c67e22c22 Random map buffer only gets added to when 
Needs another temporary buffer for the vote screen so that it doesn't roll dupes
 2018-11-20 00:13:08 -05:00
toaster aa607ecf4c Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into nextmerge_again 
# Conflicts:
#	src/d_clisrv.c
#	src/m_misc.c
 2018-11-18 18:26:50 +00:00
TehRealSalt 7b142dbad1 Updated the one important modified game print that most people see to be more descriptive 
(I could've SWORN there were more...)
 2018-11-18 05:48:10 -05:00
TehRealSalt 0e3b225011 Remove duplicate/removed objects 
As well as other compile errors
 2018-11-18 03:43:33 -05:00
TehRealSalt bd3f398a04 Fix cvar bugs 
- karteliminatelast uses CV_YesNo instead of CV_OnOff
- chatbacktint defaults to on
- soniccd defaults to off
 2018-11-17 20:47:11 -05:00
toaster 56ed67397d * Fix the in-game MS browser thinking gametypes are unknown. 
* Fix the website MS browser mapname output being incomplete.
* Hide hell maps on the website MS browser mapname output.
* (unrelated) tweak Command_Showmap_f's logic for a more accurate name.
 2018-11-17 15:48:10 +00:00
Alam Ed Arias d4cb81cb28 Merge branch 'master' into next 2018-11-14 15:45:29 -05:00
MonsterIestyn 772c072064
Merge branch 'master' into analog-flipcam-synch-fix 2018-11-14 19:36:39 +00:00
Sryder 799efd5b31 Merge branch 'master' of git@git.magicalgirl.moe:KartKrew/Kart.git into nextmerge 2018-11-10 22:29:37 +00:00
toaster aece934083 Fix not found 40833 2018-11-10 22:27:04 +00:00
Sryder 6af56273bf Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into nextmerge 
# Conflicts:
#	src/d_main.c
#	src/d_main.h
#	src/d_netcmd.c
#	src/doomtype.h
#	src/hardware/hw_md2.h
#	src/p_user.c
#	src/r_splats.h
#	src/s_sound.c
#	src/s_sound.h
#	src/screen.c
#	src/sdl/i_system.c
 2018-11-10 21:14:53 +00:00
toaster e1a28bbe1c Three more CV_NOSHOWHELP's I missed the first time around. (Not making another exe for this, it'll show up the next time one is made... not that important.) 2018-11-10 18:50:19 +00:00
Sryder a0165f1ac1 Merge branch 'com_cleanup_redo' into 'master' 
Improved "HELP" command

See merge request KartKrew/Kart!82
 2018-11-10 12:51:51 -05:00
toaster 5b286d89a8 Hide the numlaps change message in record attack. (It plays every time you load a demo of a map with a differing quantity of laps to the default value...) 2018-11-10 12:34:04 +00:00
Monster Iestyn 17223aa520 Merge branch 'master' into next 2018-11-09 16:09:49 +00:00
TehRealSalt 68d2d00a07 Log "Speeding off to level..." 
It's not disruptive, but it looks a bit goofy since the "Map is now x" print is no longer directly printed either, so it's the only thing sticking around in the console :V
 2018-11-08 17:56:26 -05:00
TehRealSalt 69287984db Merge branch 'master' into staff_names 2018-11-08 14:47:38 -05:00
TehRealSalt 499faec555 Merge remote-tracking branch 'srb2public/next' 
(Huge change: NO_MIDI is now a define, simply because that makes it easier for me to resolve merge conflicts if I can see the original code and the new code. Also means that people who REALLY miss MIDI can compile & fix it themselves :P)
 2018-11-07 16:15:14 -05:00
toaster cf16959ad5 Clean but quick: Rename all user-facing things that say "emblem" to say "medal" instead. Don't touch SOC, don't touch code, otherwise we'll be here all year. 2018-11-07 18:05:29 +00:00
toaster 7866e88292 No-show of debug stuff, and make karteliminatelast into a debug to justify its hiding. 2018-11-06 18:54:00 +00:00
toaster bb251c4fbf * Re-add support for command "help" (ie, basically no help at all). 
* Rename "suicide" command to "respawn" so the game doesn't tell you to kill yourself when you try to get help for it.
* Add a "manual" command to open the manual.
 2018-11-05 19:02:34 +00:00
toaster 8d4ce113e4 Redo the help command stuff, this time with much less impact on other areas of the code for sanity as we approach R1. 2018-11-05 12:49:28 +00:00
TehRealSalt ba67c7aa70 Fix for "became a spectator" text repeating 2018-11-02 14:59:26 -04:00
TehRealSalt db731209e5 Fix ENTER GAME option not working 2018-10-31 03:06:36 -04:00