From: Mario <mario.mario@y7mail.com>
Date: Mon, 12 Oct 2020 16:59:55 +0000 (+1000)
Subject: Merge branch 'master' into Mario/arc_bolt_bounce
X-Git-Tag: xonotic-v0.8.5~686^2~5
X-Git-Url: https://git.xonotic.org/?a=commitdiff_plain;h=f3bc9bf3c871a6303784a11b2bcf06be9f124479;hp=86ffc5c159e147eed742ec9169c37cbf137df852;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into Mario/arc_bolt_bounce
---

diff --git a/.tx/merge-base b/.tx/merge-base
index 1ee7cdb84..5737ecab2 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Tue Aug 25 07:23:38 CEST 2020
+Fri Oct  9 07:23:35 CEST 2020
diff --git a/common.pl.po b/common.pl.po
index 8b4d769ab..502eaa351 100644
--- a/common.pl.po
+++ b/common.pl.po
@@ -25,8 +25,8 @@ msgstr ""
 "Project-Id-Version: Xonotic\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-08-09 07:23+0200\n"
-"PO-Revision-Date: 2020-08-09 05:23+0000\n"
-"Last-Translator: divVerent <divVerent@xonotic.org>\n"
+"PO-Revision-Date: 2020-10-08 14:36+0000\n"
+"Last-Translator: Karol Kosek\n"
 "Language-Team: Polish (http://www.transifex.com/team-xonotic/xonotic/"
 "language/pl/)\n"
 "Language: pl\n"
@@ -5722,7 +5722,7 @@ msgstr "Nazwa:"
 #: qcsrc/menu/xonotic/dialog_firstrun.qc:53
 #: qcsrc/menu/xonotic/dialog_multiplayer_profile.qc:62
 msgid "Name under which you will appear in the game"
-msgstr "Nazwa pod, którą pokażesz się w grze"
+msgstr "Nazwa, pod którą pokażesz się w grze"
 
 #: qcsrc/menu/xonotic/dialog_firstrun.qc:69
 msgid "Text language:"
diff --git a/qcsrc/common/weapons/weapon/arc.qc b/qcsrc/common/weapons/weapon/arc.qc
index 44fd539be..cdd89e93d 100644
--- a/qcsrc/common/weapons/weapon/arc.qc
+++ b/qcsrc/common/weapons/weapon/arc.qc
@@ -207,11 +207,14 @@ void W_Arc_Beam_Think(entity this)
 
 	Weapon thiswep = WEP_ARC;
 
+	// TODO: use standard weapon use checks here!
 	if(
 		!IS_PLAYER(own)
 		||
 		IS_DEAD(own)
 		||
+		game_stopped
+		||
 		!weapon_prepareattack_check(thiswep, own, weaponentity, this.beam_bursting, -1)
 		||
 		own.(weaponentity).m_switchweapon != WEP_ARC
diff --git a/qcsrc/server/command/cmd.qc b/qcsrc/server/command/cmd.qc
index 6426ce1a2..ce5557064 100644
--- a/qcsrc/server/command/cmd.qc
+++ b/qcsrc/server/command/cmd.qc
@@ -647,10 +647,13 @@ void ClientCommand_spectate(entity caller, int request)
 						int spec_accepted = VerifyClientEntity(client, false, false);
 						if(spec_accepted > 0 && IS_PLAYER(client))
 						{
+							bool caller_is_observer = (IS_OBSERVER(caller));
 							Spectate(caller, client);
+							if (caller_is_observer)
+								TRANSMUTE(Spectator, caller);
 						}
 						else
-							sprint(caller, "can't spectate ", argv(1), "^7\n");
+							sprint(caller, "Can't spectate ", argv(1), "^7\n");
 					}
 					else
 						sprint(caller, "cmd spectate client only works when you are spectator/observer\n");