[Orxonox-commit 7681] r12274 - in code/branches/Boxhead_FS19: data/levels/includes src/modules/weapons/projectiles src/modules/weapons/weaponmodes

[kofrey at orxonox.net]

Author: kofrey
Date: 2019-04-04 15:56:36 +0200 (Thu, 04 Apr 2019)
New Revision: 12274

Modified:
   code/branches/Boxhead_FS19/data/levels/includes/weaponSettingsHover.oxi
   code/branches/Boxhead_FS19/src/modules/weapons/projectiles/HoverGunProjectile.h
   code/branches/Boxhead_FS19/src/modules/weapons/weaponmodes/CMakeLists.txt
Log:
mine not working

Modified: code/branches/Boxhead_FS19/data/levels/includes/weaponSettingsHover.oxi
===================================================================
--- code/branches/Boxhead_FS19/data/levels/includes/weaponSettingsHover.oxi	2019-04-04 13:51:04 UTC (rev 12273)
+++ code/branches/Boxhead_FS19/data/levels/includes/weaponSettingsHover.oxi	2019-04-04 13:56:36 UTC (rev 12274)
@@ -1,6 +1,6 @@
 <weaponslots>
-  <WeaponSlot position="-3,3, 3" />
-  <WeaponSlot position=" 3,3, 3" />
+  <WeaponSlot position="-3,2,-3" />
+  <WeaponSlot position=" 3,2,-3" />
 </weaponslots>
 <weaponsets>
   <WeaponSet firemode=0 />

Modified: code/branches/Boxhead_FS19/src/modules/weapons/projectiles/HoverGunProjectile.h
===================================================================
--- code/branches/Boxhead_FS19/src/modules/weapons/projectiles/HoverGunProjectile.h	2019-04-04 13:51:04 UTC (rev 12273)
+++ code/branches/Boxhead_FS19/src/modules/weapons/projectiles/HoverGunProjectile.h	2019-04-04 13:56:36 UTC (rev 12274)
@@ -59,6 +59,39 @@
 
             virtual void setMaterial(const std::string& material) override;
 
+/**
+    @file LightningGunProjectile.h
+    @brief Definition of the LightningGunProjectile class.
+*/
+
+#ifndef _HoverGunProjectile_H__
+#define _HoverGunProjectile_H__
+
+#include "weapons/WeaponsPrereqs.h"
+
+#include <string>
+#include "tools/Timer.h"
+#include "BillboardProjectile.h"
+
+namespace orxonox
+{
+
+    /**
+    @brief
+        The LightningGunProjectile is a projectile that is represented by a looped series of billboards.
+        
+    @author
+        Joel Smely
+    @ingroup WeaponsProjectiles
+    */
+    class _WeaponsExport HoverGunProjectile : public BillboardProjectile
+    {
+        public:
+            HoverGunProjectile(Context* context);
+            virtual ~HoverGunProjectile() {}
+
+            virtual void setMaterial(const std::string& material) override;
+
         private:
             void registerVariables();
             void changeTexture();

Modified: code/branches/Boxhead_FS19/src/modules/weapons/weaponmodes/CMakeLists.txt
===================================================================
--- code/branches/Boxhead_FS19/src/modules/weapons/weaponmodes/CMakeLists.txt	2019-04-04 13:51:04 UTC (rev 12273)
+++ code/branches/Boxhead_FS19/src/modules/weapons/weaponmodes/CMakeLists.txt	2019-04-04 13:56:36 UTC (rev 12274)
@@ -14,4 +14,5 @@
   GravityBombFire.cc
   MineGun.cc
   WagnisGun.cc
+  HoverGun.cc
 )