• R/O
  • SSH

コミット

タグ
未設定

よく使われているワード(クリックで追加)

javac++androidlinuxc#windowsobjective-ccocoa誰得qtpythonphprubygameguibathyscaphec計画中(planning stage)翻訳omegatframeworktwitterdomtestvb.netdirectxゲームエンジンbtronarduinopreviewer

コミットメタ情報

リビジョン971c9fa0ecad38ff28e12874609001f55d59241a (tree)
日時2022-03-08 23:23:23
作者Léonard <hobbax3@gmai...>
コミッターLéonard

ログメッセージ

Merged with 3.1.

変更サマリ

差分

diff -r 88b99ea5632e -r 971c9fa0ecad src/sv_main.cpp
--- a/src/sv_main.cpp Tue Mar 08 15:19:49 2022 +0100
+++ b/src/sv_main.cpp Tue Mar 08 15:23:23 2022 +0100
@@ -286,7 +286,7 @@
286286
287287 //*****************************************************************************
288288 // [AK] Smooths the movement of lagging players using extrapolation and correction.
289-CUSTOM_CVAR( Int, sv_smoothplayers, 0, CVAR_ARCHIVE|CVAR_NOSETBYACS|CVAR_SERVERINFO )
289+CUSTOM_CVAR( Int, sv_smoothplayers, 0, CVAR_ARCHIVE|CVAR_NOSETBYACS|CVAR_SERVERINFO|CVAR_DEBUGONLY )
290290 {
291291 // [AK] We can't extrapolate for a negative number of tics.
292292 if ( self < 0 )
@@ -1422,7 +1422,7 @@
14221422 SERVERCOMMANDS_SetCVar( sv_hostname, g_lCurrentClient, SVCF_ONLYTHISCLIENT );
14231423
14241424 // [AK] Send the current state of the skip correction.
1425- SERVERCOMMANDS_SetCVar( sv_smoothplayers, g_lCurrentClient, SVCF_ONLYTHISCLIENT );
1425+ // SERVERCOMMANDS_SetCVar( sv_smoothplayers, g_lCurrentClient, SVCF_ONLYTHISCLIENT );
14261426
14271427 // Send dmflags.
14281428 SERVERCOMMANDS_SetGameDMFlags( g_lCurrentClient, SVCF_ONLYTHISCLIENT );
diff -r 88b99ea5632e -r 971c9fa0ecad src/version.h
--- a/src/version.h Tue Mar 08 15:19:49 2022 +0100
+++ b/src/version.h Tue Mar 08 15:23:23 2022 +0100
@@ -50,7 +50,7 @@
5050 #define GAME_MAJOR_VERSION 3
5151 #define GAME_MINOR_VERSION 1
5252 #define GAMEVER_STRING "3.1"
53-#define DOTVERSIONSTR GAMEVER_STRING "-alpha"
53+#define DOTVERSIONSTR GAMEVER_STRING
5454 #define VERSIONSTR DOTVERSIONSTR "-ZCC" ZCCVERSIONSTR
5555
5656 // [BB] The version string that includes revision / compatibility data.
@@ -69,8 +69,8 @@
6969 #define BUILD_PRIVATE 3
7070
7171 // [RC] Release code ID for this build.
72-#define BUILD_ID BUILD_INTERNAL
73-#define BUILD_ID_STR "Internal" // Used in the exe's metadata.
72+#define BUILD_ID BUILD_RELEASE
73+#define BUILD_ID_STR "Release" // Used in the exe's metadata.
7474
7575 // Version identifier for network games.
7676 // Bump it every time you do a release unless you're certain you
diff -r 88b99ea5632e -r 971c9fa0ecad wadsrc/static/menudef.za
--- a/wadsrc/static/menudef.za Tue Mar 08 15:19:49 2022 +0100
+++ b/wadsrc/static/menudef.za Tue Mar 08 15:23:23 2022 +0100
@@ -624,7 +624,7 @@
624624 Option "Require login to join", "sv_forcelogintojoin", "YesNo"
625625 StaticText " "
626626 Option "Allow private chat", "sv_allowprivatechat", "ZA_AllowPrivateChat"
627- Option "Smooth lagging players", "sv_smoothplayers", "ZA_ExtrapolateLimit"
627+ // Option "Smooth lagging players", "sv_smoothplayers", "ZA_ExtrapolateLimit"
628628 NumberField "Max connected clients", "sv_maxclients", 0, 64
629629 NumberField "Max players", "sv_maxplayers", 0, 64
630630 NumberField "Max idle time (minutes)", "sv_afk2spec", 0, 30