Resolved merge conflicts. #17

Open
anomaly wants to merge 26 commits from anomaly/iw6-mod:master into master
Showing only changes of commit 38d8148c82 - Show all commits
+2 -2
View File
@@ -633,8 +633,8 @@ namespace demo_sv_recording
// capture outgoing packets to client // capture outgoing packets to client
SV_Netchan_Transmit_hook.create(game::SV_Netchan_Transmit, sv_capture_data); SV_Netchan_Transmit_hook.create(game::SV_Netchan_Transmit, sv_capture_data);
// execute server demo code based on this value; if it's is enabled mid-match, // execute server demo code based on this value
// then the demos recorded during that match (if any) are likely corrupt! // if this was enabled after a player joined the server, then that match cannot be recorded for that player
sv_demos = game::Dvar_RegisterBool( sv_demos = game::Dvar_RegisterBool(
"sv_demos", false, game::DVAR_FLAG_NONE, "Enable server demos"); "sv_demos", false, game::DVAR_FLAG_NONE, "Enable server demos");