Changeset 10963 for code/branches/presentationHS15/src/orxonox/weaponsystem

Timestamp:

Dec 9, 2015, 4:56:39 PM (9 years ago)

Author:

maxima

Message:

Merged presentation and particleEffects branches. Added a new level, spaceshiptemplate and weaponsettings for the mine.

Location:

code/branches/presentationHS15

Files:

• . (modified) (1 prop)
• src/orxonox/weaponsystem/WeaponMode.cc (modified) (1 diff)

code/branches/presentationHS15/src/orxonox/weaponsystem/WeaponMode.cc

@@ -75 +75 @@
         this->muzzleOrientation_ = Quaternion::IDENTITY;
 
-        hudImageString_ = "WSHUD_WM_Unknown";
+        hudImageString_ = "Orxonox/WSHUD_WM_Unknown";
 
         if( GameMode::isMaster() )