Merge branch 'mirceakitsune/fix_damageeffects' into 'master'

Get damage effects working again

Closes #2022

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e6e7d5b3cc8f05ef79fc1daa3605fd7e376c0b3c..fa3b05defc7743b67a527d7aed3dcbed7576498d 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -29,7 +29,7 @@ test_sv_game:
     - wget -O data/maps/stormkeep.waypoints https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/stormkeep.waypoints
     - wget -O data/maps/stormkeep.waypoints.cache https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/stormkeep.waypoints.cache
     - make
-    - EXPECT=1c17d1c4e3c98de30d9bec68a635f600
+    - EXPECT=d6e01eaffcd909210422a0349bbe4918
     - HASH=$(${ENGINE} -noconfig -nohome +exec serverbench.cfg
       | tee /dev/stderr
       | grep '^:'

diff --git a/.tx/merge-base b/.tx/merge-base
index d7ed269dfef0c535008da5052250347cada056b0..ce28e5a3fe814ab19fc5d6828b581665269390e3 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Fri Mar  8 07:24:17 CET 2019
+Wed Mar 13 07:24:16 CET 2019

diff --git a/common.uz@Latn.po b/common.uz@Latn.po
index f83bdf3c523d83b10327d225695fd02028dfe5af..20e7991605c09c8e3d95f4b4f49768eb0b6b438b 100644 (file)
--- a/common.uz@Latn.po
+++ b/common.uz@Latn.po
@@ -11,7 +11,7 @@ msgstr ""
 "PO-Revision-Date: 2019-01-27 06:23+0000\n"
 "Last-Translator: divVerent <divVerent@xonotic.org>\n"
 "Language-Team: Uzbek (Latin) (http://www.transifex.com/team-xonotic/xonotic/"
-"language/uz%40Latn/)\n"
+"language/uz@Latn/)\n"
 "Language: uz@Latn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

diff --git a/common.zh_CN.po b/common.zh_CN.po
index b17544e0ade78db80d1d132ab88aada254b5d5de..44ced56bdd3506a47fbfe4b77289d2c0c52fb5a6 100644 (file)
--- a/common.zh_CN.po
+++ b/common.zh_CN.po
@@ -11,13 +11,14 @@
 # sapphireliu <balancedliu@gmail.com>, 2014
 # 杜茂森 <dumaosen_main01@outlook.com>, 2018-2019
 # 杜茂森 <dumaosen_main01@outlook.com>, 2018
+# 韬 刘 <jiegushijia@gmail.com>, 2019
 msgid ""
 msgstr ""
 "Project-Id-Version: Xonotic\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-01-27 07:23+0100\n"
-"PO-Revision-Date: 2019-02-26 07:06+0000\n"
-"Last-Translator: 杜茂森 <dumaosen_main01@outlook.com>\n"
+"PO-Revision-Date: 2019-03-09 14:18+0000\n"
+"Last-Translator: 韬 刘 <jiegushijia@gmail.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/team-xonotic/"
 "xonotic/language/zh_CN/)\n"
 "Language: zh_CN\n"
@@ -393,7 +394,7 @@ msgstr "QMCMD^设定"
 #: qcsrc/client/hud/panel/quickmenu.qc:814
 #: qcsrc/client/hud/panel/quickmenu.qc:821
 msgid "QMCMD^View/HUD settings"
-msgstr ""
+msgstr "QMCMD^视角/HUD设置"
 
 #: qcsrc/client/hud/panel/quickmenu.qc:815
 msgid "QMCMD^3rd person view"
@@ -573,7 +574,7 @@ msgstr ""
 
 #: qcsrc/client/hud/panel/scoreboard.qc:90
 msgid "Number of deaths"
-msgstr ""
+msgstr "死亡次数"
 
 #: qcsrc/client/hud/panel/scoreboard.qc:90
 msgid "SCO^deaths"
@@ -728,7 +729,7 @@ msgstr ""
 #: qcsrc/client/hud/panel/scoreboard.qc:110
 #: qcsrc/client/hud/panel/scoreboard.qc:111
 msgid "Player name"
-msgstr ""
+msgstr "玩家名称"
 
 #: qcsrc/client/hud/panel/scoreboard.qc:110
 msgid "SCO^name"
@@ -817,11 +818,11 @@ msgstr "SCO^分数"
 
 #: qcsrc/client/hud/panel/scoreboard.qc:121
 msgid "Total score"
-msgstr ""
+msgstr "总分数"
 
 #: qcsrc/client/hud/panel/scoreboard.qc:122
 msgid "Number of suicides"
-msgstr ""
+msgstr "自杀次数"
 
 #: qcsrc/client/hud/panel/scoreboard.qc:122
 msgid "SCO^suicides"
@@ -8865,7 +8866,7 @@ msgstr ""
 
 #: qcsrc/menu/xonotic/keybinder.qc:37
 msgid "jetpack"
-msgstr ""
+msgstr "喷气背包"
 
 #: qcsrc/menu/xonotic/keybinder.qc:39
 msgid "Attacking"
@@ -9247,7 +9248,7 @@ msgstr ""
 
 #: qcsrc/menu/xonotic/statslist.qc:110
 msgid "Time played:"
-msgstr ""
+msgstr "游戏时间："
 
 #: qcsrc/menu/xonotic/statslist.qc:117 qcsrc/menu/xonotic/statslist.qc:230
 msgid "Favorite map:"
@@ -9272,7 +9273,7 @@ msgstr ""
 #: qcsrc/menu/xonotic/statslist.qc:166
 #, c-format
 msgid "Kills/Deaths:"
-msgstr ""
+msgstr "击杀/死亡："
 
 #: qcsrc/menu/xonotic/statslist.qc:172
 #, c-format

diff --git a/languages.txt b/languages.txt
index 67a63488ac77db29ecbd6d3225da50a3b4812dcb..ed6fcfcc888d6986acde9a35c8cc28ced7eed732 100644 (file)
--- a/languages.txt
+++ b/languages.txt
@@ -20,6 +20,6 @@ bg    "Bulgarian" "Български" 63%
 ru    "Russian" "Русский" 100%
 sr    "Serbian" "Српски" 66%
 uk    "Ukrainian" "Українська" 53%
-zh_CN "Chinese (China)" "中文" 59%
+zh_CN "Chinese (China)" "中文" 60%
 zh_TW "Chinese (Taiwan)" "國語" 65%
 ko    "Korean" "한국의" 32%

diff --git a/qcsrc/client/main.qc b/qcsrc/client/main.qc
index 96b3caa75e3b8efbe5585da89e65ff85de0b4399..6cee9dfcbc4112cdea55e728862c72ab8e333741 100644 (file)
--- a/qcsrc/client/main.qc
+++ b/qcsrc/client/main.qc
@@ -226,7 +226,7 @@ void Shutdown()
 
        localcmd("\ncl_hook_shutdown\n");
 
-       localcmd("\n-button14\n");
+       localcmd("\n-button12\n");
 
        deactivate_minigame();
        HUD_MinigameMenu_Close(NULL, NULL, NULL);

diff --git a/qcsrc/client/view.qc b/qcsrc/client/view.qc
index 5efd863bd6a54d7ef864b55f4f5ed6c59fbbee09..be4b8f4a9674071b287b0e535b0b157b3a609120 100644 (file)
--- a/qcsrc/client/view.qc
+++ b/qcsrc/client/view.qc
@@ -2021,13 +2021,13 @@ void CSQC_UpdateView(entity this, float w, float h)
        {
                if(!minigame_wasactive)
                {
-                       localcmd("+button14\n");
+                       localcmd("+button12\n");
                        minigame_wasactive = true;
                }
        }
        else if(minigame_wasactive)
        {
-               localcmd("-button14\n");
+               localcmd("-button12\n");
                minigame_wasactive = false;
        }
 

diff --git a/qcsrc/common/ent_cs.qc b/qcsrc/common/ent_cs.qc
index 23790b5e4898ea31cf34bf4a0789ba4abb3d06d1..f4ef79eda495f5e064ed81146b7e0fb24dacca9c 100644 (file)
--- a/qcsrc/common/ent_cs.qc
+++ b/qcsrc/common/ent_cs.qc
@@ -181,7 +181,6 @@ ENTCS_PROP(FRAGS, true, frags, ENTCS_SET_NORMAL,
                WriteShort(chan, sf);
                FOREACH(EntCSProps, sf & BIT(it.m_id),
                {
-                       it.m_set(this, player);
                        it.m_send(chan, this);
                });
                return true;
@@ -195,9 +194,10 @@ ENTCS_PROP(FRAGS, true, frags, ENTCS_SET_NORMAL,
        void entcs_think(entity this)
        {
                this.nextthink = time + 0.033333333333;  // TODO: increase this to like 0.15 once the client can do smoothing
-               entity o = this.owner;
-               FOREACH(EntCSProps, it.m_check(this, o),
+               entity player = this.owner;
+               FOREACH(EntCSProps, it.m_check(this, player),
                {
+                       it.m_set(this, player);
                        this.SendFlags |= BIT(it.m_id);
                });
                setorigin(this, this.origin); // relink
@@ -210,6 +210,11 @@ ENTCS_PROP(FRAGS, true, frags, ENTCS_SET_NORMAL,
                setthink(e, entcs_think);
                e.nextthink = time;
                Net_LinkEntity(e, false, 0, entcs_send);
+               if (!IS_REAL_CLIENT(player)) return;
+               FOREACH_CLIENT(true, {
+                       assert(CS(it).entcs);
+                       _entcs_send(CS(it).entcs, msg_entity = player, BITS(23), MSG_ONE);
+               });
        }
 
        void entcs_detach(entity player)

diff --git a/qcsrc/common/gamemodes/gamemode/ctf/sv_ctf.qc b/qcsrc/common/gamemodes/gamemode/ctf/sv_ctf.qc
index 6dd1b1e9020ae9b18ddc39479472e8b371a4b8b9..08bb7be948962f2d5c366cef5eab990f2853473d 100644 (file)
--- a/qcsrc/common/gamemodes/gamemode/ctf/sv_ctf.qc
+++ b/qcsrc/common/gamemodes/gamemode/ctf/sv_ctf.qc
@@ -1162,7 +1162,8 @@ void ctf_RespawnFlag(entity flag)
        setattachment(flag, NULL, "");
        setorigin(flag, flag.ctf_spawnorigin);
 
-       set_movetype(flag, ((flag.noalign) ? MOVETYPE_NONE : MOVETYPE_TOSS));
+       //set_movetype(flag, ((flag.noalign) ? MOVETYPE_NONE : MOVETYPE_TOSS)); // would be desired, except maps that want floating flags have it set to fall!
+       set_movetype(flag, MOVETYPE_NONE); // match the initial setup handling (flag doesn't move when spawned)
        flag.takedamage = DAMAGE_NO;
        SetResourceExplicit(flag, RES_HEALTH, flag.max_flag_health);
        flag.solid = SOLID_TRIGGER;

diff --git a/qcsrc/common/physics/player.qh b/qcsrc/common/physics/player.qh
index 9ecf7eab71ed436c9d5e51be8246b4818474440f..97a4224233e3c4c55f9b0a4d0b80b1b50a2e0d07 100644 (file)
--- a/qcsrc/common/physics/player.qh
+++ b/qcsrc/common/physics/player.qh
@@ -109,7 +109,7 @@ bool IsFlying(entity a);
 #define PHYS_INPUT_BUTTON_ZOOMSCRIPT(s)     PHYS_INPUT_BUTTON_BUTTON9(s)
 #define PHYS_INPUT_BUTTON_JETPACK(s)        PHYS_INPUT_BUTTON_BUTTON10(s)
 #define PHYS_INPUT_BUTTON_DODGE(s)                     PHYS_INPUT_BUTTON_BUTTON11(s)
-#define PHYS_INPUT_BUTTON_MINIGAME(s)          PHYS_INPUT_BUTTON_BUTTON14(s)
+#define PHYS_INPUT_BUTTON_MINIGAME(s)          PHYS_INPUT_BUTTON_BUTTON12(s)
 
 #ifdef CSQC
 STATIC_INIT(PHYS_INPUT_BUTTON)

diff --git a/qcsrc/lib/spawnfunc.qh b/qcsrc/lib/spawnfunc.qh
index bf8eeb34b0eaafa268f24cfb7ca6e2396858352c..e2a25cbc76ef3ec1b8e2f674b1793f0d2eccc744 100644 (file)
--- a/qcsrc/lib/spawnfunc.qh
+++ b/qcsrc/lib/spawnfunc.qh
@@ -154,6 +154,7 @@ noref bool require_spawnfunc_prefix;
                FIELD_SCALAR(fld, lodmodel1) \
                FIELD_SCALAR(fld, ltime) \
                FIELD_SCALAR(fld, map) \
+               FIELD_SCALAR(fld, max_health) \
                FIELD_SCALAR(fld, mdl) \
                FIELD_SCALAR(fld, message2) \
                FIELD_SCALAR(fld, message) \

diff --git a/qcsrc/server/client.qc b/qcsrc/server/client.qc
index f8d10564591b96aca42b9cb13a2d15595b5986d5..55d47dbba1dfec6e0d2bb6449ba1ef0665572716 100644 (file)
--- a/qcsrc/server/client.qc
+++ b/qcsrc/server/client.qc
@@ -3027,7 +3027,7 @@ void PM_UpdateButtons(entity this, entity store)
                store.impulse = this.impulse;
        this.impulse = 0;
 
-       bool typing = this.buttonchat || this.button14;
+       bool typing = this.buttonchat || this.button12;
 
        store.button0 = (typing) ? 0 : this.button0;
        //button1?!