From: Mario <mario@smbclan.net>
Date: Mon, 17 Jul 2017 15:59:38 +0000 (+1000)
Subject: Merge master into Mario/monsters
X-Git-Tag: xonotic-v0.8.5~7^2~1^2~79
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=4fafc8aaaed0413c1efc3b85686dcd817ebed6a8;p=xonotic%2Fxonotic-data.pk3dir.git

Merge master into Mario/monsters
---

4fafc8aaaed0413c1efc3b85686dcd817ebed6a8
diff --cc qcsrc/common/weapons/projectiles.qh
index 0000000000,73cd00d6c1..1921f7341b
mode 000000,100644..100644
--- a/qcsrc/common/weapons/projectiles.qh
+++ b/qcsrc/common/weapons/projectiles.qh
@@@ -1,0 -1,43 +1,43 @@@
+ #pragma once
+ 
+ const int PROJECTILE_ELECTRO = 1;
+ const int PROJECTILE_ROCKET = 2;
+ const int PROJECTILE_TAG = 3;
+ const int PROJECTILE_CRYLINK = 5;
+ const int PROJECTILE_ELECTRO_BEAM = 6;
+ const int PROJECTILE_GRENADE = 7;
+ const int PROJECTILE_GRENADE_BOUNCING = 8;
+ const int PROJECTILE_MINE = 9;
+ const int PROJECTILE_BLASTER = 10;
+ const int PROJECTILE_HLAC = 11;
+ const int PROJECTILE_SEEKER = 12;
+ const int PROJECTILE_FLAC = 13;
+ const int PROJECTILE_PORTO_RED = 14;
+ const int PROJECTILE_PORTO_BLUE = 15;
+ const int PROJECTILE_HOOKBOMB = 16;
+ const int PROJECTILE_HAGAR = 17;
+ const int PROJECTILE_HAGAR_BOUNCING = 18;
+ const int PROJECTILE_CRYLINK_BOUNCING = 20;
+ const int PROJECTILE_FIREBALL = 21;
+ const int PROJECTILE_FIREMINE = 22;
+ 
+ const int PROJECTILE_RAPTORCANNON = 24;
+ const int PROJECTILE_RAPTORBOMB = 25;
+ const int PROJECTILE_RAPTORBOMBLET = 26;
+ const int PROJECTILE_SPIDERROCKET = 27;
+ const int PROJECTILE_WAKIROCKET = 28;
+ const int PROJECTILE_WAKICANNON = 29;
+ 
+ const int PROJECTILE_BUMBLE_GUN = 30;
+ const int PROJECTILE_BUMBLE_BEAM = 31;
+ 
+ const int PROJECTILE_MAGE_SPIKE = 32;
 -const int PROJECTILE_SHAMBLER_LIGHTNING = 33;
++const int PROJECTILE_GOLEM_LIGHTNING = 33;
+ 
+ const int PROJECTILE_ROCKETMINSTA_LASER = 34;
+ 
+ const int PROJECTILE_ARC_BOLT = 35;
+ 
+ // projectile IDs 40-50 reserved
+ 
+ const int PROJECTILE_RPC = 60;