Merge branch 'bones_was_here/timeout_stuff' into 'master'

Allow vcall timein during a timeout, and reset slowmo if SVQC shuts down during a timeout

See merge request xonotic/xonotic-data.pk3dir!830

diff --git a/.tx/merge-base b/.tx/merge-base
index 39a8b0fcd0567368d85cc9c0def0668e4314fe8b..42ea6ccdca27a01ccd61f46e5a32691c4351af7f 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sun Jun 14 07:24:55 CEST 2020
+Sat Jun 20 07:23:43 CEST 2020

diff --git a/binds-xonotic.cfg b/binds-xonotic.cfg
index 3046579ae4788b2524c51474aaf8b86590d10ead..578aecd62c1e484d549c1fdbda4383e3947ba9d9 100644 (file)
--- a/binds-xonotic.cfg
+++ b/binds-xonotic.cfg
@@ -1,11 +1,11 @@
 // alias for switching the teamselect menu
-bind f5 menu_showteamselect
+bind F5 menu_showteamselect
 
-bind f6 team_auto
+bind F6 team_auto
 
-bind f7 menu_showsandboxtools
-bind f8 "quickmenu"
-bind f9 "cl_cmd hud minigame"
+bind F7 menu_showsandboxtools
+bind F8 "quickmenu"
+bind F9 "cl_cmd hud minigame"
 
 // movement
 bind w +forward

diff --git a/commands.cfg b/commands.cfg
index 9218af379ebd818c7dc8f68d3ab3066e957684fb..1306f306bb82275d76dba67712f4f25e55e7de40 100644 (file)
--- a/commands.cfg
+++ b/commands.cfg
@@ -63,7 +63,7 @@ alias dumpnotifs           "qc_cmd_svmenu dumpnotifs           ${* ?}" // Dump a
 alias dumpitems            "qc_cmd_svmenu dumpitems            ${* ?}" // Dump all items to the console
 alias dumpturrets          "qc_cmd_svmenu dumpturrets          ${* ?}" // Dump all turrets into turrets_dump.txt
 alias dumpweapons          "qc_cmd_svmenu dumpweapons          ${* ?}" // Dump all weapons into weapons_dump.txt
-alias find                 "qc_cmd_svmenu find                 ${* ?}" // Search through entities for matching classname
+alias findent              "qc_cmd_svmenu findent              ${* ?}" // Search through entities for matching classname
 alias findat               "qc_cmd_svmenu findat               ${* ?}" // Search through entities for matching origin
 alias maplist              "qc_cmd_svmenu maplist              ${* ?}" // Automatic control of maplist
 alias mx                   "qc_cmd_svmenu mx                   ${* ?}" // Send a matrix command

diff --git a/common.ja_JP.po b/common.ja_JP.po
index 99c47d82e2f9943b00a926cf11862f6bb3a944c9..f880b2805ac7ed135d923918bee985afb05b3f50 100644 (file)
--- a/common.ja_JP.po
+++ b/common.ja_JP.po
@@ -10,8 +10,8 @@ msgstr ""
 "Project-Id-Version: Xonotic\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-07 07:23+0200\n"
-"PO-Revision-Date: 2020-06-07 05:23+0000\n"
-"Last-Translator: divVerent <divVerent@xonotic.org>\n"
+"PO-Revision-Date: 2020-06-17 03:18+0000\n"
+"Last-Translator: Space Ace <scocasso@hotmail.com>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/team-xonotic/"
 "xonotic/language/ja_JP/)\n"
 "Language: ja_JP\n"
@@ -23,12 +23,12 @@ msgstr ""
 #: qcsrc/client/hud/hud_config.qc:81
 #, c-format
 msgid "^2Successfully exported to %s! (Note: It's saved in data/data/)"
-msgstr ""
+msgstr "^2%sへの書き出すに成功! (註: data/data/ に保存さる)"
 
 #: qcsrc/client/hud/hud_config.qc:85
 #, c-format
 msgid "^1Couldn't write to %s"
-msgstr ""
+msgstr "^1%sへ書かなかった"
 
 #: qcsrc/client/hud/panel/centerprint.qc:174
 #, c-format
@@ -77,7 +77,7 @@ msgstr ""
 #: qcsrc/client/hud/panel/infomessages.qc:108
 #: qcsrc/menu/xonotic/keybinder.qc:47
 msgid "primary fire"
-msgstr ""
+msgstr "一次撃つ"
 
 #: qcsrc/client/hud/panel/infomessages.qc:110
 #, c-format
@@ -87,12 +87,12 @@ msgstr ""
 #: qcsrc/client/hud/panel/infomessages.qc:110
 #: qcsrc/client/hud/panel/infomessages.qc:114
 msgid "next weapon"
-msgstr ""
+msgstr "次の武器"
 
 #: qcsrc/client/hud/panel/infomessages.qc:110
 #: qcsrc/client/hud/panel/infomessages.qc:114
 msgid "previous weapon"
-msgstr ""
+msgstr "前の兵器"
 
 #: qcsrc/client/hud/panel/infomessages.qc:114
 #, c-format
@@ -107,12 +107,12 @@ msgstr ""
 #: qcsrc/client/hud/panel/infomessages.qc:116
 #: qcsrc/common/vehicles/cl_vehicles.qc:190
 msgid "drop weapon"
-msgstr ""
+msgstr "兵器を落と"
 
 #: qcsrc/client/hud/panel/infomessages.qc:116
 #: qcsrc/menu/xonotic/keybinder.qc:48
 msgid "secondary fire"
-msgstr ""
+msgstr "二次撃つ"
 
 #: qcsrc/client/hud/panel/infomessages.qc:119
 #, c-format
@@ -142,7 +142,7 @@ msgstr ""
 #: qcsrc/client/hud/panel/infomessages.qc:139
 #: qcsrc/common/notifications/all.qh:430
 msgid "jump"
-msgstr ""
+msgstr "飛ぶ"
 
 #: qcsrc/client/hud/panel/infomessages.qc:147
 #, c-format
@@ -151,37 +151,37 @@ msgstr ""
 
 #: qcsrc/client/hud/panel/infomessages.qc:153
 msgid "^2Currently in ^1warmup^2 stage!"
-msgstr ""
+msgstr "^2現在、^1準備運動^2の段階に入っています!"
 
 #: qcsrc/client/hud/panel/infomessages.qc:168
 #, c-format
 msgid "%sPress ^3%s%s to end warmup"
-msgstr ""
+msgstr "%s^3%s%sを押して準備運動を終了します"
 
 #: qcsrc/client/hud/panel/infomessages.qc:168
 #: qcsrc/client/hud/panel/infomessages.qc:170
 #: qcsrc/client/hud/panel/infomessages.qc:183
 #: qcsrc/menu/xonotic/keybinder.qc:99
 msgid "ready"
-msgstr ""
+msgstr "準備"
 
 #: qcsrc/client/hud/panel/infomessages.qc:170
 #, c-format
 msgid "%sPress ^3%s%s once you are ready"
-msgstr ""
+msgstr "%s準備ができたら^3%s%sを押します"
 
 #: qcsrc/client/hud/panel/infomessages.qc:175
 msgid "^2Waiting for others to ready up to end warmup..."
-msgstr ""
+msgstr "^2準備演習が終了する前に、全員の準備ができるまで待ちます..."
 
 #: qcsrc/client/hud/panel/infomessages.qc:177
 msgid "^2Waiting for others to ready up..."
-msgstr ""
+msgstr "^2全員の準備ができるまで待ちます..."
 
 #: qcsrc/client/hud/panel/infomessages.qc:183
 #, c-format
 msgid "^2Press ^3%s^2 to end warmup"
-msgstr ""
+msgstr "^2^3%s^2を押して準備運動を終了します"
 
 #: qcsrc/client/hud/panel/infomessages.qc:204
 msgid "Teamnumbers are unbalanced!"
@@ -8206,11 +8206,11 @@ msgstr ""
 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:173
 #: qcsrc/menu/xonotic/dialog_settings_game_hudconfirm.qh:6
 msgid "Enter HUD editor"
-msgstr ""
+msgstr "ヘッドアップディスプレイ(HUD)の編集者に入る"
 
 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qh:7
 msgid "HUD"
-msgstr ""
+msgstr "ハッド(HUD)"
 
 #: qcsrc/menu/xonotic/dialog_settings_game_hudconfirm.qc:21
 msgid "In order for the HUD editor to show, you must first be in game."

diff --git a/common.ru.po b/common.ru.po
index 66972d4309158053fec40109502ebd090e781236..67ac77581e7cb9a1bcb66f8cff9ba233d8b93714 100644 (file)
--- a/common.ru.po
+++ b/common.ru.po
@@ -19,7 +19,7 @@ msgstr ""
 "Project-Id-Version: Xonotic\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-07 07:23+0200\n"
-"PO-Revision-Date: 2020-06-08 06:05+0000\n"
+"PO-Revision-Date: 2020-06-19 13:24+0000\n"
 "Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n"
 "Language-Team: Russian (http://www.transifex.com/team-xonotic/xonotic/"
 "language/ru/)\n"
@@ -3442,12 +3442,12 @@ msgstr "^BGУ %s^K1 завяли уши от собственной игры @!#
 #: qcsrc/common/notifications/all.inc:508
 #, c-format
 msgid "^BG%s%s^K1 has been sublimated by ^BG%s^K1's Vaporizer%s%s"
-msgstr "^BG%s%s^K1 пÑ\80еобÑ\80азован в паÑ\80 Испарителем ^BG%s^K1%s%s"
+msgstr "^BG%s%s^K1 бÑ\8bл Ñ\81Ñ\83блимиÑ\80ован Испарителем ^BG%s^K1%s%s"
 
 #: qcsrc/common/notifications/all.inc:509
 #, c-format
 msgid "^BG%s%s^K1 has been vaporized by ^BG%s^K1's Vortex%s%s"
-msgstr "^BG%s%s^K1 испарён с помощью Вихря ^BG%s^K1%s%s"
+msgstr "^BG%s%s^K1 бÑ\8bл иÑ\81паÑ\80Ñ\91н Ñ\81 помоÑ\89Ñ\8cÑ\8e Ð\92иÑ\85Ñ\80Ñ\8f ^BG%s^K1%s%s"
 
 #: qcsrc/common/notifications/all.inc:528
 msgid "^F4You are now alone!"

diff --git a/qcsrc/client/shownames.qc b/qcsrc/client/shownames.qc
index 87633056de69b7dbb52e5916b6447352fb3acda7..8d219c5444b03ebf9c1e0a3afbaa7ce0a3d5b200 100644 (file)
--- a/qcsrc/client/shownames.qc
+++ b/qcsrc/client/shownames.qc
@@ -213,7 +213,7 @@ void Draw_ShowNames_All()
                        it.sameteam = false;
                }
                bool dead = entcs_IsDead(i) || entcs_IsSpectating(i);
-               if (!it.csqcmodel_isdead || it.alpha > 0)
+               if ((!it.csqcmodel_isdead || it.alpha > 0) && entcs.origin != it.origin)
                        setorigin(it, entcs.origin);
                it.csqcmodel_isdead = dead;
                Draw_ShowNames(it);

diff --git a/qcsrc/common/debug.qh b/qcsrc/common/debug.qh
index 49b6a5787a2ddd0e1301448b78b2062523bd10bf..b349e22f2b7a1419bc62097f1ae6fd89fd587d61 100644 (file)
--- a/qcsrc/common/debug.qh
+++ b/qcsrc/common/debug.qh
@@ -335,7 +335,7 @@ STATIC_INIT(TRACE_ENT)
 #endif
 
 
-GENERIC_COMMAND(find, "Search through entities for matching classname", false)
+GENERIC_COMMAND(findent, "Search through entities for matching classname", false)
 {
        switch (request)
        {

diff --git a/qcsrc/common/mapobjects/func/door.qc b/qcsrc/common/mapobjects/func/door.qc
index 57faf51455f18f0c47b5732dbf199045d73ed27d..11196ab38d7f2bbcce2418a3bfd3f201be84bed4 100644 (file)
--- a/qcsrc/common/mapobjects/func/door.qc
+++ b/qcsrc/common/mapobjects/func/door.qc
@@ -737,7 +737,10 @@ spawnfunc(func_door)
         }
         else if (!this.speed)
         {
-                this.speed = 100;
+               if (autocvar_sv_q3defragcompat)
+                       this.speed = 400;
+               else
+                       this.speed = 100;
         }
 
        settouch(this, door_touch);

diff --git a/qcsrc/common/monsters/sv_monsters.qc b/qcsrc/common/monsters/sv_monsters.qc
index d85b16b0e7988d92d694e6e7911bc4f489913d4b..4c2b5ff269a601b1ff502f3977f97af5552aa532 100644 (file)
--- a/qcsrc/common/monsters/sv_monsters.qc
+++ b/qcsrc/common/monsters/sv_monsters.qc
@@ -1166,7 +1166,8 @@ void Monster_Frozen_Think(entity this)
        {
                STAT(REVIVE_PROGRESS, this) = bound(0, STAT(REVIVE_PROGRESS, this) + this.ticrate * this.revive_speed, 1);
                SetResourceExplicit(this, RES_HEALTH, max(1, STAT(REVIVE_PROGRESS, this) * this.max_health));
-               this.iceblock.alpha = bound(0.2, 1 - STAT(REVIVE_PROGRESS, this), 1);
+               if (this.iceblock)
+                       this.iceblock.alpha = bound(0.2, 1 - STAT(REVIVE_PROGRESS, this), 1);
 
                if(!(this.spawnflags & MONSTERFLAG_INVINCIBLE) && this.sprite)
                        WaypointSprite_UpdateHealth(this.sprite, GetResource(this, RES_HEALTH));

diff --git a/qcsrc/server/client.qc b/qcsrc/server/client.qc
index fe2952711f9cd8970ad815f6fa7fd091cbe7ee9c..ea2a62977a331981e2d98809bab83a40a35bd2c8 100644 (file)
--- a/qcsrc/server/client.qc
+++ b/qcsrc/server/client.qc
@@ -2474,7 +2474,8 @@ void PlayerPreThink (entity this)
                {
                        STAT(REVIVE_PROGRESS, this) = bound(0, STAT(REVIVE_PROGRESS, this) + frametime * this.revive_speed, 1);
                        SetResourceExplicit(this, RES_HEALTH, max(1, STAT(REVIVE_PROGRESS, this) * start_health));
-                       this.iceblock.alpha = bound(0.2, 1 - STAT(REVIVE_PROGRESS, this), 1);
+                       if (this.iceblock)
+                               this.iceblock.alpha = bound(0.2, 1 - STAT(REVIVE_PROGRESS, this), 1);
 
                        if (STAT(REVIVE_PROGRESS, this) >= 1)
                                Unfreeze(this, false);

diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc
index e5363db7738fd9a79b5206fbcaa0262110350a49..48aa78bcfba7ee17974aeb71a8f2ebb0c882653a 100644 (file)
--- a/qcsrc/server/g_damage.qc
+++ b/qcsrc/server/g_damage.qc
@@ -468,7 +468,9 @@ void Ice_Think(entity this)
                delete(this);
                return;
        }
-       setorigin(this, this.owner.origin - '0 0 16');
+       vector ice_org = this.owner.origin - '0 0 16';
+       if (this.origin != ice_org)
+               setorigin(this, ice_org);
        this.nextthink = time;
 }
 
@@ -494,6 +496,7 @@ void Freeze(entity targ, float revivespeed, int frozen_type, bool show_waypoint)
        entity ice = new(ice);
        ice.owner = targ;
        ice.scale = targ.scale;
+       // set_movetype(ice, MOVETYPE_FOLLOW) would rotate the ice model with the player
        setthink(ice, Ice_Think);
        ice.nextthink = time;
        ice.frame = floor(random() * 21); // ice model has 20 different looking frames