[Orxonox-commit 558] r2192 - in media: defaultConfig levels/includes overlay

[landauf at orxonox.net]

Author: landauf
Date: 2009-05-28 02:00:03 +0200 (Thu, 28 May 2009)
New Revision: 2192

Modified:
   media/defaultConfig/keybindings.ini
   media/levels/includes/weaponsettings3.oxi
   media/overlay/debug.oxo
Log:
Added gameplay messages to the HUD

Modified: media/defaultConfig/keybindings.ini
===================================================================
--- media/defaultConfig/keybindings.ini	2009-05-27 19:42:15 UTC (rev 2191)
+++ media/defaultConfig/keybindings.ini	2009-05-28 00:00:03 UTC (rev 2192)
@@ -57,7 +57,7 @@
 KeyLeftShift=
 KeyLeftWindows=
 KeyLessThan=
-KeyM=
+KeyM=openMap
 KeyMail=
 KeyMediaSelect=
 KeyMediaStop=

Modified: media/levels/includes/weaponsettings3.oxi
===================================================================
--- media/levels/includes/weaponsettings3.oxi	2009-05-27 19:42:15 UTC (rev 2191)
+++ media/levels/includes/weaponsettings3.oxi	2009-05-28 00:00:03 UTC (rev 2192)
@@ -15,10 +15,10 @@
         </links>
         <Weapon>
           <attached>
-            <Model mesh="LightningGun.mesh" pitch="78" roll="90" yaw="90" position="0,-1.3,0" scale="0.5,0.5,0.5"/>
-            <Model mesh="LightningGun-s.mesh" pitch="78" roll="90" yaw="90" position="0.2,-1.3,0" scale="0.5,0.5,0.5"/>
-            <Model mesh="hs-w01.mesh" roll="195" position="0,1,0"/>
-            <Model mesh="hs-w01s.mesh" roll="195" position="0.1,0.5,0"/>
+            <Model mesh="LightningGun.mesh" pitch="78" roll="90" yaw="90" position="0,-1.3,0" />
+            <Model mesh="LightningGun-s.mesh" pitch="78" roll="90" yaw="90" position="0.2,-1.3,0" />
+            <Model mesh="hs-w01.mesh" roll="195" position="0,1,0" scale=2 />
+            <Model mesh="hs-w01s.mesh" roll="195" position="0.1,0.5,0" scale=2 />
           </attached>
           <HsW01 mode=0 munitionpershot=0 delay=0 material="Flares/point_lensflare" muzzleoffset="-2,-0.2,-20" />
           <HsW01 mode=0 munitionpershot=0 delay=0.125 material="Flares/point_lensflare" muzzleoffset="2,0.2,-20" />
@@ -26,10 +26,10 @@
         </Weapon>
         <Weapon>
           <attached>
-            <Model mesh="LightningGun.mesh" pitch="103" roll="90" yaw="90" position="0,-1.35,0" scale="0.5,0.5,0.5"/>
-            <Model mesh="LightningGun-s.mesh" pitch="103" roll="90" yaw="90" position="0.2,-1.35,0" scale="0.5,0.5,0.5"/>
-            <Model mesh="hs-w01.mesh" roll="165" position="0,1,0"/>
-            <Model mesh="hs-w01s.mesh" roll="165" position="-0.1,0.5,0"/>
+            <Model mesh="LightningGun.mesh" pitch="103" roll="90" yaw="90" position="0,-1.35,0" />
+            <Model mesh="LightningGun-s.mesh" pitch="103" roll="90" yaw="90" position="0.2,-1.35,0" />
+            <Model mesh="hs-w01.mesh" roll="165" position="0,1,0" scale=2 />
+            <Model mesh="hs-w01s.mesh" roll="165" position="-0.1,0.5,0" scale=2 />
           </attached>
           <HsW01 mode=0 munitionpershot=0 delay=0  material="Flares/point_lensflare"muzzleoffset="2,-0.2,-20" />
           <HsW01 mode=0 munitionpershot=0 delay=0.125 material="Flares/point_lensflare" muzzleoffset="-2,0.2,-20" />

Modified: media/overlay/debug.oxo
===================================================================
--- media/overlay/debug.oxo	2009-05-27 19:42:15 UTC (rev 2191)
+++ media/overlay/debug.oxo	2009-05-28 00:00:03 UTC (rev 2192)
@@ -45,12 +45,39 @@
   <OverlayGroup name = "defaultHUD" scale = "1, 1">
     <ChatOverlay
      name     = "chat"
-     position = "0.03, 0.5"
+     position = "0.03, 0.03"
      font     = "VeraMono"
      caption  = ""
      textsize = 0.025
     />
 
+    <KillMessage
+     name     = "killmessage"
+     position = "0.5, 0.15"
+     font     = "VeraMono"
+     textsize = 0.035
+     colour   = "1.0, 1.0, 0.5, 1.0"
+     align    = "center"
+    />
+
+    <DeathMessage
+     name     = "deathmessage"
+     position = "0.5, 0.20"
+     font     = "VeraMono"
+     textsize = 0.035
+     colour   = "1.0, 0.3, 0.3, 1.0"
+     align    = "center"
+    />
+
+    <AnnounceMessage
+     name     = "announcemessage"
+     position = "0.5, 0.75"
+     font     = "VeraMono"
+     textsize = 0.05
+     colour   = "0.5, 0.5, 1.0, 1.0"
+     align    = "center"
+    />
+
     <GametypeStatus
      name     = "state"
      position = "0.5, 0.85"