Changeset 8929 for code/branches

Timestamp:

Nov 9, 2011, 4:12:35 PM (13 years ago)

Author:

mspaling

Message:

added xmlport for rvnames and misc menu options

Location:

code/branches/hud

Files:

• data/gui/scripts/MiscConfigMenu.lua (modified) (2 diffs)
• data/levels/underAttack.oxw (modified) (1 diff)
• src/modules/overlays/hud/HUDNavigation.cc (modified) (2 diffs)
• src/orxonox/worldentities/pawns/Pawn.cc (modified) (1 diff)

code/branches/hud/data/gui/scripts/MiscConfigMenu.lua

@@ -36 +36 @@
     table.insert(P.commandList, "ChatOverlay displayTime_")
     table.insert(P.commandList, "Core bDevMode_")
+    table.insert(P.commandList, "HUDNavigation MarkerLimit_")
+    table.insert(P.commandList, "HUDNavigation showDistance")
 
     P.nameList = {}
@@ -56 +58 @@
     table.insert(P.nameList, "Chat: display time")
     table.insert(P.nameList, "Developer's Mode")
+    table.insert(P.nameList, "Marker Limit")
+    table.insert(P.nameList, "Show Distance next to cursor")
 
     P.linesList = {}

code/branches/hud/data/levels/underAttack.oxw

@@ -51 +51 @@
       maxhealth         = 10000
       initialhealth     = 10000
+      RVName            = "Transporter"
     >
 

code/branches/hud/src/modules/overlays/hud/HUDNavigation.cc

@@ -64 +64 @@
 {
   SetConfigValue(markerLimit_, 3);
+  SetConfigValue(showDistance, false);
 }
 
@@ -78 +79 @@
     setTextSize ( 0.05f );
     setNavMarkerSize ( 0.05f );
-    this->showDistance = false;
 }
 

code/branches/hud/src/orxonox/worldentities/pawns/Pawn.cc

@@ -129 +129 @@
         XMLPortParam(Pawn, "reloadrate", setReloadRate, getReloadRate, xmlelement, mode).defaultValues(0);
         XMLPortParam(Pawn, "reloadwaittime", setReloadWaitTime, getReloadWaitTime, xmlelement, mode).defaultValues(1.0f);
+   
+        XMLPortParam ( RadarViewable, "RVName", setRVName, getRVName, xmlelement, mode );
     }