Changeset 11718 for code/trunk/data

Timestamp:

Jan 7, 2018, 10:34:30 PM (7 years ago)

Author:

landauf

Message:

tabs → spaces

Location:

code/trunk/data

Files:

• gui/layouts/Dialogue.layout (modified) (1 diff)
• gui/layouts/SingleplayerMenu.layout (modified) (1 diff)
• gui/scripts/HighscoreMenu.lua (modified) (5 diffs)
• overlays/HUDTemplates3.oxo (modified) (1 diff)
• overlays/towerdefenseHUD.oxo (modified) (3 diffs)

code/trunk/data/gui/layouts/Dialogue.layout

@@ -3 +3 @@
 <GUILayout >
     <Window Type="DefaultWindow" Name="orxonox/Dialogue/Background" > 
-        <Property Name="InheritsAlpha" Value="False" />
+        <Property Name="InheritsAlpha" Value="False" />
         <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
         <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}}" />

code/trunk/data/gui/layouts/SingleplayerMenu.layout

@@ -33 +33 @@
                 <Property Name="HorzScrollbar" Value="False" />
                 <Property Name="UnifiedAreaRect" Value="{{0.1,0},{0.725,0},{0.9,0},{0.875,0}}" />
-                <Property Name="HorzFormatting" Value="WordWrapLeftAligned" />
+                <Property Name="HorzFormatting" Value="WordWrapLeftAligned" />
             </Window>
         </Window>

code/trunk/data/gui/scripts/HighscoreMenu.lua

@@ -12 +12 @@
 
 function P.onLoad()
-        P.createLevelList()    
+    P.createLevelList()    
 end
 
 function P.onShow()
-        
-        -- reset tables
-        P.highscoreList = {}
-        P.tabList = {}
-        P.linesList = {}
+    
+    -- reset tables
+    P.highscoreList = {}
+    P.tabList = {}
+    P.linesList = {}
 
-        -- fetch save scores and write it into the list
-        for i=orxonox.Highscore:getInstance():getNumberOfHighscores()-1,0,-1 do
-                table.insert(P.highscoreList, orxonox.Highscore:getInstance():getHighscore(i))
-        
-        end
-        
-        -- read minigames out of the levelList
+    -- fetch save scores and write it into the list
+    for i=orxonox.Highscore:getInstance():getNumberOfHighscores()-1,0,-1 do
+        table.insert(P.highscoreList, orxonox.Highscore:getInstance():getHighscore(i))
+    
+    end
+    
+    -- read minigames out of the levelList
     for k,v in pairs(P.levelList) do
         if(v:getName() ~= "Hover level" and v:getName() ~= "Pong") then   -- hover and pong dont contain relevant scores
@@ -38 +38 @@
 function P.onHide()
 
-        -- delete old windows to reload them on show
-        local tabControl = winMgr:getWindow("orxonox/HighscoreTabControl")
-        for k,v in pairs(P.tabList) do
-                local default = winMgr:getWindow(v)
+    -- delete old windows to reload them on show
+    local tabControl = winMgr:getWindow("orxonox/HighscoreTabControl")
+    for k,v in pairs(P.tabList) do
+            local default = winMgr:getWindow(v)
             tabControl:removeChildWindow(default)
-                winMgr:destroyWindow(default)
+            winMgr:destroyWindow(default)
     end
 end
@@ -68 +68 @@
     table.insert(P.tabList, tabName)
     -- create new tab window with desired name
-        local default = (winMgr:createWindow("DefaultWindow", tabName))
+    local default = (winMgr:createWindow("DefaultWindow", tabName))
     default:setText(name)
     default:setProperty("UnifiedMaxSize", "{{1,0},{1,0}}")
@@ -79 +79 @@
     local offset = 2
     for k,v in pairs(P.highscoreList) do
-        -- split the score ("Playername./.game./.score")
-        local splitlist = P.Split(v,"./.")
-        if(splitlist[2] == name)then  
-                local line = P.createPickupEntry(tabName .. k,k,tag)
-                table.insert(P.linesList, line)
-                line:setYPosition(CEGUI.UDim(0,offset))
-                offset = offset + line:getHeight():asAbsolute(1)+2
-                pane:addChildWindow(line)       
-        end
+        -- split the score ("Playername./.game./.score")
+        local splitlist = P.Split(v,"./.")
+        if(splitlist[2] == name)then  
+            local line = P.createPickupEntry(tabName .. k,k,tag)
+            table.insert(P.linesList, line)
+            line:setYPosition(CEGUI.UDim(0,offset))
+            offset = offset + line:getHeight():asAbsolute(1)+2
+            pane:addChildWindow(line)
+        end
         
     end
 
-        local tabControl = winMgr:getWindow("orxonox/HighscoreTabControl")
-        tabControl:addChildWindow(default)
+    local tabControl = winMgr:getWindow("orxonox/HighscoreTabControl")
+    tabControl:addChildWindow(default)
  
 
@@ -111 +111 @@
     
     item:addChildWindow(player)
-        
+        
     local score = winMgr:createWindow("MenuWidgets/StaticText", name .. "/Score")
     score:setText(splitlist[3])

code/trunk/data/overlays/HUDTemplates3.oxo

@@ -156 +156 @@
     />
 
-        <HUDRadar
-     name                               = "Radar"
-     background                         = "Orxonox/Radar3D"
-     material2D                         = "Orxonox/Radar"
-     material3DMiddle           = "Orxonox/Radar3D"
-     material3DFront            = "Orxonox/Radar3DFront"
-     material3DBack                     = "Orxonox/Radar3DBack"
-     correctaspect                      = true
-     size                               = "0.17, 0.17"
-     position                           = "1.0, 1.0"
-     pickpoint                          = "1.0, 1.0"
-     rotation                           = 0
-     sensitivity                        = 1.0
-     halfDotSizeDistance        = 3000
-     detectionLimit             = 10000.0
-     maximumDotSize             = 0.1
-     maximumDotSize3D           = 0.06
-     mapAngle3D                         = 0.6435011
+    <HUDRadar
+     name                   = "Radar"
+     background             = "Orxonox/Radar3D"
+     material2D             = "Orxonox/Radar"
+     material3DMiddle       = "Orxonox/Radar3D"
+     material3DFront        = "Orxonox/Radar3DFront"
+     material3DBack         = "Orxonox/Radar3DBack"
+     correctaspect          = true
+     size                   = "0.17, 0.17"
+     position               = "1.0, 1.0"
+     pickpoint              = "1.0, 1.0"
+     rotation               = 0
+     sensitivity            = 1.0
+     halfDotSizeDistance    = 3000
+     detectionLimit         = 10000.0
+     maximumDotSize         = 0.1
+     maximumDotSize3D       = 0.06
+     mapAngle3D             = 0.6435011
     />
 

code/trunk/data/overlays/towerdefenseHUD.oxo

@@ -24 +24 @@
      colour    = "1.0, 1.0, 1.0, 1.0"
      align     = "left"
-                showlives = false
-                showcredits = true
-                showwaves = false
+     showlives = false
+     showcredits = true
+     showwaves = false
     />
     
@@ -47 +47 @@
      colour    = "1.0, 1.0, 1.0, 1.0"
      align     = "left"
-                showlives = true
-                showcredits = false
-                showwaves = false
+     showlives = true
+     showcredits = false
+     showwaves = false
     />
     
@@ -70 +70 @@
      colour    = "1.0, 1.0, 1.0, 1.0"
      align     = "left"
-        showlives = false
-                showcredits = false
-                showwaves = true
+     showlives = false
+     showcredits = false
+     showwaves = true
 
     />