opengate-svn

[Opengate-svn] SF.net SVN: opengate: [499] trunk/data

[<eg...@us...>]

Revision: 499
          http://svn.sourceforge.net/opengate/?rev=499&view=rev
Author:   egore
Date:     2007-05-20 14:26:57 -0700 (Sun, 20 May 2007)

Log Message:
-----------
use same parameter order

Modified Paths:
--------------
    trunk/data/ECMs/ghost.xml
    trunk/data/capacitors/s_c_15.xml

Modified: trunk/data/ECMs/ghost.xml
===================================================================
--- trunk/data/ECMs/ghost.xml	2007-05-20 21:26:30 UTC (rev 498)
+++ trunk/data/ECMs/ghost.xml	2007-05-20 21:26:57 UTC (rev 499)
@@ -1,25 +1,32 @@
 <?xml version="1.0"?>
-<!DOCTYPE equipment SYSTEM "opengate.dtd">
+<!DOCTYPE equipment SYSTEM "http://opengate.sourceforge.net/opengate.dtd">
 
 <equipment type="ECM">
 	<!-- Naming -->
+	<faction>Tauseti</faction>
 	<name>Ghost</name>
-	<class>Radar Jammer</class>
-	<faction>Solrain</faction>
-	<description>TODO</description>
 
-	<!-- Production Data -->
-	<manufacturer>Amananth</manufacturer>
-	<production-center>Amananth</production-center>
-	
 	<!-- Generic Data -->
+	<class>Radar Jammer</class>
 	<techlevel>8</techlevel>
 	<size>1</size>
 	<mass>30</mass>
 
+	<!-- Additional Data -->
+	<description>TODO</description>
+	<image>ghost.jpg</image>
+	<model>ghost.blend</model>
+	<mesh>ghost.mesh</mesh>
+
+	<!-- Specific data -->
 	<sensorlevel>3</sensorlevel>
 	<power>970000</power>
+	
+	<!-- Production Data -->
+	<manufacturer>Amananth</manufacturer>
+	<production-center>Amananth</production-center>
 
+	<!-- Building Data -->
 	<required-component>Antimony</required-component>
 	<required-component>RAM</required-component>
 	<required-component>CPU</required-component>

Modified: trunk/data/capacitors/s_c_15.xml
===================================================================
--- trunk/data/capacitors/s_c_15.xml	2007-05-20 21:26:30 UTC (rev 498)
+++ trunk/data/capacitors/s_c_15.xml	2007-05-20 21:26:57 UTC (rev 499)
@@ -3,28 +3,31 @@
 
 <equipment type="Capacitor">
 	<!-- Naming -->
+	<faction>Tauseti</faction>
 	<name>S-C-15</name>
+
+	<!-- Generic Data -->
 	<class>Energy Storage Device</class>
-	<faction>Solrain</faction>
+	<techlevel>0</techlevel>
+	<size>1</size>
+	<mass>1000</mass>
+
+	<!-- Additional Data -->
 	<description>The S-C-15 is Solrain's stock equipment capacitor, and is basically a modified Mantra. All Solrain pilots are given this as part of their starter package. TRI subsidizes production of this model, and therefore it cannot be legally traded or sold for much value.</description>
 	<image>s_c_15.jpg</image>
 	<model>s_c_15.blend</model>
+	<mesh>s_c_15.mesh</mesh>
 
+	<!-- Specific data -->
+	<efficiency>80</efficiency>
+	<capacity>1100000</capacity>
+
 	<!-- Production Data -->
-	<manufacturer>T&P Systems</manufacturer>
+	<manufacturer>T&amp;P Systems</manufacturer>
 	<production-center>Solrain Core</production-center>
 	<production-center>Solrain Wake</production-center>
 	<production-center>Solrain Cornea</production-center>
-	
-	<!-- Generic Data -->
-	<techlevel>0</techlevel>
-	<size>1</size>
-	<mass>1000</mass>
 
-	<!-- Specific data -->
-	<efficiency>80</efficiency>
-	<capacity>1100000</capacity>
-
 	<!-- Building Data -->
 	<required-component>Aluminium</required-component>
 	<required-component>Lithium</required-component>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opengate-svn] SF.net SVN: opengate: [504] trunk/data

[<ult...@us...>]

Revision: 504
          http://svn.sourceforge.net/opengate/?rev=504&view=rev
Author:   ultrasick
Date:     2007-05-20 14:41:00 -0700 (Sun, 20 May 2007)

Log Message:
-----------
moving iintro video to "startup" directory. I will upload the loading screen in this directory too

Added Paths:
-----------
    trunk/data/startup/
    trunk/data/startup/open_source.avi

Removed Paths:
-------------
    trunk/data/intros/

Added: trunk/data/startup/open_source.avi
===================================================================
(Binary files differ)


Property changes on: trunk/data/startup/open_source.avi
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opengate-svn] SF.net SVN: opengate: [518] trunk/data

[<spo...@us...>]

Revision: 518
          http://svn.sourceforge.net/opengate/?rev=518&view=rev
Author:   spom_spom
Date:     2007-06-01 16:35:06 -0700 (Fri, 01 Jun 2007)

Log Message:
-----------
Hurray! Shopping Shopping Shopping. (Add: Market dialog, best viewed with 1024x786 or more.) Data

Modified Paths:
--------------
    trunk/data/GUI/Font.xsd
    trunk/data/GUI/GUILayout.xsd
    trunk/data/GUI/GUIScheme.xsd
    trunk/data/client/data1.x/GUI/BlueHighway-10.font
    trunk/data/client/data1.x/GUI/BlueHighway-12.font
    trunk/data/client/data1.x/GUI/OpenGate.looknfeel
    trunk/data/client/data1.x/GUI/OpenGateLook.scheme
    trunk/data/commodities/aluminium.xml
    trunk/data/commodities/antimony.xml
    trunk/data/commodities/barium.xml
    trunk/data/commodities/cesium.xml
    trunk/data/commodities/chemicals.xml
    trunk/data/commodities/chromium.xml
    trunk/data/commodities/copper.xml
    trunk/data/commodities/cpu.xml
    trunk/data/commodities/fuel_cells.xml
    trunk/data/commodities/gold.xml
    trunk/data/commodities/laser_components.xml
    trunk/data/commodities/medical_supplies.xml
    trunk/data/commodities/rubber.xml
    trunk/data/commodities/xenon.xml

Added Paths:
-----------
    trunk/data/commodities/CPU.png
    trunk/data/commodities/aluminium.png
    trunk/data/commodities/antimony.png
    trunk/data/commodities/barium.png
    trunk/data/commodities/cesium.png
    trunk/data/commodities/chemicals.png
    trunk/data/commodities/chromium.png
    trunk/data/commodities/copper.png
    trunk/data/commodities/fuel_cells.png
    trunk/data/commodities/gold.png
    trunk/data/commodities/helium.png
    trunk/data/commodities/ice.png
    trunk/data/commodities/ice.xml
    trunk/data/commodities/laser_components.png
    trunk/data/commodities/medical_supplies.png
    trunk/data/commodities/nitrogen.png
    trunk/data/commodities/octavia_light.png
    trunk/data/commodities/rubber.png
    trunk/data/commodities/xenon.png

Modified: trunk/data/GUI/Font.xsd
===================================================================
--- trunk/data/GUI/Font.xsd	2007-06-01 23:33:29 UTC (rev 517)
+++ trunk/data/GUI/Font.xsd	2007-06-01 23:35:06 UTC (rev 518)
@@ -5,11 +5,6 @@
 	<xsd:complexType name="FontType">
 		<xsd:sequence>
 			<xsd:element name="Mapping" type="MapType" maxOccurs="unbounded" minOccurs="0" />
-            <xsd:choice maxOccurs="unbounded" minOccurs="0">
-                <xsd:element name="GlyphSet" type="GlyphSetType" />
-                <xsd:element name="GlyphRange" type="GlyphRangeType" />
-                <xsd:element name="Glyph" type="GlyphType" />
-            </xsd:choice>
 		</xsd:sequence>
 		<xsd:attributeGroup ref="FontAttrs" />
 	</xsd:complexType>
@@ -18,16 +13,6 @@
 		<xsd:attribute name="Image" type="xsd:string" use="required" />
 		<xsd:attribute name="HorzAdvance" type="xsd:integer" use="optional" default="-1" />
 	</xsd:complexType>
-	<xsd:complexType name="GlyphType">
-		<xsd:attribute name="Codepoint" type="xsd:nonNegativeInteger" use="required" />
-	</xsd:complexType>
-	<xsd:complexType name="GlyphRangeType">
-		<xsd:attribute name="StartCodepoint" type="xsd:nonNegativeInteger" use="required" />
-		<xsd:attribute name="EndCodepoint" type="xsd:nonNegativeInteger" use="required" />
-	</xsd:complexType>
-	<xsd:complexType name="GlyphSetType">
-		<xsd:attribute name="Glyphs" type="xsd:string" use="required" />
-	</xsd:complexType>
 	<xsd:attributeGroup name="FontAttrs">
 		<xsd:attribute name="Name" type="xsd:string" use="required" />
 		<xsd:attribute name="Filename" type="xsd:string" use="required" />
@@ -35,17 +20,15 @@
 		<xsd:attribute name="Type" use="required">
 			<xsd:simpleType>
 				<xsd:restriction base="xsd:string">
-					<xsd:enumeration value="Dynamic" />
-					<xsd:enumeration value="Static" />
+					<xsd:enumeration value="FreeType" />
+					<xsd:enumeration value="Pixmap" />
 				</xsd:restriction>
 			</xsd:simpleType>
 		</xsd:attribute>
 		<xsd:attribute name="Size" type="xsd:nonNegativeInteger" use="optional" default="12" />
-		<xsd:attribute name="FirstCodepoint" type="xsd:nonNegativeInteger" use="optional" default="32" />
-		<xsd:attribute name="LastCodepoint" type="xsd:nonNegativeInteger" use="optional" default="127" />
 		<xsd:attribute name="NativeHorzRes" type="xsd:nonNegativeInteger" use="optional" default="640" />
 		<xsd:attribute name="NativeVertRes" type="xsd:nonNegativeInteger" use="optional" default="480" />
 		<xsd:attribute name="AutoScaled" type="xsd:boolean" use="optional" default="false" />
 		<xsd:attribute name="AntiAlias" type="xsd:boolean" use="optional" default="true" />
 	</xsd:attributeGroup>
-</xsd:schema>
\ No newline at end of file
+</xsd:schema>

Modified: trunk/data/GUI/GUILayout.xsd
===================================================================
--- trunk/data/GUI/GUILayout.xsd	2007-06-01 23:33:29 UTC (rev 517)
+++ trunk/data/GUI/GUILayout.xsd	2007-06-01 23:35:06 UTC (rev 518)
@@ -15,16 +15,37 @@
 			<xsd:element name="LayoutImport" type="LayoutImportType"  minOccurs="0" maxOccurs="unbounded" />
 			<xsd:element name="Property" type="PropertyType"  minOccurs="0" maxOccurs="unbounded" />
 			<xsd:element name="Event" type="EventType"  minOccurs="0" maxOccurs="unbounded" />
-			<xsd:element name="Window" type="WindowType"  minOccurs="0" maxOccurs="unbounded" />
+			<xsd:choice minOccurs="0" maxOccurs="unbounded">
+				<xsd:element name="Window" type="WindowType" />
+				<xsd:element name="AutoWindow" type="AutoWindowType" />
+			</xsd:choice>
 			<xsd:element name="Property" type="PropertyType"  minOccurs="0" maxOccurs="unbounded" />
 		</xsd:sequence>
 		<xsd:attribute name="Type" type="xsd:string" use="required"/>
 		<xsd:attribute name="Name" type="xsd:string" use="optional" default="" />
 	</xsd:complexType>
 
+	<xsd:complexType name="AutoWindowType">
+		<xsd:sequence>
+			<xsd:element name="LayoutImport" type="LayoutImportType"  minOccurs="0" maxOccurs="unbounded" />
+			<xsd:element name="Property" type="PropertyType"  minOccurs="0" maxOccurs="unbounded" />
+			<xsd:element name="Event" type="EventType"  minOccurs="0" maxOccurs="unbounded" />
+			<xsd:choice minOccurs="0" maxOccurs="unbounded">
+				<xsd:element name="Window" type="WindowType" />
+				<xsd:element name="AutoWindow" type="AutoWindowType" />
+			</xsd:choice>
+			<xsd:element name="Property" type="PropertyType"  minOccurs="0" maxOccurs="unbounded" />
+		</xsd:sequence>
+		<xsd:attribute name="NameSuffix" type="xsd:string" use="required"/>
+	</xsd:complexType>
+
 	<xsd:complexType name="PropertyType">
-		<xsd:attribute name="Name" type="xsd:string" use="required"/>
-		<xsd:attribute name="Value" type="xsd:string" use="required"/>
+		<xsd:simpleContent>
+			<xsd:extension base="xsd:string">
+				<xsd:attribute name="Name" type="xsd:string" use="required"/>
+				<xsd:attribute name="Value" type="xsd:string" use="optional"/>
+			</xsd:extension>
+		</xsd:simpleContent> 
 	</xsd:complexType>
 
 	<xsd:complexType name="LayoutImportType">

Modified: trunk/data/GUI/GUIScheme.xsd
===================================================================
--- trunk/data/GUI/GUIScheme.xsd	2007-06-01 23:33:29 UTC (rev 517)
+++ trunk/data/GUI/GUIScheme.xsd	2007-06-01 23:35:06 UTC (rev 518)
@@ -8,6 +8,7 @@
 			<xsd:element name="Font" type="NamedDataType" />
             <xsd:element name="LookNFeel" type="FileDataType" />
 			<xsd:element name="WindowSet" type="WindowSetType" />
+			<xsd:element name="WindowRendererSet" type="WindowRendererSetType" />
 			<xsd:element name="WindowAlias" type="WindowAliasType" />
             <xsd:element name="FalagardMapping" type="FalagardMapType" />
 		</xsd:choice>
@@ -19,6 +20,12 @@
 		</xsd:sequence>
 		<xsd:attribute name="Filename" type="xsd:string" use="required" />
 	</xsd:complexType>
+	<xsd:complexType name="WindowRendererSetType">
+		<xsd:sequence>
+            <xsd:element name="WindowRendererFactory" type="WindowRendererFactoryType" minOccurs="0" maxOccurs="unbounded" />
+		</xsd:sequence>
+		<xsd:attribute name="Filename" type="xsd:string" use="required" />
+	</xsd:complexType>
     <xsd:complexType name="FileDataType">
         <xsd:attribute name="Filename" type="xsd:string" use="required" />
         <xsd:attribute name="ResourceGroup" type="xsd:string" use="optional"  default="" />
@@ -31,6 +38,9 @@
 	<xsd:complexType name="WindowFactoryType">
 		<xsd:attribute name="Name" type="xsd:string" use="required" />
 	</xsd:complexType>
+	<xsd:complexType name="WindowRendererFactoryType">
+		<xsd:attribute name="Name" type="xsd:string" use="required" />
+	</xsd:complexType>
 	<xsd:complexType name="WindowAliasType">
 		<xsd:attribute name="Alias" type="xsd:string" use="required" />
 		<xsd:attribute name="Target" type="xsd:string" use="required" />
@@ -38,6 +48,7 @@
     <xsd:complexType name="FalagardMapType">
         <xsd:attribute name="WindowType" type="xsd:string" use="required" />
         <xsd:attribute name="TargetType" type="xsd:string" use="required" />
+		<xsd:attribute name="Renderer" type="xsd:string" use="required" />
         <xsd:attribute name="LookNFeel" type="xsd:string" use="required" />
     </xsd:complexType>
 </xsd:schema>
\ No newline at end of file

Modified: trunk/data/client/data1.x/GUI/BlueHighway-10.font
===================================================================
--- trunk/data/client/data1.x/GUI/BlueHighway-10.font	2007-06-01 23:33:29 UTC (rev 517)
+++ trunk/data/client/data1.x/GUI/BlueHighway-10.font	2007-06-01 23:35:06 UTC (rev 518)
@@ -1,2 +1,2 @@
 <?xml version="1.0" ?>
-<Font Name="BlueHighway-10" Filename="BlueHighway.ttf" Type="Dynamic" Size="10" NativeHorzRes="800" NativeVertRes="600" AutoScaled="false" AntiAlias="true" />
+<Font Name="BlueHighway-10" Filename="BlueHighway.ttf" Type="FreeType" Size="10" NativeHorzRes="800" NativeVertRes="600" AutoScaled="false" />

Modified: trunk/data/client/data1.x/GUI/BlueHighway-12.font
===================================================================
--- trunk/data/client/data1.x/GUI/BlueHighway-12.font	2007-06-01 23:33:29 UTC (rev 517)
+++ trunk/data/client/data1.x/GUI/BlueHighway-12.font	2007-06-01 23:35:06 UTC (rev 518)
@@ -1,2 +1,2 @@
 <?xml version="1.0" ?>
-<Font Name="BlueHighway-12" Filename="BlueHighway.ttf" Type="Dynamic" Size="12" NativeHorzRes="800" NativeVertRes="600" AutoScaled="false" AntiAlias="true" />
+<Font Name="BlueHighway-12" Filename="BlueHighway.ttf" Type="FreeType" Size="12" NativeHorzRes="800" NativeVertRes="600" AutoScaled="false" />

Modified: trunk/data/client/data1.x/GUI/OpenGate.looknfeel
===================================================================
--- trunk/data/client/data1.x/GUI/OpenGate.looknfeel	2007-06-01 23:33:29 UTC (rev 517)
+++ trunk/data/client/data1.x/GUI/OpenGate.looknfeel	2007-06-01 23:35:06 UTC (rev 518)
@@ -32,7 +32,7 @@
                 <Image type="BottomRightCorner" imageset="OpenGateLook" image="OGUIPanelRight" />
             </FrameComponent>
         </ImagerySection>
-        <ImagerySection name="background">
+<!--	<ImagerySection name="background">
             <ImageryComponent>
                 <Area>
                     <Dim type="LeftEdge" ><AbsoluteDim value="0" /></Dim>
@@ -40,10 +40,11 @@
                     <Dim type="Width" ><UnifiedDim scale="1" type="Width" /></Dim>
                     <Dim type="Height" ><UnifiedDim scale="1" type="Height" /></Dim>
                 </Area>
-                <VertFormat type="Tiled" />
+                <VertFormat type="Tiled" /> 
                 <HorzFormat type="Tiled" />
             </ImageryComponent>
-        </ImagerySection>
+        </ImagerySection> 
+-->
         <StateImagery name="Enabled" />
         <StateImagery name="Disabled" />
         <StateImagery name="EnabledFrame">
@@ -904,16 +905,21 @@
                     <Dim type="Width" ><UnifiedDim scale="1" type="Width" /></Dim>
                     <Dim type="Height" ><UnifiedDim scale="1" type="Height" /></Dim>
                 </Area>
+<!--
                 <Image type="TopLeftCorner" imageset="OpenGateLook" image="OGDefaultWindowTopLeft" />
                 <Image type="TopRightCorner" imageset="OpenGateLook" image="OGDefaultWindowTopRight" />
+-->
                 <Image type="BottomLeftCorner" imageset="OpenGateLook" image="OGDefaultWindowBottomLeft" />
                 <Image type="BottomRightCorner" imageset="OpenGateLook" image="OGDefaultWindowBottomRight" />
+<!--
                 <Image type="TopEdge" imageset="OpenGateLook" image="OGDefaultWindowTopEdge" />
+-->
                 <Image type="LeftEdge" imageset="OpenGateLook" image="OGDefaultWindowLeftEdge" />
                 <Image type="RightEdge" imageset="OpenGateLook" image="OGDefaultWindowRightEdge" />
                 <Image type="BottomEdge" imageset="OpenGateLook" image="OGDefaultWindowBottomEdge" />
             </FrameComponent>
         </ImagerySection>
+<!--
         <ImagerySection name="withtitle_noframe_client_area">
             <ImageryComponent>
                 <Area>
@@ -940,6 +946,7 @@
                 <HorzFormat type="Stretched" />
             </ImageryComponent>
         </ImagerySection>
+-->
         <StateImagery name="ActiveWithTitleWithFrame">
             <Layer>
                 <Section section="withtitle_frame" />

Modified: trunk/data/client/data1.x/GUI/OpenGateLook.scheme
===================================================================
--- trunk/data/client/data1.x/GUI/OpenGateLook.scheme	2007-06-01 23:33:29 UTC (rev 517)
+++ trunk/data/client/data1.x/GUI/OpenGateLook.scheme	2007-06-01 23:35:06 UTC (rev 518)
@@ -4,21 +4,53 @@
     <Font Name="BlueHighway-12" Filename="BlueHighway-12.font" />
     <Font Name="BlueHighway-10" Filename="BlueHighway-10.font" />
     <LookNFeel Filename="OpenGate.looknfeel" />
-    <WindowSet Filename="CEGUIFalagardBase" />
-    <FalagardMapping WindowType="OpenGateLook/OGButton" TargetType="Falagard/Button" LookNFeel="OpenGateLook/OGButton" />
-    <FalagardMapping WindowType="OpenGateLook/OGDefaultFrameWindow" TargetType="Falagard/FrameWindow" LookNFeel="OpenGateLook/OGDefaultFrameWindow" />
-    <FalagardMapping WindowType="OpenGateLook/OGDefaultTitlebar" TargetType="Falagard/Titlebar" LookNFeel="OpenGateLook/OGDefaultTitlebar" />
-    <FalagardMapping WindowType="OpenGateLook/OGEditbox" TargetType="Falagard/Editbox" LookNFeel="OpenGateLook/OGEditbox" />
-    <FalagardMapping WindowType="OpenGateLook/OGProgressBarEnergy" TargetType="Falagard/ProgressBar" LookNFeel="OpenGateLook/OGProgressBarEnergy" />
-    <FalagardMapping WindowType="OpenGateLook/OGProgressBarHull" TargetType="Falagard/ProgressBar" LookNFeel="OpenGateLook/OGProgressBarHull" />
-    <FalagardMapping WindowType="OpenGateLook/OGProgressBarShield" TargetType="Falagard/ProgressBar" LookNFeel="OpenGateLook/OGProgressBarShield" />
-    <FalagardMapping WindowType="OpenGateLook/OGProgressBarVert" TargetType="Falagard/ProgressBar" LookNFeel="OpenGateLook/OGProgressBarVert" />
-    <FalagardMapping WindowType="OpenGateLook/OGProgressBarWeapon1" TargetType="Falagard/ProgressBar" LookNFeel="OpenGateLook/OGProgressBarWeapon1" />
-    <FalagardMapping WindowType="OpenGateLook/OGProgressBarWeapon2" TargetType="Falagard/ProgressBar" LookNFeel="OpenGateLook/OGProgressBarWeapon2" />
-    <FalagardMapping WindowType="OpenGateLook/OGProgressBarWeapon3" TargetType="Falagard/ProgressBar" LookNFeel="OpenGateLook/OGProgressBarWeapon3" />
-    <FalagardMapping WindowType="OpenGateLook/OGStaticText" TargetType="Falagard/StaticText" LookNFeel="OpenGateLook/OGStaticText" />
-    <FalagardMapping WindowType="OpenGateLook/OGSystemButton" TargetType="Falagard/SystemButton" LookNFeel="OpenGateLook/OGButton" />
-    <FalagardMapping WindowType="OpenGateLook/OGUIPanels" TargetType="Falagard/StaticImage" LookNFeel="OpenGateLook/OGUIPanels" />
-    <FalagardMapping WindowType="OpenGateLook/OGVerticalScrollbar" TargetType="Falagard/Scrollbar" LookNFeel="OpenGateLook/OGVerticalScrollbar" />
-    <FalagardMapping WindowType="OpenGateLook/OGVerticalScrollbarThumb" TargetType="Falagard/Thumb" LookNFeel="OpenGateLook/OGVerticalScrollbarThumb" />
+    <WindowSet Filename="CEGUIFalagardWRBase" />
+    <FalagardMapping WindowType="OpenGateLook/OGDefaultFrameWindow" TargetType="CEGUI/FrameWindow" 
+			Renderer="Falagard/FrameWindow" 
+			LookNFeel="OpenGateLook/OGDefaultFrameWindow" />
+    <FalagardMapping WindowType="OpenGateLook/OGButton" TargetType="CEGUI/FrameWindow" 
+			Renderer="Falagard/FrameWindow" 
+			LookNFeel="OpenGateLook/OGDefaultFrameWindow" />
+    <FalagardMapping WindowType="OpenGateLook/OGSystemButton" TargetType="CEGUI/PushButton" 
+			Renderer="Falagard/SystemButton" 
+			LookNFeel="OpenGateLook/OGButton" />
+    <FalagardMapping WindowType="OpenGateLook/OGDefaultTitlebar" TargetType="CEGUI/Titlebar" 
+			Renderer="Falagard/Titlebar" 
+			LookNFeel="OpenGateLook/OGDefaultTitlebar" />
+    <FalagardMapping WindowType="OpenGateLook/OGEditbox" TargetType="CEGUI/Editbox" 
+			Renderer="Falagard/Editbox" 
+			LookNFeel="OpenGateLook/OGEditbox" />
+    <FalagardMapping WindowType="OpenGateLook/OGVerticalScrollbar" TargetType="CEGUI/Scrollbar" 
+			Renderer="Falagard/Scrollbar" 
+			LookNFeel="OpenGateLook/OGVerticalScrollbar" />
+    <FalagardMapping WindowType="OpenGateLook/OGProgressBarEnergy" TargetType="CEGUI/ProgressBar" 
+			Renderer="Falagard/ProgressBar" 
+			LookNFeel="OpenGateLook/OGProgressBarEnergy" />
+    <FalagardMapping WindowType="OpenGateLook/OGProgressBarHull" TargetType="CEGUI/ProgressBar" 
+			Renderer="Falagard/ProgressBar" 
+			LookNFeel="OpenGateLook/OGProgressBarHull" />
+    <FalagardMapping WindowType="OpenGateLook/OGProgressBarShield" TargetType="CEGUI/ProgressBar" 
+			Renderer="Falagard/ProgressBar" 
+			LookNFeel="OpenGateLook/OGProgressBarShield" />
+    <FalagardMapping WindowType="OpenGateLook/OGProgressBarVert" TargetType="CEGUI/ProgressBar" 
+			Renderer="Falagard/ProgressBar" 
+			LookNFeel="OpenGateLook/OGProgressBarVert" />
+    <FalagardMapping WindowType="OpenGateLook/OGProgressBarWeapon1" TargetType="CEGUI/ProgressBar" 
+			Renderer="Falagard/ProgressBar" 
+			LookNFeel="OpenGateLook/OGProgressBarWeapon1" />
+    <FalagardMapping WindowType="OpenGateLook/OGProgressBarWeapon2" TargetType="CEGUI/ProgressBar" 
+			Renderer="Falagard/ProgressBar" 
+			LookNFeel="OpenGateLook/OGProgressBarWeapon2" />
+    <FalagardMapping WindowType="OpenGateLook/OGProgressBarWeapon3" TargetType="CEGUI/ProgressBar" 
+			Renderer="Falagard/ProgressBar" 
+			LookNFeel="OpenGateLook/OGProgressBarWeapon3" />
+    <FalagardMapping WindowType="OpenGateLook/OGVerticalScrollbarThumb" TargetType="CEGUI/Thumb" 
+			Renderer="Falagard/Button" 
+			LookNFeel="OpenGateLook/OGVerticalScrollbarThumb" />
+    <FalagardMapping WindowType="OpenGateLook/OGUIPanels" TargetType="DefaultWindow" 
+			Renderer="Falagard/StaticImage" 
+			LookNFeel="OpenGateLook/OGUIPanels" />
+    <FalagardMapping WindowType="OpenGateLook/OGStaticText" TargetType="DefaultWindow" 
+			Renderer="Falagard/StaticText" 
+			LookNFeel="OpenGateLook/OGStaticText" />
 </GUIScheme>

Added: trunk/data/commodities/CPU.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/commodities/CPU.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/commodities/aluminium.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/commodities/aluminium.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: trunk/data/commodities/aluminium.xml
===================================================================
--- trunk/data/commodities/aluminium.xml	2007-06-01 23:33:29 UTC (rev 517)
+++ trunk/data/commodities/aluminium.xml	2007-06-01 23:35:06 UTC (rev 518)
@@ -10,12 +10,12 @@
 	<class_de>Metall</class_de>
 	<class_en>metal</class_en>
 	<techlevel>0</techlevel>
-	<size>1</size>
+	<size>8</size>
 	<mass>2702</mass>
 
 	<!-- Additional Data -->
 	<description>TODO</description>
-	<image>aluminium.jpg</image>
+	<image>aluminium.png</image>
 	<model>aluminium.blend</model>
 	<mesh>aluminium.mesh</mesh>
 
@@ -27,4 +27,4 @@
 	<!-- Production Data -->
 	<production-center>Mined</production-center>
 
-</component>
\ No newline at end of file
+</component>

Added: trunk/data/commodities/antimony.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/commodities/antimony.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: trunk/data/commodities/antimony.xml
===================================================================
--- trunk/data/commodities/antimony.xml	2007-06-01 23:33:29 UTC (rev 517)
+++ trunk/data/commodities/antimony.xml	2007-06-01 23:35:06 UTC (rev 518)
@@ -9,7 +9,7 @@
 	<class_de>Halbmetall</class_de>
 	<class_en>Metalloid</class_en>
 
-	<image>antimony.jpg</image>
+	<image>antimony.png</image>
 	<model>antimony.blend</model>
 
 	<!-- Production Data -->
@@ -23,4 +23,4 @@
 
 	<melting-point>630</melting-point>
 	<gravitic-sig>6.7</gravitic-sig>
-</component>
\ No newline at end of file
+</component>

Added: trunk/data/commodities/barium.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/commodities/barium.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: trunk/data/commodities/barium.xml
===================================================================
--- trunk/data/commodities/barium.xml	2007-06-01 23:33:29 UTC (rev 517)
+++ trunk/data/commodities/barium.xml	2007-06-01 23:35:06 UTC (rev 518)
@@ -9,7 +9,7 @@
 	<class_de>Metall</class_de>
 	<class_en>metal</class_en>
 
-	<image>barium.jpg</image>
+	<image>barium.png</image>
 	<model>barium.blend</model>
 
 	<!-- Production Data -->
@@ -23,4 +23,4 @@
 
 	<melting-point>725</melting-point>
 	<gravitic-sig>3.5</gravitic-sig>
-</component>
\ No newline at end of file
+</component>

Added: trunk/data/commodities/cesium.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/commodities/cesium.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: trunk/data/commodities/cesium.xml
===================================================================
--- trunk/data/commodities/cesium.xml	2007-06-01 23:33:29 UTC (rev 517)
+++ trunk/data/commodities/cesium.xml	2007-06-01 23:35:06 UTC (rev 518)
@@ -9,7 +9,7 @@
 	<class_de>Metall</class_de>
 	<class_en>metal</class_en>
 
-	<image>cesium.jpg</image>
+	<image>cesium.png</image>
 	<model>cesium.blend</model>
 
 	<!-- Production Data -->
@@ -23,4 +23,4 @@
 
 	<melting-point>28</melting-point>
 	<gravitic-sig>1.9</gravitic-sig>
-</component>
\ No newline at end of file
+</component>

Added: trunk/data/commodities/chemicals.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/commodities/chemicals.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: trunk/data/commodities/chemicals.xml
===================================================================
--- trunk/data/commodities/chemicals.xml	2007-06-01 23:33:29 UTC (rev 517)
+++ trunk/data/commodities/chemicals.xml	2007-06-01 23:35:06 UTC (rev 518)
@@ -1,10 +1,4 @@
 <?xml version="1.0"?>
-<!DOCTYPE Umlaute [
-	<!ENTITY auml "&#228;">
-	<!ENTITY ouml "&#246;">
-	<!ENTITY uuml "&#252;">
-	<!ENTITY szlig "&#223;">
-]>
 
 <component type="Produced">
 	<!-- Name -->
@@ -42,4 +36,4 @@
 	<required-component>Zinc</required-component>
 	<required-component>Nitrogen</required-component>
 	<required-component>Carbon</required-component>
-</component>
\ No newline at end of file
+</component>

Added: trunk/data/commodities/chromium.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/commodities/chromium.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: trunk/data/commodities/chromium.xml
===================================================================
--- trunk/data/commodities/chromium.xml	2007-06-01 23:33:29 UTC (rev 517)
+++ trunk/data/commodities/chromium.xml	2007-06-01 23:35:06 UTC (rev 518)
@@ -9,7 +9,7 @@
 	<class_de>Metall</class_de>
 	<class_en>metal</class_en>
 
-	<image>chromium.jpg</image>
+	<image>chromium.png</image>
 	<model>chromium.blend</model>
 
 	<!-- Production Data -->
@@ -23,4 +23,4 @@
 
 	<melting-point>1857</melting-point>
 	<gravitic-sig>7.2</gravitic-sig>
-</component>
\ No newline at end of file
+</component>

Added: trunk/data/commodities/copper.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/commodities/copper.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: trunk/data/commodities/copper.xml
===================================================================
--- trunk/data/commodities/copper.xml	2007-06-01 23:33:29 UTC (rev 517)
+++ trunk/data/commodities/copper.xml	2007-06-01 23:35:06 UTC (rev 518)
@@ -9,7 +9,7 @@
 	<class_de>Metall</class_de>
 	<class_en>metal</class_en>
 
-	<image>copper.jpg</image>
+	<image>copper.png</image>
 	<model>copper.blend</model>
 
 	<!-- Production Data -->
@@ -23,4 +23,4 @@
 
 	<melting-point>1083</melting-point>
 	<gravitic-sig>8.9</gravitic-sig>
-</component>
\ No newline at end of file
+</component>

Modified: trunk/data/commodities/cpu.xml
===================================================================
--- trunk/data/commodities/cpu.xml	2007-06-01 23:33:29 UTC (rev 517)
+++ trunk/data/commodities/cpu.xml	2007-06-01 23:35:06 UTC (rev 518)
@@ -1,10 +1,4 @@
 <?xml version="1.0"?>
-<!DOCTYPE Umlaute [
-	<!ENTITY auml "&#228;">
-	<!ENTITY ouml "&#246;">
-	<!ENTITY uuml "&#252;">
-	<!ENTITY szlig "&#223;">
-]>
 
 <component type="Produced">
 	<!-- Name -->
@@ -39,4 +33,4 @@
 	<required-component>Silver</required-component>
 	<required-component>Silicon</required-component>
 	<required-component>RAM</required-component>
-</component>
\ No newline at end of file
+</component>

Added: trunk/data/commodities/fuel_cells.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/commodities/fuel_cells.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: trunk/data/commodities/fuel_cells.xml
===================================================================
--- trunk/data/commodities/fuel_cells.xml	2007-06-01 23:33:29 UTC (rev 517)
+++ trunk/data/commodities/fuel_cells.xml	2007-06-01 23:35:06 UTC (rev 518)
@@ -1,10 +1,4 @@
 <?xml version="1.0"?>
-<!DOCTYPE Umlaute [
-	<!ENTITY auml "&#228;">
-	<!ENTITY ouml "&#246;">
-	<!ENTITY uuml "&#252;">
-	<!ENTITY szlig "&#223;">
-]>
 
 <component type="Produced">
 	<!-- Name -->
@@ -17,7 +11,7 @@
 
 	<!-- Description -->
 	<description_de>Brennstoffzellen sind Energieumwandler, die chemische Energie in elektrische Energie wandeln k&ouml;nnen. Als chemische Energiequellen verwendet man meist den aus dem All gesammelten Wasserstoff und verbindet diesen mit Sauerstoff in der Zelle zu Wasser. Der Vorteil einer leistungsstarken Brennstoffzelle im Vergleich zu einem Fusionsreaktor besteht darin, dass keine Radioaktivit&auml;t anf&auml;llt und au&szlig;erdem das Endprodukt der Wandlung, das Wasser, durch Energie wieder zu Wasserstoff und Sauerstoff getrennt werden kann. Brennstoffzellen k&ouml;nnen daher wieder aufgeladen werden, w&auml;hrend Fussionsreaktoren mit neuem Brennmaterial versorgt werden m&uuml;ssen. Leider reicht bis heute auch die st&auml;rkste Brennstoffzelle bei Weitem nicht aus, um Schiffstriebwerke betreiben zu k&ouml;nnen. Sie werden jedoch oft in Drohnen und Satelliten zur Energiebereitstellung eingesetzt.</description_de>
-	<description_en></description_en>
+	<description_en>Brennstoffzellen sind Energieumwandler, die chemische Energie in elektrische Energie wandeln k&ouml;nnen. Als chemische Energiequellen verwendet man meist den aus dem All gesammelten Wasserstoff und verbindet diesen mit Sauerstoff in der Zelle zu Wasser. Der Vorteil einer leistungsstarken Brennstoffzelle im Vergleich zu einem Fusionsreaktor besteht darin, dass keine Radioaktivit&auml;t anf&auml;llt und au&szlig;erdem das Endprodukt der Wandlung, das Wasser, durch Energie wieder zu Wasserstoff und Sauerstoff getrennt werden kann. Brennstoffzellen k&ouml;nnen daher wieder aufgeladen werden, w&auml;hrend Fussionsreaktoren mit neuem Brennmaterial versorgt werden m&uuml;ssen. Leider reicht bis heute auch die st&auml;rkste Brennstoffzelle bei Weitem nicht aus, um Schiffstriebwerke betreiben zu k&ouml;nnen. Sie werden jedoch oft in Drohnen und Satelliten zur Energiebereitstellung eingesetzt.</description_de>
 
 	<image>fuel_cells.png</image>
 	<model>fuel_cells.blend</model>
@@ -41,4 +35,4 @@
 	<required-component>Phosphorous</required-component>
 	<required-component>Silicon</required-component>
 	<required-component>Rubber</required-component>
-</component>
\ No newline at end of file
+</component>

Added: trunk/data/commodities/gold.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/commodities/gold.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: trunk/data/commodities/gold.xml
===================================================================
--- trunk/data/commodities/gold.xml	2007-06-01 23:33:29 UTC (rev 517)
+++ trunk/data/commodities/gold.xml	2007-06-01 23:35:06 UTC (rev 518)
@@ -1,10 +1,4 @@
 <?xml version="1.0"?>
-<!DOCTYPE Umlaute [
-	<!ENTITY auml "&#228;">
-	<!ENTITY ouml "&#246;">
-	<!ENTITY uuml "&#252;">
-	<!ENTITY szlig "&#223;">
-]>
 
 <component type="Mineable">
 	<!-- Name -->
@@ -32,4 +26,4 @@
 
 	<melting-point>1064</melting-point>
 	<gravitic-sig>19.3</gravitic-sig>
-</component>
\ No newline at end of file
+</component>

Added: trunk/data/commodities/helium.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/commodities/helium.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/commodities/ice.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/commodities/ice.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/commodities/ice.xml
===================================================================
--- trunk/data/commodities/ice.xml	                        (rev 0)
+++ trunk/data/commodities/ice.xml	2007-06-01 23:35:06 UTC (rev 518)
@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<!DOCTYPE equipment SYSTEM "http://opengate.sourceforge.net/opengate.dtd">
+
+<component type="Mineable">
+	<!-- Naming -->
+	<name_de>Eis</name_de>
+	<name_en>Ice</name_en>
+
+	<!-- Generic Data -->
+	<class_de>Food</class_de>
+	<class_en>food</class_en>
+	<techlevel>0</techlevel>
+	<size>1</size>
+	<mass>917</mass>
+
+	<!-- Additional Data -->
+	<description>TODO</description>
+	<image>ice.png</image>
+	<model>ice.blend</model>
+
+	<!-- Specific data -->
+	<id>Ice</id>
+	<melting-point>273</melting-point>
+	<gravitic-sig>2.7</gravitic-sig>
+
+	<!-- Production Data -->
+	<production-center>Mined</production-center>
+
+</component>

Added: trunk/data/commodities/laser_components.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/commodities/laser_components.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: trunk/data/commodities/laser_components.xml
===================================================================
--- trunk/data/commodities/laser_components.xml	2007-06-01 23:33:29 UTC (rev 517)
+++ trunk/data/commodities/laser_components.xml	2007-06-01 23:35:06 UTC (rev 518)
@@ -9,7 +9,7 @@
 	<class_de>Komponente</class_de>
 	<class_en>component</class_en>
 
-	<image>laser_components.jpg</image>
+	<image>laser_components.png</image>
 	<model>laser_components.blend</model>
 
 	<!-- Production Data -->
@@ -30,4 +30,4 @@
 	<required-component>Xenon</required-component>
 	<required-component>Nitrogen</required-component>
 	<required-component>Machined Parts</required-component>
-</component>
\ No newline at end of file
+</component>

Added: trunk/data/commodities/medical_supplies.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/commodities/medical_supplies.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: trunk/data/commodities/medical_supplies.xml
===================================================================
--- trunk/data/commodities/medical_supplies.xml	2007-06-01 23:33:29 UTC (rev 517)
+++ trunk/data/commodities/medical_supplies.xml	2007-06-01 23:35:06 UTC (rev 518)
@@ -1,10 +1,4 @@
 <?xml version="1.0"?>
-<!DOCTYPE Umlaute [
-	<!ENTITY auml "&#228;">
-	<!ENTITY ouml "&#246;">
-	<!ENTITY uuml "&#252;">
-	<!ENTITY szlig "&#223;">
-]>
 
 <component type="Produced">
 	<!-- Name -->

Added: trunk/data/commodities/nitrogen.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/commodities/nitrogen.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/commodities/octavia_light.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/commodities/octavia_light.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/commodities/rubber.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/commodities/rubber.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: trunk/data/commodities/rubber.xml
===================================================================
(Binary files differ)

Added: trunk/data/commodities/xenon.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/commodities/xenon.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: trunk/data/commodities/xenon.xml
===================================================================
--- trunk/data/commodities/xenon.xml	2007-06-01 23:33:29 UTC (rev 517)
+++ trunk/data/commodities/xenon.xml	2007-06-01 23:35:06 UTC (rev 518)
@@ -1,11 +1,4 @@
 <?xml version="1.0"?>
-<!DOCTYPE Umlaute [
-	<!ENTITY auml "&#228;">
-	<!ENTITY ouml "&#246;">
-	<!ENTITY uuml "&#252;">
-	<!ENTITY Uuml "&#220;">
-	<!ENTITY szlig "&#223;">
-]>
 
 <component type="Mineable">
 	<!-- Name -->
@@ -17,8 +10,8 @@
 	<class_en>noble gas</class_en>
 
 	<!-- Description -->
-	<description_de>Das extrem reaktionstr&auml;ge Edelgas wurde in fr&uuml;heren Zeiten oft in Ionenantrieben der ersten Schiffstriebwerksgeneration eingesetzt. Da die Herstellung damals noch recht teuer war hat man die leistungsschwache Technologie schon bald durch die neue Generation der Schiffstriebwerke ersetzen k&ouml;nnen, bei denen kein Xenon mehr notwendig war. Heute steht Xenon hingegen oft im &Uuml;berfluss zur Verf&uuml;gung, da es eines Zerfallsprodukte des Fussionsreaktors ist. Auf den Raumstationen wird das Xenon f&uuml;r die Beleuchtung eingesetzt. Xenon kann durch elektrische Energie zum Leuchten gebracht werden, wobei die Lichtfarbe durch den Gasdruck in der Gasentladungsr&ouml;hre reguliert werden kann. Dieser Effekt wird vorallem in den Octavia light Werbeschildern eingesetzt, bei denen die Schrift zwischen orange gl&uuml;hend und rot wechselt.</description_de>
-	<description_en></description_en>
+	<description_de>üÜäÄßDas extrem reaktionstr&auml;ge Edelgas wurde in fr&uuml;heren Zeiten oft in Ionenantrieben der ersten Schiffstriebwerksgeneration eingesetzt. Da die Herstellung damals noch recht teuer war hat man die leistungsschwache Technologie schon bald durch die neue Generation der Schiffstriebwerke ersetzen k&ouml;nnen, bei denen kein Xenon mehr notwendig war. Heute steht Xenon hingegen oft im &Uuml;berfluss zur Verf&uuml;gung, da es eines Zerfallsprodukte des Fussionsreaktors ist. Auf den Raumstationen wird das Xenon f&uuml;r die Beleuchtung eingesetzt. Xenon kann durch elektrische Energie zum Leuchten gebracht werden, wobei die Lichtfarbe durch den Gasdruck in der Gasentladungsr&ouml;hre reguliert werden kann. Dieser Effekt wird vorallem in den Octavia light Werbeschildern eingesetzt, bei denen die Schrift zwischen orange gl&uuml;hend und rot wechselt.</description_de>
+	<description_en>üöäÜÖÄßDas extrem reaktionstr&auml;ge Edelgas wurde in fr&uuml;heren Zeiten oft in Ionenantrieben der ersten Schiffstriebwerksgeneration eingesetzt. Da die Herstellung damals noch recht teuer war hat man die leistungsschwache Technologie schon bald durch die neue Generation der Schiffstriebwerke ersetzen k&ouml;nnen, bei denen kein Xenon mehr notwendig war. Heute steht Xenon hingegen oft im &Uuml;berfluss zur Verf&uuml;gung, da es eines Zerfallsprodukte des Fussionsreaktors ist. Auf den Raumstationen wird das Xenon f&uuml;r die Beleuchtung eingesetzt. Xenon kann durch elektrische Energie zum Leuchten gebracht werden, wobei die Lichtfarbe durch den Gasdruck in der Gasentladungsr&ouml;hre reguliert werden kann. Dieser Effekt wird vorallem in den Octavia light Werbeschildern eingesetzt, bei denen die Schrift zwischen orange gl&uuml;hend und rot wechselt.</description_en>
 
 	<image>xenon.png</image>
 	<model>xenon.blend</model>
@@ -34,4 +27,4 @@
 
 	<melting-point>-111.8</melting-point>
 	<gravitic-sig>5.8</gravitic-sig>
-</component>
\ No newline at end of file
+</component>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opengate-svn] SF.net SVN: opengate: [526] trunk/data

[<ult...@us...>]

Revision: 526
          http://svn.sourceforge.net/opengate/?rev=526&view=rev
Author:   ultrasick
Date:     2007-06-03 16:54:05 -0700 (Sun, 03 Jun 2007)

Log Message:
-----------
uploading mainly the new xml files from the exporter and some other stuff

Modified Paths:
--------------
    trunk/data/capacitors/deepol.xml
    trunk/data/capacitors/mantra.xml
    trunk/data/capacitors/outlet.xml
    trunk/data/capacitors/sponge.xml
    trunk/data/capacitors/tank.xml
    trunk/data/commodities/aluminium.xml
    trunk/data/commodities/antimony.xml
    trunk/data/commodities/barium.xml
    trunk/data/commodities/cesium.xml
    trunk/data/commodities/chemicals.xml
    trunk/data/commodities/chromium.xml
    trunk/data/commodities/copper.xml
    trunk/data/commodities/cpu.xml
    trunk/data/commodities/fuel_cells.xml
    trunk/data/commodities/gold.xml
    trunk/data/commodities/helium.xml
    trunk/data/commodities/ice.xml
    trunk/data/commodities/iron.xml
    trunk/data/commodities/laser_components.xml
    trunk/data/commodities/medical_supplies.xml
    trunk/data/commodities/nitrogen.xml
    trunk/data/commodities/octavia_light.xml
    trunk/data/commodities/rubber.xml
    trunk/data/commodities/xenon.xml
    trunk/data/power_plants/contender.xml
    trunk/data/power_plants/contender_xl.xml
    trunk/data/power_plants/spud.xml
    trunk/data/ships/tauseti/lady_kickstart/lady_kickstart.xml

Added Paths:
-----------
    trunk/data/capacitors/summoner.xml
    trunk/data/capacitors/t-c-15.xml
    trunk/data/commodities/ammunition.xml
    trunk/data/commodities/armor.xml
    trunk/data/commodities/conflux_biomass.xml
    trunk/data/commodities/magnetic_components.blend
    trunk/data/commodities/magnetic_components.xml
    trunk/data/commodities/manufactured_foods.xml
    trunk/data/commodities/organic_foods.xml
    trunk/data/commodities/plutonium.xml
    trunk/data/commodities/tauseti_flashback.xml
    trunk/data/commodities/water.xml
    trunk/data/engines/money.xml
    trunk/data/engines/t-e-15.xml
    trunk/data/power_plants/contender_xpr.xml
    trunk/data/radars/
    trunk/data/radars/cyclops.blend
    trunk/data/radars/cyclops.xml
    trunk/data/radars/hall_monitor.blend
    trunk/data/radars/hall_monitor.xml
    trunk/data/radars/outlook.blend
    trunk/data/radars/outlook.xml
    trunk/data/radars/t-r-9.blend
    trunk/data/radars/t-r-9.xml
    trunk/data/rankings/tauseti/
    trunk/data/rankings/tauseti/agent.xml
    trunk/data/rankings/tauseti/apprentice.xml
    trunk/data/rankings/tauseti/arbiter.xml
    trunk/data/rankings/tauseti/associate.xml
    trunk/data/rankings/tauseti/baron.xml
    trunk/data/rankings/tauseti/baronet.xml
    trunk/data/rankings/tauseti/cambist.xml
    trunk/data/rankings/tauseti/chief_coordinator.xml
    trunk/data/rankings/tauseti/chief_executive.xml
    trunk/data/rankings/tauseti/chief_regulator.xml
    trunk/data/rankings/tauseti/contractor.xml
    trunk/data/rankings/tauseti/coordinator.xml
    trunk/data/rankings/tauseti/director.xml
    trunk/data/rankings/tauseti/duke.xml
    trunk/data/rankings/tauseti/financier.xml
    trunk/data/rankings/tauseti/first_associate.xml
    trunk/data/rankings/tauseti/first_merchant.xml
    trunk/data/rankings/tauseti/first_provisioner.xml
    trunk/data/rankings/tauseti/junior_executive.xml
    trunk/data/rankings/tauseti/lead_agent.xml
    trunk/data/rankings/tauseti/lead_contractor.xml
    trunk/data/rankings/tauseti/magnate.xml
    trunk/data/rankings/tauseti/master_associate.xml
    trunk/data/rankings/tauseti/master_cambist.xml
    trunk/data/rankings/tauseti/master_financier.xml
    trunk/data/rankings/tauseti/master_magnate.xml
    trunk/data/rankings/tauseti/master_merchant.xml
    trunk/data/rankings/tauseti/master_provisioner.xml
    trunk/data/rankings/tauseti/master_specialist.xml
    trunk/data/rankings/tauseti/master_tycoon.xml
    trunk/data/rankings/tauseti/merchant.xml
    trunk/data/rankings/tauseti/porter.xml
    trunk/data/rankings/tauseti/president.xml
    trunk/data/rankings/tauseti/provisioner.xml
    trunk/data/rankings/tauseti/recruit.xml
    trunk/data/rankings/tauseti/regulator.xml
    trunk/data/rankings/tauseti/senior_agent.xml
    trunk/data/rankings/tauseti/senior_associate.xml
    trunk/data/rankings/tauseti/senior_cambist.xml
    trunk/data/rankings/tauseti/senior_contractor.xml
    trunk/data/rankings/tauseti/senior_financier.xml
    trunk/data/rankings/tauseti/senior_magnate.xml
    trunk/data/rankings/tauseti/senior_merchant.xml
    trunk/data/rankings/tauseti/senior_provisioner.xml
    trunk/data/rankings/tauseti/senior_regulator.xml
    trunk/data/rankings/tauseti/senior_tycoon.xml
    trunk/data/rankings/tauseti/specialist.xml
    trunk/data/rankings/tauseti/tauseti_alterion.xml
    trunk/data/rankings/tauseti/tauseti_optimus.xml
    trunk/data/rankings/tauseti/tycoon.xml
    trunk/data/rankings/tauseti/vice_president.xml
    trunk/data/shields/alpaa.xml
    trunk/data/shields/flatiron.xml
    trunk/data/shields/himelea.xml
    trunk/data/shields/kydango.xml
    trunk/data/shields/pod.xml
    trunk/data/shields/shelter.xml
    trunk/data/shields/t-s-13.xml
    trunk/data/ships/squadrok/squid/s-1.xml
    trunk/data/ships/squadrok/squid/s-2.xml
    trunk/data/ships/squadrok/squid/s-3.xml
    trunk/data/stations/tauseti/tauseti_wake.xml

Removed Paths:
-------------
    trunk/data/radar/

Property Changed:
----------------
    trunk/data/commodities/aluminium.xml
    trunk/data/commodities/antimony.xml
    trunk/data/commodities/barium.xml
    trunk/data/commodities/cesium.xml
    trunk/data/commodities/chemicals.xml
    trunk/data/commodities/chromium.xml
    trunk/data/commodities/copper.xml
    trunk/data/commodities/cpu.xml
    trunk/data/commodities/fuel_cells.xml
    trunk/data/commodities/gold.xml
    trunk/data/commodities/helium.xml
    trunk/data/commodities/ice.xml
    trunk/data/commodities/iron.xml
    trunk/data/commodities/laser_components.xml
    trunk/data/commodities/medical_supplies.xml
    trunk/data/commodities/nitrogen.xml
    trunk/data/commodities/octavia_light.xml
    trunk/data/commodities/xenon.xml
    trunk/data/power_plants/spud.xml
    trunk/data/ships/tauseti/lady_kickstart/lady_kickstart.xml

Modified: trunk/data/capacitors/deepol.xml
===================================================================
(Binary files differ)

Modified: trunk/data/capacitors/mantra.xml
===================================================================
(Binary files differ)

Modified: trunk/data/capacitors/outlet.xml
===================================================================
(Binary files differ)

Modified: trunk/data/capacitors/sponge.xml
===================================================================
(Binary files differ)

Added: trunk/data/capacitors/summoner.xml
===================================================================
(Binary files differ)


Property changes on: trunk/data/capacitors/summoner.xml
___________________________________________________________________
Name: svn:mime-type
   + application/xml
Name: svn:eol-style
   + native

Added: trunk/data/capacitors/t-c-15.xml
===================================================================
(Binary files differ)


Property changes on: trunk/data/capacitors/t-c-15.xml
___________________________________________________________________
Name: svn:mime-type
   + application/xml
Name: svn:eol-style
   + native

Modified: trunk/data/capacitors/tank.xml
===================================================================
(Binary files differ)

Modified: trunk/data/commodities/aluminium.xml
===================================================================
(Binary files differ)


Property changes on: trunk/data/commodities/aluminium.xml
___________________________________________________________________
Name: svn:mime-type
   - text/plain
   + application/xml

Added: trunk/data/commodities/ammunition.xml
===================================================================
(Binary files differ)


Property changes on: trunk/data/commodities/ammunition.xml
___________________________________________________________________
Name: svn:mime-type
   + application/xml
Name: svn:eol-style
   + native

Modified: trunk/data/commodities/antimony.xml
===================================================================
(Binary files differ)


Property changes on: trunk/data/commodities/antimony.xml
___________________________________________________________________
Name: svn:mime-type
   - text/plain
   + application/xml

Added: trunk/data/commodities/armor.xml
===================================================================
(Binary files differ)


Property changes on: trunk/data/commodities/armor.xml
___________________________________________________________________
Name: svn:mime-type
   + application/xml
Name: svn:eol-style
   + native

Modified: trunk/data/commodities/barium.xml
===================================================================
(Binary files differ)


Property changes on: trunk/data/commodities/barium.xml
___________________________________________________________________
Name: svn:mime-type
   - text/plain
   + application/xml

Modified: trunk/data/commodities/cesium.xml
===================================================================
(Binary files differ)


Property changes on: trunk/data/commodities/cesium.xml
___________________________________________________________________
Name: svn:mime-type
   - text/plain
   + application/xml

Modified: trunk/data/commodities/chemicals.xml
===================================================================
(Binary files differ)


Property changes on: trunk/data/commodities/chemicals.xml
___________________________________________________________________
Name: svn:mime-type
   - text/plain
   + application/xml

Modified: trunk/data/commodities/chromium.xml
===================================================================
(Binary files differ)


Property changes on: trunk/data/commodities/chromium.xml
___________________________________________________________________
Name: svn:mime-type
   - text/plain
   + application/xml

Added: trunk/data/commodities/conflux_biomass.xml
===================================================================
(Binary files differ)


Property changes on: trunk/data/commodities/conflux_biomass.xml
___________________________________________________________________
Name: svn:mime-type
   + application/xml
Name: svn:eol-style
   + native

Modified: trunk/data/commodities/copper.xml
===================================================================
(Binary files differ)


Property changes on: trunk/data/commodities/copper.xml
___________________________________________________________________
Name: svn:mime-type
   - text/plain
   + application/xml

Modified: trunk/data/commodities/cpu.xml
===================================================================
(Binary files differ)


Property changes on: trunk/data/commodities/cpu.xml
___________________________________________________________________
Name: svn:mime-type
   - text/plain
   + application/xml

Modified: trunk/data/commodities/fuel_cells.xml
===================================================================
(Binary files differ)


Property changes on: trunk/data/commodities/fuel_cells.xml
___________________________________________________________________
Name: svn:mime-type
   - text/plain
   + application/xml

Modified: trunk/data/commodities/gold.xml
===================================================================
(Binary files differ)


Property changes on: trunk/data/commodities/gold.xml
___________________________________________________________________
Name: svn:mime-type
   - text/plain
   + application/xml

Modified: trunk/data/commodities/helium.xml
===================================================================
(Binary files differ)


Property changes on: trunk/data/commodities/helium.xml
___________________________________________________________________
Name: svn:mime-type
   - text/plain
   + application/xml

Modified: trunk/data/commodities/ice.xml
===================================================================
(Binary files differ)


Property changes on: trunk/data/commodities/ice.xml
___________________________________________________________________
Name: svn:mime-type
   + application/xml

Modified: trunk/data/commodities/iron.xml
===================================================================
(Binary files differ)


Property changes on: trunk/data/commodities/iron.xml
___________________________________________________________________
Name: svn:mime-type
   - text/plain
   + application/xml

Modified: trunk/data/commodities/laser_components.xml
===================================================================
(Binary files differ)


Property changes on: trunk/data/commodities/laser_components.xml
___________________________________________________________________
Name: svn:mime-type
   - text/plain
   + application/xml

Added: trunk/data/commodities/magnetic_components.blend
===================================================================
(Binary files differ)


Property changes on: trunk/data/commodities/magnetic_components.blend
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/commodities/magnetic_components.xml
===================================================================
(Binary files differ)


Property changes on: trunk/data/commodities/magnetic_components.xml
___________________________________________________________________
Name: svn:mime-type
   + application/xml
Name: svn:eol-style
   + native

Added: trunk/data/commodities/manufactured_foods.xml
===================================================================
(Binary files differ)


Property changes on: trunk/data/commodities/manufactured_foods.xml
___________________________________________________________________
Name: svn:mime-type
   + application/xml
Name: svn:eol-style
   + native

Modified: trunk/data/commodities/medical_supplies.xml
===================================================================
(Binary files differ)


Property changes on: trunk/data/commodities/medical_supplies.xml
___________________________________________________________________
Name: svn:mime-type
   - text/plain
   + application/xml

Modified: trunk/data/commodities/nitrogen.xml
===================================================================
(Binary files differ)


Property changes on: trunk/data/commodities/nitrogen.xml
___________________________________________________________________
Name: svn:mime-type
   - text/plain
   + application/xml

Modified: trunk/data/commodities/octavia_light.xml
===================================================================
(Binary files differ)


Property changes on: trunk/data/commodities/octavia_light.xml
___________________________________________________________________
Name: svn:mime-type
   - text/plain
   + application/xml

Added: trunk/data/commodities/organic_foods.xml
===================================================================
(Binary files differ)


Property changes on: trunk/data/commodities/organic_foods.xml
___________________________________________________________________
Name: svn:mime-type
   + application/xml
Name: svn:eol-style
   + native

Added: trunk/data/commodities/plutonium.xml
===================================================================
(Binary files differ)


Property changes on: trunk/data/commodities/plutonium.xml
___________________________________________________________________
Name: svn:mime-type
   + application/xml
Name: svn:eol-style
   + native

Modified: trunk/data/commodities/rubber.xml
===================================================================
(Binary files differ)

Added: trunk/data/commodities/tauseti_flashback.xml
===================================================================
(Binary files differ)


Property changes on: trunk/data/commodities/tauseti_flashback.xml
___________________________________________________________________
Name: svn:mime-type
   + application/xml
Name: svn:eol-style
   + native

Added: trunk/data/commodities/water.xml
===================================================================
(Binary files differ)


Property changes on: trunk/data/commodities/water.xml
___________________________________________________________________
Name: svn:mime-type
   + application/xml
Name: svn:eol-style
   + native

Modified: trunk/data/commodities/xenon.xml
===================================================================
(Binary files differ)


Property changes on: trunk/data/commodities/xenon.xml
___________________________________________________________________
Name: svn:mime-type
   - text/plain
   + application/xml

Added: trunk/data/engines/money.xml
===================================================================
(Binary files differ)


Property changes on: trunk/data/engines/money.xml
___________________________________________________________________
Name: svn:mime-type
   + application/xml
Name: svn:eol-style
   + native

Added: trunk/data/engines/t-e-15.xml
===================================================================
(Binary files differ)


Property changes on: trunk/data/engines/t-e-15.xml
___________________________________________________________________
Name: svn:mime-type
   + application/xml
Name: svn:eol-style
   + native

Modified: trunk/data/power_plants/contender.xml
===================================================================
(Binary files differ)

Modified: trunk/data/power_plants/contender_xl.xml
===================================================================
(Binary files differ)

Added: trunk/data/power_plants/contender_xpr.xml
===================================================================
(Binary files differ)


Property changes on: trunk/data/power_plants/contender_xpr.xml
___________________________________________________________________
Name: svn:mime-type
   + application/xml
Name: svn:eol-style
   + native

Modified: trunk/data/power_plants/spud.xml
===================================================================
(Binary files differ)


Property changes on: trunk/data/power_plants/spud.xml
___________________________________________________________________
Name: svn:mime-type
   + application/xml

Added: trunk/data/radars/cyclops.blend
===================================================================
(Binary files differ)


Property changes on: trunk/data/radars/cyclops.blend
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/radars/cyclops.xml
===================================================================
(Binary files differ)


Property changes on: trunk/data/radars/cyclops.xml
___________________________________________________________________
Name: svn:mime-type
   + application/xml

Added: trunk/data/radars/hall_monitor.blend
===================================================================
(Binary files differ)


Property changes on: trunk/data/radars/hall_monitor.blend
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/radars/hall_monitor.xml
===================================================================
(Binary files differ)


Property changes on: trunk/data/radars/hall_monitor.xml
___________________________________________________________________
Name: svn:mime-type
   + application/xml

Added: trunk/data/radars/outlook.blend
===================================================================
(Binary files differ)


Property changes on: trunk/data/radars/outlook.blend
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/radars/outlook.xml
===================================================================
(Binary files differ)


Property changes on: trunk/data/radars/outlook.xml
___________________________________________________________________
Name: svn:mime-type
   + application/xml

Added: trunk/data/radars/t-r-9.blend
===================================================================
(Binary files differ)


Property changes on: trunk/data/radars/t-r-9.blend
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/radars/t-r-9.xml
===================================================================
(Binary files differ)


Property changes on: trunk/data/radars/t-r-9.xml
___________________________________________________________________
Name: svn:mime-type
   + application/xml

Added: trunk/data/rankings/tauseti/agent.xml
===================================================================
(Binary files differ)


Property changes on: trunk/data/rankings/tauseti/agent.xml
___________________________________________________________________
Name: svn:mime-type
   + application/xml
Name: svn:eol-style
   + native

Added: trunk/data/rankings/tauseti/apprentice.xml
===================================================================
(Binary files differ)


Property changes on: trunk/data/rankings/tauseti/apprentice.xml
___________________________________________________________________
Name: svn:mime-type
   + application/xml
Name: svn:eol-style
   + native

Added: trunk/data/rankings/tauseti/arbiter.xml
===================================================================
(Binary files differ)


Property changes on: trunk/data/rankings/tauseti/arbiter.xml
___________________________________________________________________
Name: svn:mime-type
   + application/xml
Name: svn:eol-style
   + native

Added: trunk/data/rankings/tauseti/associate.xml
===================================================================
(Binary files differ)


Property changes on: trunk/data/rankings/tauseti/associate.xml
___________________________________________________________________
Name: svn:mime-type
   + application/xml
Name: svn:eol-style
   + native

Added: trunk/data/rankings/tauseti/baron.xml
===================================================================
(Binary files differ)


Property changes on: trunk/data/rankings/tauseti/baron.xml
___________________________________________________________________
Name: svn:mime-type
   + application/xml
Name: svn:eol-style
   + native

Added: trunk/data/rankings/tauseti/baronet.xml
===================================================================
(Binary files differ)


Property changes on: trunk/data/rankings/tauseti/baronet.xml
___________________________________________________________________
Name: svn:mime-type
   + application/xml
Name: svn:eol-style
   + native

Added: trunk/data/rankings/tauseti/cambist.xml
===================================================================
(Binary files differ)


Property changes on: trunk/data/rankings/tauseti/cambist.xml
___________________________________________________________________
Name: svn:mime-type
   + application/xml
Name: svn:eol-style
   + native

Added: trunk/data/rankings/tauseti/chief_coordinator.xml
===================================================================
(Binary files differ)


Property changes on: trunk/data/rankings/tauseti/chief_coordinator.xml
___________________________________________________________________
Name: svn:mime-type
   + application/xml
Name: svn:eol-style
   + native

Added: trunk/data/rankings/tauseti/chief_executive.xml
===================================================================
(Binary files differ)


Property changes on: trunk/data/rankings/tauseti/chief_executive.xml
___________________________________________________________________
Name: svn:mime-type
   + application/xml
Name: svn:eol-style
   + native

Added: trunk/data/rankings/tauseti/chief_regulator.xml
===================================================================
(Binary files differ)


Property changes on: trunk/data/rankings/tauseti/chief_regulator.xml
___________________________________________________________________
Name: svn:mime-type
   + application/xml
Name: svn:eol-style
   + native

Added: trunk/data/rankings/tauseti/contractor.xml
===================================================================
(Binary files differ)


Property changes on: trunk/data/rankings/tauseti/contractor.xml
___________________________________________________________________
Name: svn:mime-type
   + application/xml
Name: svn:eol-style
   + native

Added: trunk/data/rankings/tauseti/coordinator.xml
===================================================================
(Binary files differ)


Property changes on: trunk/data/rankings/tauseti/coordinator.xml
___________________________________________________________________
Name: svn:mime-type
   + application/xml
Name: svn:eol-style
   + native

Added: trunk/data/rankings/tauseti/director.xml
===================================================================
(Binary files differ)


Property changes on: trunk/data/rankings/tauseti/director.xml
___________________________________________________________________
Name: svn:mime-type
   + application/xml
Name: svn:eol-style
   + native

Added: trunk/data/rankings/tauseti/duke.xml
===================================================================
(Binary files differ)


Property changes on: trunk/data/rankings/tauseti/duke.xml
___________________________________________________________________
Name: svn:mime-type
   + application/xml
Name: svn:eol-style
   + native

Added: trunk/data/rankings/tauseti/financier.xml
===================================================================
(Binary files differ)


Property changes on: trunk/data/rankings/tauseti/financier.xml
___________________________________________________________________
Name: svn:mime-type
   + application/xml
Name: svn:eol-style
   + native

Added: trunk/data/rankings/tauseti/first_associate.xml
===================================================================
(Binary files differ)


Property changes on: trunk/data/rankings/tauseti/first_associate.xml
___________________________________________________________________
Name: svn:mime-type
   + application/xml
Name: svn:eol-style
   + native

Added: trunk/data/rankings/tauseti/first_merchant.xml
===================================================================
(Binary files differ)


Property changes on: trunk/data/rankings/tauseti/first_merchant.xml
___________________________________________________________________
Name: svn:mime-type
   + application/xml
Name: svn:eol-style
   + native

Added: trunk/data/rankings/tauseti/first_provisioner.xml
===================================================================
(Binary files differ)


Property changes on: trunk/data/rankings/tauseti/first_provisioner.xml
___________________________________________________________________
Name: svn:mime-type
   + application/xml
Name: svn:eol-style
   + native

Added: trunk/data/rankings/tauseti/junior_executive.xml
===================================================================
(Binary files differ)


Property changes on: trunk/data/rankings/tauseti/junior_executive.xml
___________________________________________________________________
Name: svn:mime-type
   + application/xml
Name: svn:eol-style
   + native

Added: trunk/data/rankings/tauseti/lead_agent.xml
===================================================================
(Binary files differ)


Property changes on: trunk/data/rankings/tauseti/lead_agent.xml
___________________________________________________________________
Name: svn:mime-type
   + application/xml
Name: svn:eol-style
   + native

Added: trunk/data/rankings/tauseti/lead_contractor.xml
===================================================================
(Binary files differ)


Property changes on: trunk/data/rankings/tauseti/lead_contractor.xml
___________________________________________________________________
Name: svn:mime-type
   + application/xml
Name: svn:eol-style
   + native

Added: trunk/data/rankings/tauseti/magnate.xml
===================================================================
(Binary files differ)


Property changes on: trunk/data/rankings/tauseti/magnate.xml
___________________________________________________________________
Name: svn:mime-type
   + application/xml
Name: svn:eol-style
   + native

Added: trunk/data/rankings/tauseti/master_associate.xml
===================================================================
(Binary files differ)


Property changes on: trunk/data/rankings/tauseti/master_associate.xml
___________________________________________________________________
Name: svn:mime-type
   + application/xml
Name: svn:eol-style
   + native

Added: trunk/data/rankings/tauseti/master_cambist.xml
===================================================================
(Binary files differ)


Property changes on: trunk/data/rankings/tauseti/master_cambist.xml
___________________________________________________________________
Name: svn:mime-type
   + application/xml
Name: svn:eol-style
   + native

Added: trunk/data/rankings/tauseti/master_financier.xml
===================================================================
(Binary files differ)


Property changes on: trunk/data/rankings/tauseti/master_financier.xml
___________________________________________________________________
Name: svn:mime-type
   + application/xml
Name: svn:eol-style
   + native

Added: trunk/data/rankings/tauseti/master_magnate.xml
===================================================================
(Binary files differ)


Property changes on: trunk/data/rankings/tauseti/master_magnate.xml
___________________________________________________________________
Name: svn:mime-type
   + application/xml
Name: svn:eol-style
   + native

Added: trunk/data/rankings/tauseti/master_merchant.xml
===================================================================
(Binary files differ)


Property changes on: trunk/data/rankings/tauseti/master_merchant.xml
___________________________________________________________________
Name: svn:mime-type
   + application/xml
Name: svn:eol-style
   + native

Added: trunk/data/rankings/tauseti/master_provisioner.xml
===================================================================
(Binary files differ)


Property changes on: trunk/data/rankings/tauseti/master_provisioner.xml
___________________________________________________________________
Name: svn:mime-type
   + application/xml
Name: svn:eol-style
   + native

Added: trunk/data/rankings/tauseti/master_specialist.xml
===================================================================
(Binary files differ)


Property changes on: trunk/data/rankings/tauseti/master_specialist.xml
___________________________________________________________________
Name: svn:mime-type
   + application/xml
Name: svn:eol-style
   + native

Added: trunk/data/rankings/tauseti/master_tycoon.xml
===================================================================
(Binary files differ)


Property changes on: trunk/data/rankings/tauseti/master_tycoon.xml
___________________________________________________________________
Name: svn:mime-type
   + application/xml
Name: svn:eol-style
   + native

Added: trunk/data/rankings/tauseti/merchant.xml
===================================================================
(Binary files differ)


Property changes on: trunk/data/rankings/tauseti/merchant.xml
___________________________________________________________________
Name: svn:mime-type
   + application/xml
Name: svn:eol-style
   + native

Added: trunk/data/rankings/tauseti/porter.xml
===================================================================
(Binary files differ)


Property changes on: trunk/data/rankings/tauseti/porter.xml
___________________________________________________________________
Name: svn:mime-type
   + application/xml
Name: svn:eol-style
   + native

Added: trunk/data/rankings/tauseti/president.xml
===================================================================
(Binary files differ)


Property changes on: trunk/data/rankings/tauseti/president.xml
___________________________________________________________________
Name: svn:mime-type
   + application/xml
Name: svn:eol-style
   + native

Added: trunk/data/rankings/tauseti/provisioner.xml
===================================================================
(Binary files differ)


Property changes on: trunk/data/rankings/tauseti/provisioner.xml
___________________________________________________________________
Name: svn:mime-type
   + application/xml
Name: svn:eol-style
   + native

Added: trunk/data/rankings/tauseti/recruit.xml
===================================================================
(Binary files differ)


Property changes on: trunk/data/rankings/tauseti/recruit.xml
___________________________________________________________________
Name: svn:mime-type
   + application/xml
Name: svn:eol-style
   + native

Added: trunk/data/rankings/tauseti/regulator.xml
===================================================================
(Binary files differ)


Property changes on: trunk/data/rankings/tauseti/regulator.xml
___________________________________________________________________
Name: svn:mime-type
   + application/xml
Name: svn:eol-style
   + native

Added: trunk/data/rankings/tauseti/senior_agent.xml
===================================================================
(Binary files differ)


Property changes on: trunk/data/rankings/tauseti/senior_agent.xml
___________________________________________________________________
Name: svn:mime-type
   + application/xml
Name: svn:eol-style
   + native

Added: trunk/data/rankings/tauseti/senior_associate.xml
===================================================================
(Binary files differ)


Property changes on: trunk/data/rankings/tauseti/senior_associate.xml
___________________________________________________________________
Name: svn:mime-type
   + application/xml
Name: svn:eol-style
   + native

Added: trunk/data/rankings/tauseti/senior_cambist.xml
===================================================================
(Binary files differ)


Property changes on: trunk/data/rankings/tauseti/senior_cambist.xml
___________________________________________________________________
Name: svn:mime-type
   + application/xml
Name: svn:eol-style
   + native

Added: trunk/data/rankings/tauseti/senior_contractor.xml
===================================================================
(Binary files differ)


Property changes on: trunk/data/rankings/tauseti/senior_contractor.xml
___________________________________________________________________
Name: svn:mime-type
   + application/xml
Name: svn:eol-style
   + native

Added: trunk/data/rankings/tauseti/senior_financier.xml
===================================================================
(Binary files differ)


Property changes on: trunk/data/rankings/tauseti/senior_financier.xml
___________________________________________________________________
Name: svn:mime-type
   + application/xml
Name: svn:eol-style
   + native

Added: trunk/data/rankings/tauseti/senior_magnate.xml
===================================================================
(Binary files differ)


Property changes on: trunk/data/rankings/tauseti/senior_magnate.xml
___________________________________________________________________
Name: svn:mime-type
   + application/xml
Name: svn:eol-style
   + native

Added: trunk/data/rankings/tauseti/senior_merchant.xml
===================================================================
(Binary files differ)


Property changes on: trunk/data/rankings/tauseti/senior_merchant.xml
___________________________________________________________________
Name: svn:mime-type
   + application/xml
Name: svn:eol-style
   + native

Added: trunk/data/rankings/tauseti/senior_provisioner.xml
===================================================================
(Binary files differ)


Property changes on: trunk/data/rankings/tauseti/senior_provisioner.xml
___________________________________________________________________
Name: svn:mime-type
   + application/xml
Name: svn:eol-style
   + native

Added: trunk/data/rankings/tauseti/senior_regulator.xml
===================================================================
(Binary files differ)


Property changes on: trunk/data/rankings/tauseti/senior_regulator.xml
___________________________________________________________________
Name: svn:mime-type
   + application/xml
Name: svn:eol-style
   + native

Added: trunk/data/rankings/tauseti/senior_tycoon.xml
===================================================================
(Binary files differ)


Property changes on: trunk/data/rankings/tauseti/senior_tycoon.xml
___________________________________________________________________
Name: svn:mime-type
   + application/xml
Name: svn:eol-style
   + native

Added: trunk/data/rankings/tauseti/specialist.xml
===================================================================
(Binary files differ)


Property changes on: trunk/data/rankings/tauseti/specialist.xml
___________________________________________________________________
Name: svn:mime-type
   + application/xml
Name: svn:eol-style
   + native

Added: trunk/data/rankings/tauseti/tauseti_alterion.xml
===================================================================
(Binary files differ)


Property changes on: trunk/data/rankings/tauseti/tauseti_alterion.xml
___________________________________________________________________
Name: svn:mime-type
   + application/xml
Name: svn:eol-style
   + native

Added: trunk/data/rankings/tauseti/tauseti_optimus.xml
===================================================================
(Binary files differ)


Property changes on: trunk/data/rankings/tauseti/tauseti_optimus.xml
___________________________________________________________________
Name: svn:mime-type
   + application/xml
Name: svn:eol-style
   + native

Added: trunk/data/rankings/tauseti/tycoon.xml
===================================================================
(Binary files differ)


Property changes on: trunk/data/rankings/tauseti/tycoon.xml
___________________________________________________________________
Name: svn:mime-type
   + application/xml
Name: svn:eol-style
   + native

Added: trunk/data/rankings/tauseti/vice_president.xml
===================================================================
(Binary files differ)


Property changes on: trunk/data/rankings/tauseti/vice_president.xml
___________________________________________________________________
Name: svn:mime-type
   + application/xml
Name: svn:eol-style
   + native

Added: trunk/data/shields/alpaa.xml
===================================================================
(Binary files differ)


Property changes on: trunk/data/shields/alpaa.xml
___________________________________________________________________
Name: svn:mime-type
   + application/xml
Name: svn:eol-style
   + native

Added: trunk/data/shields/flatiron.xml
===================================================================
(Binary files differ)


Property changes on: trunk/data/shields/flatiron.xml
___________________________________________________________________
Name: svn:mime-type
   + application/xml
Name: svn:eol-style
   + native

Added: trunk/data/shields/himelea.xml
===================================================================
(Binary files differ)


Property changes on: trunk/data/shields/himelea.xml
___________________________________________________________________
Name: svn:mime-type
   + application/xml
Name: svn:eol-style
   + native

Added: trunk/data/shields/kydango.xml
===================================================================
(Binary files differ)


Property changes on: trunk/data/shields/kydango.xml
___________________________________________________________________
Name: svn:mime-type
   + application/xml
Name: svn:eol-style
   + native

Added: trunk/data/shields/pod.xml
===================================================================
(Binary files differ)


Property changes on: trunk/data/shields/pod.xml
___________________________________________________________________
Name: svn:mime-type
   + application/xml
Name: svn:eol-style
   + native

Added: trunk/data/shields/shelter.xml
===================================================================
(Binary files differ)


Property changes on: trunk/data/shields/shelter.xml
___________________________________________________________________
Name: svn:mime-type
   + application/xml
Name: svn:eol-style
   + native

Added: trunk/data/shields/t-s-13.xml
===================================================================
(Binary files differ)


Property changes on: trunk/data/shields/t-s-13.xml
___________________________________________________________________
Name: svn:mime-type
   + application/xml
Name: svn:eol-style
   + native

Added: trunk/data/ships/squadrok/squid/s-1.xml
===================================================================
(Binary files differ)


Property changes on: trunk/data/ships/squadrok/squid/s-1.xml
___________________________________________________________________
Name: svn:mime-type
   + application/xml
Name: svn:eol-style
   + native

Added: trunk/data/ships/squadrok/squid/s-2.xml
===================================================================
(Binary files differ)


Property changes on: trunk/data/ships/squadrok/squid/s-2.xml
___________________________________________________________________
Name: svn:mime-type
   + application/xml
Name: svn:eol-style
   + native

Added: trunk/data/ships/squadrok/squid/s-3.xml
===================================================================
(Binary files differ)


Property changes on: trunk/data/ships/squadrok/squid/s-3.xml
___________________________________________________________________
Name: svn:mime-type
   + application/xml
Name: svn:eol-style
   + native

Modified: trunk/data/ships/tauseti/lady_kickstart/lady_kickstart.xml
===================================================================
(Binary files differ)


Property changes on: trunk/data/ships/tauseti/lady_kickstart/lady_kickstart.xml
___________________________________________________________________
Name: svn:mime-type
   + application/xml

Added: trunk/data/stations/tauseti/tauseti_wake.xml
===================================================================
(Binary files differ)


Property changes on: trunk/data/stations/tauseti/tauseti_wake.xml
___________________________________________________________________
Name: svn:mime-type
   + application/xml
Name: svn:eol-style
   + native


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opengate-svn] SF.net SVN: opengate: [529] trunk/data

[<ult...@us...>]

Revision: 529
          http://svn.sourceforge.net/opengate/?rev=529&view=rev
Author:   ultrasick
Date:     2007-06-04 15:15:43 -0700 (Mon, 04 Jun 2007)

Log Message:
-----------
bugfix in the xml files

Modified Paths:
--------------
    trunk/data/capacitors/deepol.xml
    trunk/data/capacitors/mantra.xml
    trunk/data/capacitors/outlet.xml
    trunk/data/capacitors/sponge.xml
    trunk/data/capacitors/summoner.xml
    trunk/data/capacitors/t-c-15.xml
    trunk/data/capacitors/tank.xml
    trunk/data/commodities/aluminium.xml
    trunk/data/commodities/ammunition.xml
    trunk/data/commodities/antimony.xml
    trunk/data/commodities/armor.xml
    trunk/data/commodities/barium.xml
    trunk/data/commodities/cesium.xml
    trunk/data/commodities/chemicals.xml
    trunk/data/commodities/chromium.xml
    trunk/data/commodities/copper.xml
    trunk/data/commodities/cpu.xml
    trunk/data/commodities/fuel_cells.xml
    trunk/data/commodities/gold.xml
    trunk/data/commodities/helium.xml
    trunk/data/commodities/ice.xml
    trunk/data/commodities/iron.xml
    trunk/data/commodities/laser_components.xml
    trunk/data/commodities/magnetic_components.xml
    trunk/data/commodities/manufactured_foods.xml
    trunk/data/commodities/medical_supplies.xml
    trunk/data/commodities/nitrogen.xml
    trunk/data/commodities/octavia_light.xml
    trunk/data/commodities/organic_foods.xml
    trunk/data/commodities/plutonium.xml
    trunk/data/commodities/rubber.xml
    trunk/data/commodities/tauseti_flashback.xml
    trunk/data/commodities/water.xml
    trunk/data/commodities/xenon.xml
    trunk/data/engines/money.xml
    trunk/data/engines/t-e-15.xml
    trunk/data/power_plants/contender.xml
    trunk/data/power_plants/contender_xl.xml
    trunk/data/power_plants/contender_xpr.xml
    trunk/data/power_plants/spud.xml
    trunk/data/radars/cyclops.xml
    trunk/data/radars/hall_monitor.xml
    trunk/data/radars/outlook.xml
    trunk/data/radars/t-r-9.xml
    trunk/data/shields/alpaa.xml
    trunk/data/shields/flatiron.xml
    trunk/data/shields/himelea.xml
    trunk/data/shields/kydango.xml
    trunk/data/shields/pod.xml
    trunk/data/shields/shelter.xml
    trunk/data/shields/t-s-13.xml
    trunk/data/ships/squadrok/squid/s-1.xml
    trunk/data/ships/squadrok/squid/s-2.xml
    trunk/data/ships/squadrok/squid/s-3.xml
    trunk/data/ships/tauseti/lady_kickstart/lady_kickstart.xml
    trunk/data/stations/tauseti/tauseti_wake.xml

Added Paths:
-----------
    trunk/data/rankings/octavius.xml
    trunk/data/rankings/quantar.xml
    trunk/data/rankings/tauseti.xml

Removed Paths:
-------------
    trunk/data/rankings/octavius_rankings.xml

Modified: trunk/data/capacitors/deepol.xml
===================================================================
(Binary files differ)

Modified: trunk/data/capacitors/mantra.xml
===================================================================
(Binary files differ)

Modified: trunk/data/capacitors/outlet.xml
===================================================================
(Binary files differ)

Modified: trunk/data/capacitors/sponge.xml
===================================================================
(Binary files differ)

Modified: trunk/data/capacitors/summoner.xml
===================================================================
(Binary files differ)

Modified: trunk/data/capacitors/t-c-15.xml
===================================================================
(Binary files differ)

Modified: trunk/data/capacitors/tank.xml
===================================================================
(Binary files differ)

Modified: trunk/data/commodities/aluminium.xml
===================================================================
(Binary files differ)

Modified: trunk/data/commodities/ammunition.xml
===================================================================
(Binary files differ)

Modified: trunk/data/commodities/antimony.xml
===================================================================
(Binary files differ)

Modified: trunk/data/commodities/armor.xml
===================================================================
(Binary files differ)

Modified: trunk/data/commodities/barium.xml
===================================================================
(Binary files differ)

Modified: trunk/data/commodities/cesium.xml
===================================================================
(Binary files differ)

Modified: trunk/data/commodities/chemicals.xml
===================================================================
(Binary files differ)

Modified: trunk/data/commodities/chromium.xml
===================================================================
(Binary files differ)

Modified: trunk/data/commodities/copper.xml
===================================================================
(Binary files differ)

Modified: trunk/data/commodities/cpu.xml
===================================================================
(Binary files differ)

Modified: trunk/data/commodities/fuel_cells.xml
===================================================================
(Binary files differ)

Modified: trunk/data/commodities/gold.xml
===================================================================
(Binary files differ)

Modified: trunk/data/commodities/helium.xml
===================================================================
(Binary files differ)

Modified: trunk/data/commodities/ice.xml
===================================================================
(Binary files differ)

Modified: trunk/data/commodities/iron.xml
===================================================================
(Binary files differ)

Modified: trunk/data/commodities/laser_components.xml
===================================================================
(Binary files differ)

Modified: trunk/data/commodities/magnetic_components.xml
===================================================================
(Binary files differ)

Modified: trunk/data/commodities/manufactured_foods.xml
===================================================================
(Binary files differ)

Modified: trunk/data/commodities/medical_supplies.xml
===================================================================
(Binary files differ)

Modified: trunk/data/commodities/nitrogen.xml
===================================================================
(Binary files differ)

Modified: trunk/data/commodities/octavia_light.xml
===================================================================
(Binary files differ)

Modified: trunk/data/commodities/organic_foods.xml
===================================================================
(Binary files differ)

Modified: trunk/data/commodities/plutonium.xml
===================================================================
(Binary files differ)

Modified: trunk/data/commodities/rubber.xml
===================================================================
(Binary files differ)

Modified: trunk/data/commodities/tauseti_flashback.xml
===================================================================
(Binary files differ)

Modified: trunk/data/commodities/water.xml
===================================================================
(Binary files differ)

Modified: trunk/data/commodities/xenon.xml
===================================================================
(Binary files differ)

Modified: trunk/data/engines/money.xml
===================================================================
(Binary files differ)

Modified: trunk/data/engines/t-e-15.xml
===================================================================
(Binary files differ)

Modified: trunk/data/power_plants/contender.xml
===================================================================
(Binary files differ)

Modified: trunk/data/power_plants/contender_xl.xml
===================================================================
(Binary files differ)

Modified: trunk/data/power_plants/contender_xpr.xml
===================================================================
(Binary files differ)

Modified: trunk/data/power_plants/spud.xml
===================================================================
(Binary files differ)

Modified: trunk/data/radars/cyclops.xml
===================================================================
(Binary files differ)

Modified: trunk/data/radars/hall_monitor.xml
===================================================================
(Binary files differ)

Modified: trunk/data/radars/outlook.xml
===================================================================
(Binary files differ)

Modified: trunk/data/radars/t-r-9.xml
===================================================================
(Binary files differ)

Added: trunk/data/rankings/octavius.xml
===================================================================
(Binary files differ)


Property changes on: trunk/data/rankings/octavius.xml
___________________________________________________________________
Name: svn:mime-type
   + application/xml
Name: svn:eol-style
   + native

Deleted: trunk/data/rankings/octavius_rankings.xml
===================================================================
--- trunk/data/rankings/octavius_rankings.xml	2007-06-04 19:24:08 UTC (rev 528)
+++ trunk/data/rankings/octavius_rankings.xml	2007-06-04 22:15:43 UTC (rev 529)
@@ -1,269 +0,0 @@
-<?xml version="1.0"?>
-
-<rank-matrix fatction="octavius">
-	<rank>
-		<level>0</level>
-		<name>Recruit</name>
-		<experience>0</experience>
-	</rank>
-	<rank type="Enlisted">
-		<level>1</level>
-		<name>Private</name>
-		<experience>2000</experience>
-	</rank>
-	<rank type="Enlisted">
-		<level>2</level>
-		<name>Specialist</name>
-		<experience>4000</experience>
-	</rank>
-	<rank type="Enlisted">
-		<level>3</level>
-		<name>Corporal</name>
-		<experience>8800</experience>
-	</rank>
-	<rank type="Enlisted">
-		<level>4</level>
-		<name>Sergant</name>
-		<experience>15700</experience>
-	</rank>
-	<rank type="Enlisted">
-		<level>5</level>
-		<name>Staff Sergant</name>
-		<experience>25000</experience>
-	</rank>
-	<rank type="Enlisted">
-		<level>6</level>
-		<name>Master Sergant</name>
-		<experience>37000</experience>
-	</rank>
-	<rank type="Enlisted">
-		<level>7</level>
-		<name>First Sergang</name>
-		<experience>51600</experience>
-	</rank>
-	<rank type="Enlisted">
-		<level>8</level>
-		<name>Sergant Major</name>
-		<experience>69000</experience>
-	</rank>
-	<rank type="Enlisted">
-		<level>9</level>
-		<name>Senior Sergant</name>
-		<experience>89300</experience>
-	</rank>
-
-	<rank type="Officers">
-		<level>10</level>
-		<name>Lancer</name>
-		<experience>112600</experience>
-	</rank>
-	<rank type="Officers">
-		<level>11</level>
-		<name>First Lancer</name>
-		<experience>140000</experience>
-	</rank>
-	<rank type="Officers">
-		<level>12</level>
-		<name>Master Lancer</name>
-		<experience>169000</experience>
-	</rank>
-	<rank type="Officers">
-		<level>13</level>
-		<name>Senior Lancer</name>
-		<experience>202000</experience>
-	</rank>
-	<rank type="Officers">
-		<level>14</level>
-		<name>Marksman</name>
-		<experience>240000</experience>
-	</rank>
-	<rank type="Officers">
-		<level>14</level>
-		<name>Marksman</name>
-		<experience>240000</experience>
-	</rank>
-	<rank type="Officers">
-		<level>15</level>
-		<name>First Marksman</name>
-		<experience>280000</experience>
-	</rank>
-	<rank type="Officers">
-		<level>16</level>
-		<name>Master Marksman</name>
-		<experience>325000</experience>
-	</rank>
-	<rank type="Officers">
-		<level>17</level>
-		<name>Senior Marksman</name>
-		<experience>372000</experience>
-	</rank>
-	<rank type="Officers">
-		<level>18</level>
-		<name>Gunner</name>
-		<experience>424000</experience>
-	</rank>
-	<rank type="Officers">
-		<level>19</level>
-		<name>Master Gunner</name>
-		<experience>480000</experience>
-	</rank>
-
-	<rank type="Commanders">
-		<level>20</level>
-		<name>Commander</name>
-		<experience>540000</experience>
-	</rank>
-	<rank type="Commanders">
-		<level>21</level>
-		<name>First Commander</name>
-		<experience>605000</experience>
-	</rank>
-	<rank type="Commanders">
-		<level>22</level>
-		<name>Master Commander</name>
-		<experience>675000</experience>
-	</rank>
-	<rank type="Commanders">
-		<level>23</level>
-		<name>Senior Commander</name>
-		<experience>750000</experience>
-	</rank>
-	<rank type="Commanders">
-		<level>24</level>
-		<name>Brigadier</name>
-		<experience>828000</experience>
-	</rank>
-	<rank type="Commanders">
-		<level>25</level>
-		<name>First Brigadier</name>
-		<experience>911000</experience>
-	</rank>
-	<rank type="Commanders">
-		<level>26</level>
-		<name>Master Brigadier</name>
-		<experience>1000000</experience>
-	</rank>
-	<rank type="Commanders">
-		<level>27</level>
-		<name>Senior Brigadier</name>
-		<experience>1100000</experience>
-	</rank>
-	<rank type="Commanders">
-		<level>28</level>
-		<name>Brigadier General</name>
-		<experience>1200000</experience>
-	</rank>
-	<rank type="Commanders">
-		<level>29</level>
-		<name>General</name>
-		<experience>1300000</experience>
-	</rank>
-
-	<rank type="Council Members">
-		<level>30</level>
-		<name>Mentor</name>
-		<experience>1407000</experience>
-	</rank>
-	<rank type="Council Members">
-		<level>31</level>
-		<name>First Mentor</name>
-		<experience>1520000</experience>
-	</rank>
-	<rank type="Council Members">
-		<level>32</level>
-		<name>Senior Mentor</name>
-		<experience>1640000</experience>
-	</rank>
-	<rank type="Council Members">
-		<level>33</level>
-		<name>Preceptor</name>
-		<experience>1770000</experience>
-	</rank>
-	<rank type="Council Members">
-		<level>34</level>
-		<name>First Preceptor</name>
-		<experience>1910000</experience>
-	</rank>
-	<rank type="Council Members">
-		<level>35</level>
-		<name>High Preceptor</name>
-		<experience>2065000</experience>
-	</rank>
-	<rank type="Council Members">
-		<level>36</level>
-		<name>Phaeton</name>
-		<experience>2230000</experience>
-	</rank>
-	<rank type="Council Members">
-		<level>37</level>
-		<name>First Phaeton</name>
-		<experience>2400000</experience>
-	</rank>
-	<rank type="Council Members">
-		<level>38</level>
-		<name>High Phaeton</name>
-		<experience>2650000</experience>
-	</rank>
-	<rank type="Council Members">
-		<level>39</level>
-		<name>Empirius</name>
-		<experience>3000000</experience>
-	</rank>
-
-	<rank type="High Heroes">
-		<level>40</level>
-		<name>Praetorius</name>
-		<experience>3300000</experience>
-	</rank>
-	<rank type="High Heroes">
-		<level>41</level>
-		<name>First Praetorius</name>
-		<experience>3700000</experience>
-	</rank>
-	<rank type="High Heroes">
-		<level>42</level>
-		<name>Higth Praetorius</name>
-		<experience>4200000</experience>
-	</rank>
-	<rank type="High Heroes">
-		<level>43</level>
-		<name>Ardean</name>
-		<experience>4700000</experience>
-	</rank>
-	<rank type="High Heroes">
-		<level>44</level>
-		<name>First Ardean</name>
-		<experience>5300000</experience>
-	</rank>
-	<rank type="High Heroes">
-		<level>45</level>
-		<name>High Ardean</name>
-		<experience>5900000</experience>
-	</rank>
-	<rank type="High Heroes">
-		<level>46</level>
-		<name>Vendictor</name>
-		<experience>6500000</experience>
-	</rank>
-	<rank type="High Heroes">
-		<level>47</level>
-		<name>First Vendictor</name>
-		<experience>7500000</experience>
-	</rank>
-	<rank type="High Heroes">
-		<level>48</level>
-		<name>High Vendictor</name>
-		<experience>8500000</experience>
-	</rank>
-
-	<rank type="Premiers">
-		<level>49</level>
-		<name>Octavius Alterion</name>
-		<experience>9500000</experience>
-	</rank>
-	<rank type="Premiers">
-		<level>50</level>
-		<name>Octavius Optimus</name>
-		<experience>12000000</experience>
-	</rank>
-</rank-matrix>
\ No newline at end of file

Added: trunk/data/rankings/quantar.xml
===================================================================
(Binary files differ)


Property changes on: trunk/data/rankings/quantar.xml
___________________________________________________________________
Name: svn:mime-type
   + application/xml
Name: svn:eol-style
   + native

Added: trunk/data/rankings/tauseti.xml
===================================================================
(Binary files differ)


Property changes on: trunk/data/rankings/tauseti.xml
___________________________________________________________________
Name: svn:mime-type
   + application/xml
Name: svn:eol-style
   + native

Modified: trunk/data/shields/alpaa.xml
===================================================================
(Binary files differ)

Modified: trunk/data/shields/flatiron.xml
===================================================================
(Binary files differ)

Modified: trunk/data/shields/himelea.xml
===================================================================
(Binary files differ)

Modified: trunk/data/shields/kydango.xml
===================================================================
(Binary files differ)

Modified: trunk/data/shields/pod.xml
===================================================================
(Binary files differ)

Modified: trunk/data/shields/shelter.xml
===================================================================
(Binary files differ)

Modified: trunk/data/shields/t-s-13.xml
===================================================================
(Binary files differ)

Modified: trunk/data/ships/squadrok/squid/s-1.xml
===================================================================
(Binary files differ)

Modified: trunk/data/ships/squadrok/squid/s-2.xml
===================================================================
(Binary files differ)

Modified: trunk/data/ships/squadrok/squid/s-3.xml
===================================================================
(Binary files differ)

Modified: trunk/data/ships/tauseti/lady_kickstart/lady_kickstart.xml
===================================================================
(Binary files differ)

Modified: trunk/data/stations/tauseti/tauseti_wake.xml
===================================================================
(Binary files differ)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opengate-svn] SF.net SVN: opengate: [533] trunk/data

[<spo...@us...>]

Revision: 533
          http://svn.sourceforge.net/opengate/?rev=533&view=rev
Author:   spom_spom
Date:     2007-06-04 16:15:15 -0700 (Mon, 04 Jun 2007)

Log Message:
-----------
added images for commods and equipment

Modified Paths:
--------------
    trunk/data/ECMs/ghost.xml
    trunk/data/engines/money.xml
    trunk/data/radars/cyclops.xml

Added Paths:
-----------
    trunk/data/capacitors/deepol.png
    trunk/data/capacitors/mantra.png
    trunk/data/capacitors/outlet.png
    trunk/data/capacitors/sponge.png
    trunk/data/capacitors/summoner.png
    trunk/data/capacitors/t-c-15.png
    trunk/data/capacitors/tank.png
    trunk/data/commodities/ammunition.png
    trunk/data/commodities/armor.png
    trunk/data/commodities/conflux_biomass.png
    trunk/data/commodities/iron.png
    trunk/data/commodities/magnetic_components.png
    trunk/data/commodities/manufactured_foods.blend
    trunk/data/commodities/manufactured_foods.png
    trunk/data/commodities/organic_foods.png
    trunk/data/commodities/plutonium.png
    trunk/data/commodities/tauseti_flashback.png
    trunk/data/commodities/water.png
    trunk/data/engines/money.png
    trunk/data/engines/t-e-15.png
    trunk/data/power_plants/contender.png
    trunk/data/power_plants/contender_xl.png
    trunk/data/power_plants/contender_xpr.png
    trunk/data/power_plants/spud.png
    trunk/data/radars/cyclops.png
    trunk/data/radars/hall_monitor.png
    trunk/data/radars/outlook.png
    trunk/data/radars/t-r-9.png
    trunk/data/shields/alpaa.png
    trunk/data/shields/flatiron.png
    trunk/data/shields/himelea.png
    trunk/data/shields/kydango.png
    trunk/data/shields/pod.png
    trunk/data/shields/shelter.png
    trunk/data/shields/t-s-13.png

Removed Paths:
-------------
    trunk/data/commodities/manufactured_food.blend
    trunk/data/commodities/ram.xml

Modified: trunk/data/ECMs/ghost.xml
===================================================================
--- trunk/data/ECMs/ghost.xml	2007-06-04 23:14:31 UTC (rev 532)
+++ trunk/data/ECMs/ghost.xml	2007-06-04 23:15:15 UTC (rev 533)
@@ -14,7 +14,7 @@
 
 	<!-- Additional Data -->
 	<description>TODO</description>
-	<image>ghost.jpg</image>
+	<image>ghost.png</image>
 	<model>ghost.blend</model>
 	<mesh>ghost.mesh</mesh>
 

Added: trunk/data/capacitors/deepol.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/capacitors/deepol.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/capacitors/mantra.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/capacitors/mantra.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/capacitors/outlet.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/capacitors/outlet.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/capacitors/sponge.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/capacitors/sponge.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/capacitors/summoner.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/capacitors/summoner.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/capacitors/t-c-15.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/capacitors/t-c-15.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/capacitors/tank.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/capacitors/tank.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/commodities/ammunition.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/commodities/ammunition.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/commodities/armor.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/commodities/armor.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/commodities/conflux_biomass.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/commodities/conflux_biomass.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/commodities/iron.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/commodities/iron.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/commodities/magnetic_components.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/commodities/magnetic_components.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: trunk/data/commodities/manufactured_food.blend
===================================================================
(Binary files differ)

Added: trunk/data/commodities/manufactured_foods.blend
===================================================================
(Binary files differ)


Property changes on: trunk/data/commodities/manufactured_foods.blend
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/commodities/manufactured_foods.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/commodities/manufactured_foods.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/commodities/organic_foods.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/commodities/organic_foods.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/commodities/plutonium.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/commodities/plutonium.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: trunk/data/commodities/ram.xml
===================================================================
--- trunk/data/commodities/ram.xml	2007-06-04 23:14:31 UTC (rev 532)
+++ trunk/data/commodities/ram.xml	2007-06-04 23:15:15 UTC (rev 533)
@@ -1,25 +0,0 @@
-<?xml version="1.0"?>
-
-<component type="Produced">
-	<!-- Naming -->
-	<name>RAM</name>
-	<class>Computing Material</class>
-	<image>ram.jpg</image>
-	<model>ram.blend</model>
-
-	<!-- Production Data -->
-	<production-center>Amananth</production-center>
-	
-	<!-- Generic Data -->
-	<techlevel>0</techlevel>
-	<id>RAM</id>
-	<mass>650</mass>
-
-	<melting-point>varies</melting-point>
-	<gravitic-sig>varies</gravitic-sig>
-
-	<required-component>Copper</required-component>
-	<required-component>Germanium	</required-component>
-	<required-component>Gold</required-component>
-	<required-component>Silicon</required-component>
-</component>

Added: trunk/data/commodities/tauseti_flashback.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/commodities/tauseti_flashback.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/commodities/water.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/commodities/water.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/engines/money.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/engines/money.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: trunk/data/engines/money.xml
===================================================================
(Binary files differ)

Added: trunk/data/engines/t-e-15.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/engines/t-e-15.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/power_plants/contender.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/power_plants/contender.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/power_plants/contender_xl.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/power_plants/contender_xl.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/power_plants/contender_xpr.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/power_plants/contender_xpr.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/power_plants/spud.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/power_plants/spud.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/radars/cyclops.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/radars/cyclops.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: trunk/data/radars/cyclops.xml
===================================================================
(Binary files differ)

Added: trunk/data/radars/hall_monitor.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/radars/hall_monitor.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/radars/outlook.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/radars/outlook.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/radars/t-r-9.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/radars/t-r-9.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/shields/alpaa.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/shields/alpaa.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/shields/flatiron.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/shields/flatiron.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/shields/himelea.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/shields/himelea.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/shields/kydango.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/shields/kydango.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/shields/pod.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/shields/pod.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/shields/shelter.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/shields/shelter.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/shields/t-s-13.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/shields/t-s-13.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opengate-svn] SF.net SVN: opengate: [536] trunk/data

[<ult...@us...>]

Revision: 536
          http://svn.sourceforge.net/opengate/?rev=536&view=rev
Author:   ultrasick
Date:     2007-06-05 19:46:10 -0700 (Tue, 05 Jun 2007)

Log Message:
-----------
another bugfix in the exporter

Modified Paths:
--------------
    trunk/data/capacitors/deepol.xml
    trunk/data/capacitors/mantra.xml
    trunk/data/capacitors/outlet.xml
    trunk/data/capacitors/sponge.xml
    trunk/data/capacitors/summoner.xml
    trunk/data/capacitors/t-c-15.xml
    trunk/data/capacitors/tank.xml
    trunk/data/commodities/ammunition.xml
    trunk/data/commodities/armor.xml
    trunk/data/commodities/chemicals.xml
    trunk/data/commodities/conflux_biomass.xml
    trunk/data/commodities/cpu.xml
    trunk/data/commodities/fuel_cells.xml
    trunk/data/commodities/laser_components.xml
    trunk/data/commodities/magnetic_components.xml
    trunk/data/commodities/manufactured_foods.xml
    trunk/data/commodities/medical_supplies.xml
    trunk/data/commodities/octavia_light.xml
    trunk/data/commodities/organic_foods.xml
    trunk/data/commodities/plutonium.xml
    trunk/data/commodities/rubber.xml
    trunk/data/commodities/tauseti_flashback.xml
    trunk/data/commodities/water.xml
    trunk/data/engines/money.xml
    trunk/data/engines/t-e-15.xml
    trunk/data/power_plants/contender.xml
    trunk/data/power_plants/contender_xl.xml
    trunk/data/power_plants/contender_xpr.xml
    trunk/data/power_plants/gatherer.blend
    trunk/data/power_plants/gatherer.xml
    trunk/data/power_plants/spud.blend
    trunk/data/power_plants/spud.xml
    trunk/data/radars/cyclops.xml
    trunk/data/radars/hall_monitor.xml
    trunk/data/radars/night_watchman.xml
    trunk/data/radars/outlook.xml
    trunk/data/radars/t-r-9.xml
    trunk/data/rankings/tauseti.xml
    trunk/data/shields/alpaa.xml
    trunk/data/shields/flatiron.xml
    trunk/data/shields/himelea.xml
    trunk/data/shields/kydango.xml
    trunk/data/shields/pod.xml
    trunk/data/shields/shelter.xml
    trunk/data/shields/t-s-13.xml
    trunk/data/ships/tauseti/lady_kickstart/lady_kickstart.xml

Added Paths:
-----------
    trunk/data/power_plants/gatherer_290x290.png
    trunk/data/power_plants/gatherer_76x76.png
    trunk/data/power_plants/spud_290x290.png
    trunk/data/power_plants/spud_76x76.png

Removed Paths:
-------------
    trunk/data/power_plants/spud.png

Modified: trunk/data/capacitors/deepol.xml
===================================================================
(Binary files differ)

Modified: trunk/data/capacitors/mantra.xml
===================================================================
(Binary files differ)

Modified: trunk/data/capacitors/outlet.xml
===================================================================
(Binary files differ)

Modified: trunk/data/capacitors/sponge.xml
===================================================================
(Binary files differ)

Modified: trunk/data/capacitors/summoner.xml
===================================================================
(Binary files differ)

Modified: trunk/data/capacitors/t-c-15.xml
===================================================================
(Binary files differ)

Modified: trunk/data/capacitors/tank.xml
===================================================================
(Binary files differ)

Modified: trunk/data/commodities/ammunition.xml
===================================================================
(Binary files differ)

Modified: trunk/data/commodities/armor.xml
===================================================================
(Binary files differ)

Modified: trunk/data/commodities/chemicals.xml
===================================================================
(Binary files differ)

Modified: trunk/data/commodities/conflux_biomass.xml
===================================================================
(Binary files differ)

Modified: trunk/data/commodities/cpu.xml
===================================================================
(Binary files differ)

Modified: trunk/data/commodities/fuel_cells.xml
===================================================================
(Binary files differ)

Modified: trunk/data/commodities/laser_components.xml
===================================================================
(Binary files differ)

Modified: trunk/data/commodities/magnetic_components.xml
===================================================================
(Binary files differ)

Modified: trunk/data/commodities/manufactured_foods.xml
===================================================================
(Binary files differ)

Modified: trunk/data/commodities/medical_supplies.xml
===================================================================
(Binary files differ)

Modified: trunk/data/commodities/octavia_light.xml
===================================================================
(Binary files differ)

Modified: trunk/data/commodities/organic_foods.xml
===================================================================
(Binary files differ)

Modified: trunk/data/commodities/plutonium.xml
===================================================================
(Binary files differ)

Modified: trunk/data/commodities/rubber.xml
===================================================================
(Binary files differ)

Modified: trunk/data/commodities/tauseti_flashback.xml
===================================================================
(Binary files differ)

Modified: trunk/data/commodities/water.xml
===================================================================
(Binary files differ)

Modified: trunk/data/engines/money.xml
===================================================================
(Binary files differ)

Modified: trunk/data/engines/t-e-15.xml
===================================================================
(Binary files differ)

Modified: trunk/data/power_plants/contender.xml
===================================================================
(Binary files differ)

Modified: trunk/data/power_plants/contender_xl.xml
===================================================================
(Binary files differ)

Modified: trunk/data/power_plants/contender_xpr.xml
===================================================================
(Binary files differ)

Modified: trunk/data/power_plants/gatherer.blend
===================================================================
(Binary files differ)

Modified: trunk/data/power_plants/gatherer.xml
===================================================================
(Binary files differ)

Added: trunk/data/power_plants/gatherer_290x290.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/power_plants/gatherer_290x290.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/power_plants/gatherer_76x76.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/power_plants/gatherer_76x76.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: trunk/data/power_plants/spud.blend
===================================================================
(Binary files differ)

Deleted: trunk/data/power_plants/spud.png
===================================================================
(Binary files differ)

Modified: trunk/data/power_plants/spud.xml
===================================================================
(Binary files differ)

Added: trunk/data/power_plants/spud_290x290.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/power_plants/spud_290x290.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/power_plants/spud_76x76.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/power_plants/spud_76x76.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: trunk/data/radars/cyclops.xml
===================================================================
(Binary files differ)

Modified: trunk/data/radars/hall_monitor.xml
===================================================================
(Binary files differ)

Modified: trunk/data/radars/night_watchman.xml
===================================================================
(Binary files differ)

Modified: trunk/data/radars/outlook.xml
===================================================================
(Binary files differ)

Modified: trunk/data/radars/t-r-9.xml
===================================================================
(Binary files differ)

Modified: trunk/data/rankings/tauseti.xml
===================================================================
(Binary files differ)

Modified: trunk/data/shields/alpaa.xml
===================================================================
(Binary files differ)

Modified: trunk/data/shields/flatiron.xml
===================================================================
(Binary files differ)

Modified: trunk/data/shields/himelea.xml
===================================================================
(Binary files differ)

Modified: trunk/data/shields/kydango.xml
===================================================================
(Binary files differ)

Modified: trunk/data/shields/pod.xml
===================================================================
(Binary files differ)

Modified: trunk/data/shields/shelter.xml
===================================================================
(Binary files differ)

Modified: trunk/data/shields/t-s-13.xml
===================================================================
(Binary files differ)

Modified: trunk/data/ships/tauseti/lady_kickstart/lady_kickstart.xml
===================================================================
(Binary files differ)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opengate-svn] SF.net SVN: opengate: [543] trunk/data

[<ult...@us...>]

Revision: 543
          http://svn.sourceforge.net/opengate/?rev=543&view=rev
Author:   ultrasick
Date:     2007-06-06 12:04:27 -0700 (Wed, 06 Jun 2007)

Log Message:
-----------
adding object_id to the xml files
+ moving the stations from data/stations/tauseti to data/stations because they have the faction name in their name anyway

Modified Paths:
--------------
    trunk/data/capacitors/deepol.xml
    trunk/data/capacitors/mantra.xml
    trunk/data/capacitors/outlet.xml
    trunk/data/capacitors/sponge.xml
    trunk/data/capacitors/summoner.xml
    trunk/data/capacitors/t-c-15.xml
    trunk/data/capacitors/tank.xml
    trunk/data/commodities/aluminium.xml
    trunk/data/commodities/ammunition.xml
    trunk/data/commodities/antimony.xml
    trunk/data/commodities/armor.xml
    trunk/data/commodities/barium.xml
    trunk/data/commodities/cesium.xml
    trunk/data/commodities/chemicals.xml
    trunk/data/commodities/chromium.xml
    trunk/data/commodities/conflux_biomass.xml
    trunk/data/commodities/copper.xml
    trunk/data/commodities/cpu.xml
    trunk/data/commodities/fuel_cells.xml
    trunk/data/commodities/gold.xml
    trunk/data/commodities/helium.xml
    trunk/data/commodities/ice.xml
    trunk/data/commodities/iron.xml
    trunk/data/commodities/laser_components.xml
    trunk/data/commodities/magnetic_components.xml
    trunk/data/commodities/manufactured_foods.xml
    trunk/data/commodities/medical_supplies.xml
    trunk/data/commodities/nitrogen.xml
    trunk/data/commodities/octavia_light.xml
    trunk/data/commodities/organic_foods.xml
    trunk/data/commodities/plutonium.xml
    trunk/data/commodities/rubber.xml
    trunk/data/commodities/tauseti_flashback.xml
    trunk/data/commodities/water.xml
    trunk/data/commodities/xenon.xml
    trunk/data/engines/money.xml
    trunk/data/engines/t-e-15.xml
    trunk/data/power_plants/contender.xml
    trunk/data/power_plants/contender_xl.xml
    trunk/data/power_plants/contender_xpr.xml
    trunk/data/power_plants/gatherer.xml
    trunk/data/power_plants/spud.xml
    trunk/data/power_plants/t-p-16.xml
    trunk/data/radars/cyclops.xml
    trunk/data/radars/hall_monitor.xml
    trunk/data/radars/night_watchman.xml
    trunk/data/radars/outlook.xml
    trunk/data/radars/t-r-9.xml
    trunk/data/rankings/octavius.xml
    trunk/data/rankings/tauseti.xml
    trunk/data/shields/alpaa.xml
    trunk/data/shields/flatiron.xml
    trunk/data/shields/himelea.xml
    trunk/data/shields/kydango.xml
    trunk/data/shields/pod.xml
    trunk/data/shields/shelter.xml
    trunk/data/shields/t-s-13.xml
    trunk/data/ships/squadrok/squid/s-1.xml
    trunk/data/ships/squadrok/squid/s-2.xml
    trunk/data/ships/squadrok/squid/s-3.xml
    trunk/data/ships/tauseti/lady_kickstart/lady_kickstart.xml

Added Paths:
-----------
    trunk/data/stations/tauseti_core.blend
    trunk/data/stations/tauseti_wake.blend
    trunk/data/stations/tauseti_wake.xml

Removed Paths:
-------------
    trunk/data/stations/tauseti/

Modified: trunk/data/capacitors/deepol.xml
===================================================================
(Binary files differ)

Modified: trunk/data/capacitors/mantra.xml
===================================================================
(Binary files differ)

Modified: trunk/data/capacitors/outlet.xml
===================================================================
(Binary files differ)

Modified: trunk/data/capacitors/sponge.xml
===================================================================
(Binary files differ)

Modified: trunk/data/capacitors/summoner.xml
===================================================================
(Binary files differ)

Modified: trunk/data/capacitors/t-c-15.xml
===================================================================
(Binary files differ)

Modified: trunk/data/capacitors/tank.xml
===================================================================
(Binary files differ)

Modified: trunk/data/commodities/aluminium.xml
===================================================================
(Binary files differ)

Modified: trunk/data/commodities/ammunition.xml
===================================================================
(Binary files differ)

Modified: trunk/data/commodities/antimony.xml
===================================================================
(Binary files differ)

Modified: trunk/data/commodities/armor.xml
===================================================================
(Binary files differ)

Modified: trunk/data/commodities/barium.xml
===================================================================
(Binary files differ)

Modified: trunk/data/commodities/cesium.xml
===================================================================
(Binary files differ)

Modified: trunk/data/commodities/chemicals.xml
===================================================================
(Binary files differ)

Modified: trunk/data/commodities/chromium.xml
===================================================================
(Binary files differ)

Modified: trunk/data/commodities/conflux_biomass.xml
===================================================================
(Binary files differ)

Modified: trunk/data/commodities/copper.xml
===================================================================
(Binary files differ)

Modified: trunk/data/commodities/cpu.xml
===================================================================
(Binary files differ)

Modified: trunk/data/commodities/fuel_cells.xml
===================================================================
(Binary files differ)

Modified: trunk/data/commodities/gold.xml
===================================================================
(Binary files differ)

Modified: trunk/data/commodities/helium.xml
===================================================================
(Binary files differ)

Modified: trunk/data/commodities/ice.xml
===================================================================
(Binary files differ)

Modified: trunk/data/commodities/iron.xml
===================================================================
(Binary files differ)

Modified: trunk/data/commodities/laser_components.xml
===================================================================
(Binary files differ)

Modified: trunk/data/commodities/magnetic_components.xml
===================================================================
(Binary files differ)

Modified: trunk/data/commodities/manufactured_foods.xml
===================================================================
(Binary files differ)

Modified: trunk/data/commodities/medical_supplies.xml
===================================================================
(Binary files differ)

Modified: trunk/data/commodities/nitrogen.xml
===================================================================
(Binary files differ)

Modified: trunk/data/commodities/octavia_light.xml
===================================================================
(Binary files differ)

Modified: trunk/data/commodities/organic_foods.xml
===================================================================
(Binary files differ)

Modified: trunk/data/commodities/plutonium.xml
===================================================================
(Binary files differ)

Modified: trunk/data/commodities/rubber.xml
===================================================================
(Binary files differ)

Modified: trunk/data/commodities/tauseti_flashback.xml
===================================================================
(Binary files differ)

Modified: trunk/data/commodities/water.xml
===================================================================
(Binary files differ)

Modified: trunk/data/commodities/xenon.xml
===================================================================
(Binary files differ)

Modified: trunk/data/engines/money.xml
===================================================================
(Binary files differ)

Modified: trunk/data/engines/t-e-15.xml
===================================================================
(Binary files differ)

Modified: trunk/data/power_plants/contender.xml
===================================================================
(Binary files differ)

Modified: trunk/data/power_plants/contender_xl.xml
===================================================================
(Binary files differ)

Modified: trunk/data/power_plants/contender_xpr.xml
===================================================================
(Binary files differ)

Modified: trunk/data/power_plants/gatherer.xml
===================================================================
(Binary files differ)

Modified: trunk/data/power_plants/spud.xml
===================================================================
(Binary files differ)

Modified: trunk/data/power_plants/t-p-16.xml
===================================================================
(Binary files differ)

Modified: trunk/data/radars/cyclops.xml
===================================================================
(Binary files differ)

Modified: trunk/data/radars/hall_monitor.xml
===================================================================
(Binary files differ)

Modified: trunk/data/radars/night_watchman.xml
===================================================================
(Binary files differ)

Modified: trunk/data/radars/outlook.xml
===================================================================
(Binary files differ)

Modified: trunk/data/radars/t-r-9.xml
===================================================================
(Binary files differ)

Modified: trunk/data/rankings/octavius.xml
===================================================================
(Binary files differ)

Modified: trunk/data/rankings/tauseti.xml
===================================================================
(Binary files differ)

Modified: trunk/data/shields/alpaa.xml
===================================================================
(Binary files differ)

Modified: trunk/data/shields/flatiron.xml
===================================================================
(Binary files differ)

Modified: trunk/data/shields/himelea.xml
===================================================================
(Binary files differ)

Modified: trunk/data/shields/kydango.xml
===================================================================
(Binary files differ)

Modified: trunk/data/shields/pod.xml
===================================================================
(Binary files differ)

Modified: trunk/data/shields/shelter.xml
===================================================================
(Binary files differ)

Modified: trunk/data/shields/t-s-13.xml
===================================================================
(Binary files differ)

Modified: trunk/data/ships/squadrok/squid/s-1.xml
===================================================================
(Binary files differ)

Modified: trunk/data/ships/squadrok/squid/s-2.xml
===================================================================
(Binary files differ)

Modified: trunk/data/ships/squadrok/squid/s-3.xml
===================================================================
(Binary files differ)

Modified: trunk/data/ships/tauseti/lady_kickstart/lady_kickstart.xml
===================================================================
(Binary files differ)

Added: trunk/data/stations/tauseti_core.blend
===================================================================
(Binary files differ)


Property changes on: trunk/data/stations/tauseti_core.blend
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/stations/tauseti_wake.blend
===================================================================
(Binary files differ)


Property changes on: trunk/data/stations/tauseti_wake.blend
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/stations/tauseti_wake.xml
===================================================================
(Binary files differ)


Property changes on: trunk/data/stations/tauseti_wake.xml
___________________________________________________________________
Name: svn:mime-type
   + application/xml
Name: svn:eol-style
   + native


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opengate-svn] SF.net SVN: opengate: [556] trunk/data

[<ult...@us...>]

Revision: 556
          http://svn.sourceforge.net/opengate/?rev=556&view=rev
Author:   ultrasick
Date:     2007-06-12 14:22:09 -0700 (Tue, 12 Jun 2007)

Log Message:
-----------
uploading xml file for class_ids, category_ids and now also faction_ids

Added Paths:
-----------
    trunk/data/ids.xml

Removed Paths:
-------------
    trunk/data/categories.xml
    trunk/data/classes.xml

Deleted: trunk/data/categories.xml
===================================================================
(Binary files differ)

Deleted: trunk/data/classes.xml
===================================================================
(Binary files differ)

Added: trunk/data/ids.xml
===================================================================
(Binary files differ)


Property changes on: trunk/data/ids.xml
___________________________________________________________________
Name: svn:mime-type
   + application/xml
Name: svn:eol-style
   + native


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opengate-svn] SF.net SVN: opengate: [575] trunk/data

[<ult...@us...>]

Revision: 575
          http://svn.sourceforge.net/opengate/?rev=575&view=rev
Author:   ultrasick
Date:     2007-06-18 13:18:48 -0700 (Mon, 18 Jun 2007)

Log Message:
-----------
uploading credits text file (to be shown in the options screen)
+ moving jgdata.xml to misc directory

Added Paths:
-----------
    trunk/data/credits.txt
    trunk/data/misc/jgdata.xml

Removed Paths:
-------------
    trunk/data/jgdata.xml

Added: trunk/data/credits.txt
===================================================================
--- trunk/data/credits.txt	                        (rev 0)
+++ trunk/data/credits.txt	2007-06-18 20:18:48 UTC (rev 575)
@@ -0,0 +1,23 @@
+Project leader:
+---------------
+- eGore
+
+Regular contributors:
+---------------------
+
+- eGore (source code, 3d models)
+- Spom (source code)
+- Ultrasick (graphics, website, 3d models)
+
+Other contributors:
+-------------------
+
+- AFK_ (source code)
+
+Special thanks to ...
+---------------------
+
+... Delwin for providing his super fast computer to do blender renderings for a dozen times!
+... LordOtter for his great webradio which I (Ultrasick) listened to for hours while I was working on Opengate! :-)
+... Ramiel (www.jagthesite.com) for providing nice base textures for the Lady Kickstart!
+... www.a1freesoundeffects.com for the sonar ping sound file we used in the open source splash screen!
\ No newline at end of file


Property changes on: trunk/data/credits.txt
___________________________________________________________________
Name: svn:eol-style
   + native

Deleted: trunk/data/jgdata.xml
===================================================================
--- trunk/data/jgdata.xml	2007-06-18 20:04:25 UTC (rev 574)
+++ trunk/data/jgdata.xml	2007-06-18 20:18:48 UTC (rev 575)
@@ -1,1108 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<?RAVL  class="JGMapper::JGDataSetC" ?>
-<JGDataSet >
- <Space colour="236 73 76" name="Octavius" />
- <Space colour="243 199 245" name="Amananth" />
- <Space colour="237 185 122" name="Hyperial" />
- <Space colour="127 127 127" name="Unreg" />
- <Space colour="114 152 199" name="Solrain" />
- <Space colour="156 212 94" name="Quantar" />
- <Sector flux="7" space="Unreg" name="Light Gateway" mapcoord="327 379 " >
-  <Jumpgate name="Inner Gyre" position="0 0 0" />
-  <Jumpgate name="Outer Gyre" position="-19600 18500 24400" />
-  <Jumpgate name="Light Crossroads" position="-16900 3300 -200" />
-  <Beacon position="-10100 11500 14200" />
-  <Anomaly position="4600 14700 8700" />
-  <Distance to="Outer Gyre" from="Light Crossroads" distance="29044" />
-  <Distance to="Inner Gyre" from="Light Crossroads" distance="17294" />
-  <Distance to="Outer Gyre" from="Inner Gyre" distance="36458" />
- </Sector>
- <Sector flux="1" space="Quantar" name="Quanaus Crossing" mapcoord="489 414 " >
-  <Jumpgate name="Path of Hordes" position="13300 33400 -12500" />
-  <Jumpgate name="Quantar Core" position="0 0 0" />
-  <Beacon position="1100 12400 -3800" />
-  <Distance to="Quantar Core" from="Path of Hordes" distance="38081" />
- </Sector>
- <Sector flux="1" space="Quantar" name="Ring View" mapcoord="412 353 " >
-  <Jumpgate name="Connexion" position="35600 10700 -24200" />
-  <Jumpgate name="Gurge" position="48600 600 -21600" />
-  <Jumpgate name="Quantar Hook" position="9800 -16100 6500" />
-  <Jumpgate name="Ekoo's Stop" position="0 0 0" />
-  <Beacon position="21800 -14000 -16600" />
-  <Distance to="Connexion" from="Ekoo's Stop" distance="44412" />
-  <Distance to="Quantar Hook" from="Ekoo's Stop" distance="19944" />
-  <Distance to="Quantar Hook" from="Connexion" distance="48240" />
-  <Distance to="Connexion" from="Gurge" distance="16651" />
-  <Distance to="Ekoo's Stop" from="Gurge" distance="53186" />
-  <Distance to="Quantar Hook" from="Gurge" distance="50681" />
- </Sector>
- <Sector flux="1" space="Solrain" name="Morain Harbour" mapcoord="269 476 " >
-  <Jumpgate name="Tranquillus Major" position="25400 11600 1600" />
-  <Jumpgate name="Fields" position="0 0 0" />
-  <Jumpgate name="Purian Lake" position="12900 5600 -17000" />
-  <Jumpgate name="Bronci Rift" position="13200 16800 900" />
-  <Beacon position="12500 7700 -7500" />
-  <Distance to="Bronci Rift" from="Purian Lake" distance="21037" />
-  <Distance to="Purian Lake" from="Tranquillus Major" distance="23150" />
-  <Distance to="Bronci Rift" from="Tranquillus Major" distance="13315" />
-  <Distance to="Purian Lake" from="Fields" distance="22036" />
-  <Distance to="Bronci Rift" from="Fields" distance="21333" />
-  <Distance to="Tranquillus Major" from="Fields" distance="27954" />
- </Sector>
- <Sector flux="6" space="Amananth" name="Last Point" mapcoord="409 307 " >
-  <Jumpgate name="Dark" position="0 0 0" />
-  <Jumpgate name="Inner Aman" position="18700 -1400 13700" />
-  <Beacon position="400 -5300 1100" />
-  <Building type="Subspace Transceiver" position="-10300 -800 7700" />
-  <Distance to="Dark" from="Inner Aman" distance="23181" />
- </Sector>
- <Sector flux="1" space="Amananth" name="Inner Aman" mapcoord="525 100 " >
-  <Jumpgate name="Amananth" position="0 0 0" />
-  <Jumpgate name="Last Point" position="7800 -4800 49000" />
-  <Beacon position="12900 2500 -19500" />
-  <Distance to="Last Point" from="Amananth" distance="49881" />
- </Sector>
- <Sector flux="1" space="Unreg" name="Connexion" mapcoord="304 327 " >
-  <Jumpgate name="Dark Crossroads" position="-3100 -19100 14900" />
-  <Jumpgate name="Stith" position="21200 -8900 15600" />
-  <Jumpgate name="Ring View" position="-1100 -12400 39400" />
-  <Jumpgate name="Light Crossroads" position="0 0 0" />
-  <Beacon position="9300 -11100 14600" />
-  <Distance to="Stith" from="Ring View" distance="32795" />
-  <Distance to="Light Crossroads" from="Ring View" distance="41294" />
-  <Distance to="Dark Crossroads" from="Ring View" distance="25529" />
-  <Distance to="Light Crossroads" from="Dark Crossroads" distance="24462" />
-  <Distance to="Stith" from="Dark Crossroads" distance="26413" />
-  <Distance to="Stith" from="Light Crossroads" distance="27809" />
- </Sector>
- <Sector flux="5" space="Unreg" name="Far Point" mapcoord="194 378 " >
-  <Jumpgate name="Dark Gateway" position="15700 -20200 12400" />
-  <Jumpgate name="Lothar's Landing" position="0 0 0" />
-  <Jumpgate name="Light Crossroads" position="-13100 1400 45200" />
-  <Beacon position="3800 -14800 15900" />
-  <Distance to="Dark Gateway" from="Light Crossroads" distance="48663" />
-  <Distance to="Lothar's Landing" from="Light Crossroads" distance="47002" />
-  <Distance to="Lothar's Landing" from="Dark Gateway" distance="28426" />
- </Sector>
- <Sector flux="1" space="Solrain" name="Tranquillus Minor" mapcoord="104 561 " >
-  <Jumpgate name="Solrain Depot" position="6900 -20100 -21700" />
-  <Jumpgate name="Inner Oasis" position="29200 -12600 -21000" />
-  <Jumpgate name="Fields" position="19500 2700 8300" />
-  <Jumpgate name="Narrow Canal" position="0 0 0" />
-  <Beacon position="9400 2100 4300" />
-  <Distance to="Narrow Canal" from="Fields" distance="21384" />
-  <Distance to="Inner Oasis" from="Fields" distance="34475" />
-  <Distance to="Narrow Canal" from="Inner Oasis" distance="38129" />
-  <Distance to="Fields" from="Solrain Depot" distance="39701" />
-  <Distance to="Inner Oasis" from="Solrain Depot" distance="23472" />
-  <Distance to="Narrow Canal" from="Solrain Depot" distance="30349" />
- </Sector>
- <Sector flux="6" space="Solrain" name="Cerulean Clouds" mapcoord="214 721 " >
-  <Jumpgate name="Hirbel's Channel" position="0 0 0" />
-  <Jumpgate name="Azure Churn" position="-19400 12200 -5500" />
-  <Jumpgate name="Tribular Canal" position="-1100 32400 -12200" />
-  <Anomaly position="-8400 4200 -15700" />
-  <Beacon position="-9000 11100 -10100" />
-  <Distance to="Tribular Canal" from="Azure Churn" distance="28033" />
-  <Distance to="Tribular Canal" from="Hirbel's Channel" distance="34611" />
-  <Distance to="Azure Churn" from="Hirbel's Channel" distance="23549" />
- </Sector>
- <Sector flux="5" space="Solrain" name="Hirbel's Channel" mapcoord="250 573 " >
-  <Jumpgate name="Cerulean Clouds" position="0 0 0" />
-  <Jumpgate name="Wake" position="14000 -1800 -7800" />
-  <Beacon position="2200 -8800 -1300" />
-  <Distance to="Wake" from="Cerulean Clouds" distance="16104" />
- </Sector>
- <Sector flux="1" space="Quantar" name="Omni IV" mapcoord="441 376 " >
-  <Jumpgate name="Path of Hordes" position="-14200 -18600 -6400" />
-  <Jumpgate name="Quantar Core" position="0 0 0" />
-  <Beacon position="-6100 -10700 -2000" />
-  <Distance to="Path of Hordes" from="Quantar Core" distance="24283" />
- </Sector>
- <Sector flux="1" space="Octavius" name="Gurge" mapcoord="338 254 " >
-  <Jumpgate name="Dark Crossroads" position="0 0 0" />
-  <Jumpgate name="Evenings End" position="-15800 -6900 -24900" />
-  <Jumpgate name="Octavian Shore" position="0100 -24900 -54700" />
-  <Jumpgate name="Ring View" position="52100 -12500 -27400" />
-  <Beacon position="17400 -1700 -32400" />
-  <Distance to="Ring View" from="Dark Crossroads" distance="60144" />
-  <Distance to="Octavian Shore" from="Dark Crossroads" distance="60097" />
-  <Distance to="Ring View" from="Octavian Shore" distance="60011" />
-  <Distance to="Evenings End" from="Ring View" distance="68137" />
-  <Distance to="Evenings End" from="Octavian Shore" distance="38293" />
-  <Distance to="Evenings End" from="Dark Crossroads" distance="30257" />
- </Sector>
- <Sector flux="7" space="Quantar" name="Quantar Gate" mapcoord="385 412 " >
-  <Jumpgate name="Greater Arm" position="-21800 8800 -900" />
-  <Jumpgate name="Inner Storm" position="0 0 0" />
-  <Jumpgate name="Ekoo's Stop" position="-31200 19200 21900" />
-  <Beacon position="-11200 4500 -2300" />
-  <Building type="Ore Depot" position="-12800 8900 1500" />
-  <Building type="Rearm Arsenal" position="-3800 18300 12300" />
-  <Building type="Refueling Stop" position="-24300 22000 21300" />
-  <Distance to="Ekoo's Stop" from="Greater Arm" distance="26674" />
-  <Distance to="Inner Storm" from="Greater Arm" distance="23566" />
-  <Distance to="Ekoo's Stop" from="Inner Storm" distance="42646" />
- </Sector>
- <Sector flux="1" space="Solrain" name="Outer Lighthouse" mapcoord="268 421 " >
-  <Jumpgate name="Greater Locks" position="26900 16800 22300" />
-  <Jumpgate name="Purian Lake" position="0 0 0" />
-  <Beacon position="12300 5900 10500" />
-  <Distance to="Greater Locks" from="Purian Lake" distance="38747" />
- </Sector>
- <Sector flux="6" space="Octavius" name="Orrus Minor" mapcoord="138 50 " >
-  <Jumpgate name="Orrus Major" position="0 0 0" />
-  <Jumpgate name="Vorgus 2" position="-4900 -2600 24700" />
-  <Beacon position="-4600 -1400 14300" />
-  <Distance to="Orrus Major" from="Vorgus 2" distance="25265" />
- </Sector>
- <Sector flux="7" space="Hyperial" name="Inner Cloud" mapcoord="373 568 " >
-  <Jumpgate name="Main Gate" position="31500 -2200 13800" />
-  <Jumpgate name="T&P" position="0 0 0" />
-  <Beacon position="4300 -2200 18800" />
-  <Distance to="Main Gate" from="T&P" distance="34471" />
- </Sector>
- <Sector flux="7" space="Quantar" name="Inner Third" mapcoord="538 640 " >
-  <Jumpgate name="Orus' Tail" position="3400 14800 -17200" />
-  <Jumpgate name="Outer Third" position="0 0 0" />
-  <Beacon position="900 7000 -2900" />
-  <Distance to="Outer Third" from="Orus' Tail" distance="22913" />
- </Sector>
- <Sector flux="0" space="Octavius" name="Octavius Depot" mapcoord="202 176 " >
-  <Station name="Octavius Depot" position="1300 -5600 -13000" />
-  <Jumpgate name="Vorgus 2" position="0 0 0" />
-  <Building type="Science Factory" item="Centerfuge Mk. V" position="4600 -4700 -19400" />
-  <Building type="Custom Producer" item="Centerfuge Mk. V" position="-3700 -1700 -25600" />
-  <Distance to="Vorgus 2" from="Octavius Depot" distance="14226" />
- </Sector>
- <Sector flux="1" space="Quantar" name="Great Venure Belt" mapcoord="347 517 " >
-  <Jumpgate name="Klatsches Hold" position="7700 15800 -12100" />
-  <Jumpgate name="Main Gate" position="28500 7800 6500" />
-  <Jumpgate name="Hyperion Gate" position="-9400 12000 7000" />
-  <Jumpgate name="Zealots Refuge" position="0 0 0" />
-  <Beacon position="12000 12000 -9800" />
-  <Building type="Ore Depot" position="17300 8300 -14700" />
-  <Building type="Nano Assembler" item="Chromium" position="8600 3300 -24100" />
-  <Building type="Nano Assembler" item="Antimony" position="28600 -6800 -28000" />
-  <Distance to="Main Gate" from="Hyperion Gate" distance="38078" />
-  <Distance to="Hyperion Gate" from="Zealots Refuge" distance="16761" />
-  <Distance to="Main Gate" from="Zealots Refuge" distance="30208" />
-  <Distance to="Zealots Refuge" from="Klatsches Hold" distance="21347" />
-  <Distance to="Hyperion Gate" from="Klatsches Hold" distance="25958" />
-  <Distance to="Main Gate" from="Klatsches Hold" distance="28941" />
- </Sector>
- <Sector flux="5" space="Solrain" name="Greater Locks" mapcoord="239 387 " >
-  <Jumpgate name="Outer Lighthouse" position="0 0 0" />
-  <Jumpgate name="Dark Gateway" position="-1800 -11900 -13400" />
-  <Jumpgate name="Inner Lighthouse" position="2500 700 10500" />
-  <Beacon position="-400 -2300 -9800" />
-  <Distance to="Dark Gateway" from="Inner Lighthouse" distance="27362" />
-  <Distance to="Inner Lighthouse" from="Outer Lighthouse" distance="10799" />
-  <Distance to="Dark Gateway" from="Outer Lighthouse" distance="18040" />
- </Sector>
- <Sector flux="7" space="Unreg" name="Outer Gyre" mapcoord="344 348 " >
-  <Jumpgate name="Light Gateway" position="0 0 0" />
-  <Jumpgate name="Greater Arm" position="7300 6600 5600" />
-  <Jumpgate name="Pulsar" position="6400 17300 13600" />
-  <Jumpgate name="Aman Gate" position="-8800 13600 22500" />
-  <Beacon position="-2100 11200 3600" />
-  <Distance to="Greater Arm" from="Aman Gate" distance="24278" />
-  <Distance to="Light Gateway" from="Aman Gate" distance="27758" />
-  <Distance to="Pulsar" from="Aman Gate" distance="18045" />
-  <Distance to="Light Gateway" from="Pulsar" distance="22868" />
-  <Distance to="Greater Arm" from="Pulsar" distance="13323" />
-  <Distance to="Greater Arm" from="Light Gateway" distance="11218" />
- </Sector>
- <Sector flux="10" space="Unreg" name="Lesser Arm" mapcoord="274 383 " >
-  <Jumpgate name="Light Crossroads" position="0 0 0" />
- </Sector>
- <Sector flux="1" space="Octavius" name="Arkan's Cloud" mapcoord="182 256 " >
-  <Jumpgate name="Rim" position="11700 4100 -1100" />
-  <Jumpgate name="Outer Edge" position="0 0 0" />
-  <Jumpgate name="Outpost" position="15000 -18400 14300" />
-  <Jumpgate name="Primus Point" position="30900 -26300 15300" />
-  <Beacon position="23200 -15300 7600" />
-  <Distance to="Rim" from="Outer Edge" distance="12409" />
-  <Distance to="Primus Point" from="Outer Edge" distance="43363" />
-  <Distance to="Outpost" from="Outer Edge" distance="27659" />
-  <Distance to="Rim" from="Outpost" distance="27378" />
-  <Distance to="Primus Point" from="Outpost" distance="17803" />
-  <Distance to="Primus Point" from="Rim" distance="39504" />
- </Sector>
- <Sector flux="1" space="Quantar" name="Hook of Roh" mapcoord="520 475 " >
-  <Jumpgate name="Dark Path" position="0 0 0" />
-  <Jumpgate name="Quantar Depot" position="3000 -19800 8500" />
-  <Jumpgate name="Square of Quantos" position="-22300 -16900 23200" />
-  <Beacon position="-11500 -10800 9700" />
-  <Distance to="Dark Path" from="Square of Quantos" distance="36395" />
-  <Distance to="Quantar Depot" from="Dark Path" distance="21727" />
-  <Distance to="Quantar Depot" from="Square of Quantos" distance="29478" />
- </Sector>
- <Sector flux="1" space="Quantar" name="Orus' Tail" mapcoord="483 598 " >
-  <Jumpgate name="Upper Third" position="13200 -15600 28800" />
-  <Jumpgate name="Corridor" position="-8600 -33200 13100" />
-  <Jumpgate name="Inner Third" position="0 0 0" />
-  <Beacon position="5100 -21500 16600" />
-  <Distance to="Inner Third" from="Corridor" distance="36759" />
-  <Distance to="Upper Third" from="Corridor" distance="32116" />
-  <Distance to="Inner Third" from="Upper Third" distance="35338" />
- </Sector>
- <Sector flux="1" space="Amananth" name="Aman Gate" mapcoord="331 318 " >
-  <Jumpgate name="Dark" position="-1400 -2400 -12000" />
-  <Jumpgate name="Outer Gyre" position="-14400 -2800 -23600" />
-  <Jumpgate name="Inner Gyre" position="0 0 0" />
-  <Beacon position="9300 -500 -4600" />
-  <Distance to="Inner Gyre" from="Dark" distance="12331" />
-  <Distance to="Outer Gyre" from="Dark" distance="17406" />
-  <Distance to="Inner Gyre" from="Outer Gyre" distance="27790" />
- </Sector>
- <Sector flux="7" space="Octavius" name="Sark's Passage" mapcoord="198 302 " >
-  <Jumpgate name="Edge" position="0 0 0" />
-  <Jumpgate name="Primus Point" position="-2000 -41000 14800" />
-  <Beacon position="-800 -14900 3200" />
-  <Distance to="Primus Point" from="Edge" distance="43625" />
- </Sector>
- <Sector flux="1" space="Solrain" name="Narrow Canal" mapcoord="255 652 " >
-  <Jumpgate name="Lesser Locks" position="0 0 0" />
-  <Jumpgate name="Tranquillus Minor" position="-32900 -900 1100" />
-  <Jumpgate name="Solrain Core" position="-34600 34300 -20800" />
-  <Beacon position="-21700 4800 -7500" />
-  <Distance to="Tranquillus Minor" from="Lesser Locks" distance="32899" />
-  <Distance to="Solrain Core" from="Lesser Locks" distance="52949" />
-  <Distance to="Tranquillus Minor" from="Solrain Core" distance="41500" />
- </Sector>
- <Sector flux="12" space="Quantar" name="Outer Third" mapcoord="556 675 " >
-  <Jumpgate name="Inner Third" position="0 0 0" />
-  <Beacon position="1400 11800 3200" />
-  <Anomaly position="10400 14300 10300" />
- </Sector>
- <Sector flux="7" space="Solrain" name="Bronci Rift" mapcoord="224 556 " >
-  <Jumpgate name="Tranquillus Major" position="7300 -10100 14500" />
-  <Jumpgate name="Morain Harbour" position="21300 -11900 6700" />
-  <Jumpgate name="Zealots Refuge" position="0 0 0" />
-  <Beacon position="21200 -21900 10700" />
-  <Anomaly position="8200 -7300 4300" />
-  <Distance to="Morain Harbour" from="Tranquillus Major" distance="16105" />
-  <Distance to="Zealots Refuge" from="Tranquillus Major" distance="19127" />
-  <Distance to="Zealots Refuge" from="Morain Harbour" distance="25292" />
- </Sector>
- <Sector flux="9" space="Unreg" name="Outer Storm" mapcoord="389 454 " >
-  <Jumpgate name="Inner Storm" position="0 0 0" />
- </Sector>
- <Sector flux="1" space="Hyperial" name="Outer Cloud" mapcoord="432 628 " >
-  <Jumpgate name="Reaches" position="27100 12200 14600" />
-  <Jumpgate name="Rear Gate" position="0 0 0" />
-  <Beacon position="13700 4700 6600" />
-  <Distance to="Rear Gate" from="Reaches" distance="33135" />
- </Sector>
- <Sector flux="1" space="Quantar" name="Inner Roh-Cloud" mapcoord="480 465 " >
-  <Jumpgate name="Quantar Core" position="12800 15300 1300" />
-  <Jumpgate name="Square of Quantos" position="-25800 27300 -15800" />
-  <Jumpgate name="Outer Roh-Cloud" position="0 0 0" />
-  <Beacon position="-15100 17800 -9700" />
-  <Distance to="Outer Roh-Cloud" from="Quantar Core" distance="19962" />
-  <Distance to="Square of Quantos" from="Quantar Core" distance="43808" />
-  <Distance to="Square of Quantos" from="Outer Roh-Cloud" distance="40727" />
- </Sector>
- <Sector flux="1" space="Quantar" name="Quadrangle" mapcoord="488 291 " >
-  <Jumpgate name="Path of Hordes" position="0 0 0" />
-  <Jumpgate name="Long Walk" position="22300 -5800 14500" />
-  <Jumpgate name="Tictac's Hook" position="-800 7200 21700" />
-  <Beacon position="14000 -2800 4400" />
-  <Anomaly position="20200 18900 56600" />
-  <Distance to="Tictac's Hook" from="Long Walk" distance="27211" />
-  <Distance to="Path of Hordes" from="Long Walk" distance="27211" />
-  <Distance to="Path of Hordes" from="Tictac's Hook" distance="22837" />
- </Sector>
- <Sector flux="6" space="Unreg" name="Inner Storm" mapcoord="363 446 " >
-  <Jumpgate name="Quantar Gate" />
-  <Jumpgate name="Outer Storm" />
-  <Jumpgate name="Four Fingers" />
-  <Distance to="Outer Storm" from="Quantar Gate" distance="14471" />
-  <Distance to="Four Fingers" from="Quantar Gate" distance="10358" />
-  <Distance to="Outer Storm" from="Four Fingers" distance="21013" />
- </Sector>
- <Sector flux="7" space="Quantar" name="Orus' Leg" mapcoord="533 575 " >
-  <Jumpgate name="Upper Third" position="0 0 0" />
-  <Jumpgate name="Dark End" position="17900 29100 -24800" />
-  <Beacon position="7900 21200 -15800" />
-  <Distance to="Dark End" from="Upper Third" distance="42179" />
- </Sector>
- <Sector flux="7" space="Octavius" name="Outer Edge" mapcoord="72 289 " >
-  <Jumpgate name="Arkan's Cloud" position="-4800 -11000 18100" />
-  <Jumpgate name="Outer Rim" position="-25700 -4700 2900" />
-  <Jumpgate name="Mokk's Battlefield" position="0 0 0" />
-  <Beacon position="-14400 -8000 11200" />
-  <Distance to="Arkan's Cloud" from="Outer Rim" distance="26618" />
-  <Distance to="Mokk's Battlefield" from="Outer Rim" distance="26309" />
-  <Distance to="Arkan's Cloud" from="Mokk's Battlefield" distance="21702" />
- </Sector>
- <Sector flux="7" space="Unreg" name="Light Crossroads" mapcoord="297 355 " >
-  <Jumpgate name="Light Gateway" position="24300 24700 -19200" />
-  <Jumpgate name="Far Point" position="0 0 0" />
-  <Jumpgate name="Connexion" position="11300 14600 -10300" />
-  <Jumpgate name="Lesser Arm" position="32400 -9200 -32700" />
-  <Beacon position="30200 2000 -29200" />
-  <Distance to="Light Gateway" from="Connexion" distance="18748" />
-  <Distance to="Far Point" from="Connexion" distance="21089" />
-  <Distance to="Lesser Arm" from="Connexion" distance="38966" />
-  <Distance to="Far Point" from="Lesser Arm" distance="47005" />
-  <Distance to="Light Gateway" from="Lesser Arm" distance="37317" />
-  <Distance to="Far Point" from="Light Gateway" distance="39590" />
- </Sector>
- <Sector flux="1" space="Solrain" name="Azure Churn" mapcoord="163 638 " >
-  <Jumpgate name="Cerulean Clouds" position="-15500 -1000 -11200" />
-  <Jumpgate name="Cornea" position="0 0 0" />
-  <Beacon position="6100 600 -5300" />
-  <Distance to="Cerulean Clouds" from="Cornea" distance="19120" />
- </Sector>
- <Sector flux="10" space="Unreg" name="Dark Crossroads" mapcoord="319 298 " >
-  <Jumpgate name="Connexion" />
-  <Jumpgate name="Gurge" />
-  <Distance to="Connexion" from="Gurge" distance="16470" />
- </Sector>
- <Sector flux="1" space="Amananth" name="Sea of Shadows" mapcoord="376 279 " >
-  <Jumpgate name="Split" position="0 0 0" />
-  <Jumpgate name="Last Parsec" position="6500 -1000 -12900" />
-  <Beacon position="3200 -9100 -6600" />
-  <Distance to="Split" from="Last Parsec" distance="14453" />
- </Sector>
- <Sector flux="1" space="Octavius" name="Imperial Crossroads" mapcoord="83 118 " >
-  <Jumpgate name="Dark Fork" position="-25100 -2400 -20800" />
-  <Jumpgate name="Great Pillars" position="0 0 0" />
-  <Beacon position="-15000 -900 -9100" />
-  <Distance to="Great Pillars" from="Dark Fork" distance="32660" />
- </Sector>
- <Sector flux="1" space="Solrain" name="Lesser Locks" mapcoord="343 631 " >
-  <Jumpgate name="Main Gate" position="-44500 34300 -27500" />
-  <Jumpgate name="Narrow Canal" position="0 0 0" />
-  <Anomaly position="-5800 15700 -28100" />
-  <Beacon position="-14000 11100 -12900" />
-  <Distance to="Narrow Canal" from="Main Gate" distance="62555" />
- </Sector>
- <Sector flux="7" space="Solrain" name="Inner Lighthouse" mapcoord="217 341 " >
-  <Jumpgate name="Greater Locks" position="5000 7800 13600" />
-  <Jumpgate name="Wanderer's Pond" position="0 0 0" />
-  <Beacon position="-6900 4500 10000" />
-  <Distance to="Greater Locks" from="Wanderer's Pond" distance="16498" />
- </Sector>
- <Sector flux="1" space="Quantar" name="Quantar Hook" mapcoord="439 333 " >
-  <Jumpgate name="Third Gate" position="6300 12500 18000" />
-  <Jumpgate name="Ring View" position="0 0 0" />
-  <Beacon position="2200 5700 9300" />
-  <Distance to="Third Gate" from="Ring View" distance="22844" />
- </Sector>
- <Sector flux="11" space="Amananth" name="Canis 9502" mapcoord="333 50 " >
-  <Jumpgate name="Aman Hook" position="0 0 0" />
- </Sector>
- <Sector flux="7" space="Octavius" name="Edge" mapcoord="150 318 " >
-  <Jumpgate name="Sark's Passage" position="0 0 0" />
-  <Jumpgate name="Divide" position="5300 -26200 19700" />
-  <Beacon position="3500 -15600 10900" />
-  <Distance to="Divide" from="Sark's Passage" distance="32639" />
- </Sector>
- <Sector flux="0" space="Solrain" name="Solrain Core" mapcoord="178 573 " >
-  <Station name="Solrain Core" position="17300 -2300 16200" />
-  <Jumpgate name="Sea of Solrain" position="19200 8500 28300" />
-  <Jumpgate name="Narrow Canal" position="0 0 0" />
-  <Jumpgate name="Wanderer's Pond" position="26600 -8800 6100" />
-  <Building type="Subspace Transceiver" position="34200 500 11100" />
-  <Building type="Naval Yard" position="38100 600 14400" />
-  <Building type="Custom Producer" item="Construction Materials" position="42900 1700 11100" />
-  <Building type="Naval Yard" position="41400 900 5500" />
-  <Building type="Naval Yard" position="36400 400 6000" />
-  <Building type="Naval Yard" position="28800 -400 32500" />
-  <Building type="Naval Yard" position="-3800 1800 45800" />
-  <Building type="Custom Producer" item="Echo" position="39600 2100 45900" />
-  <Distance to="Solrain Core" from="Narrow Canal" distance="23532" />
-  <Distance to="Sea of Solrain" from="Narrow Canal" distance="35265" />
-  <Distance to="Wanderer's Pond" from="Narrow Canal" distance="28633" />
-  <Distance to="Sea of Solrain" from="Solrain Core" distance="15641" />
-  <Distance to="Wanderer's Pond" from="Solrain Core" distance="15655" />
-  <Distance to="Sea of Solrain" from="Wanderer's Pond" distance="29125" />
- </Sector>
- <Sector flux="1" space="Unreg" name="Stith" mapcoord="280 295 " >
-  <Jumpgate name="Diluted Reaches" position="0 0 0" />
-  <Jumpgate name="Connexion" position="9900 -21300 31300" />
-  <Jumpgate name="Last Parsec" position="15200 -6900 -8600" />
-  <Beacon position="12800 -12700 7900" />
-  <Distance to="Diluted Reaches" from="Connexion" distance="39111" />
-  <Distance to="Last Parsec" from="Connexion" distance="42759" />
-  <Distance to="Diluted Reaches" from="Last Parsec" distance="18781" />
- </Sector>
- <Sector flux="1" space="Quantar" name="Tictac's Hook" mapcoord="542 258 " >
-  <Jumpgate name="Callow Passage" position="14200 12900 1800" />
-  <Jumpgate name="Long Walk" position="13800 -20100 -16300" />
-  <Jumpgate name="TriPoint" position="-1200 -14700 -18300" />
-  <Jumpgate name="Quadrangle" position="0 0 0"/>
-  <Beacon position="-3300 -11300 -8600" />
-  <Distance to="TriPoint" from="Quadrangle" distance="23447" />
-  <Distance to="Long Walk" from="TriPoint" distance="16070" />
-  <Distance to="Quadrangle" from="Long Walk" distance="29321" />
-  <Distance to="Quadrangle" from="Callow Passage" distance="19262" />
-  <Distance to="TriPoint" from="Callow Passage" distance="37449" />
-  <Distance to="Long Walk" from="Callow Passage" distance="37695" />
- </Sector>
- <Sector flux="6" space="Octavius" name="Orrus Major" mapcoord="104 76 " >
-  <Jumpgate name="Octavius Core" position="0 0 0" />
-  <Jumpgate name="Orrus Minor" position="20700 2600 16900" />
-  <Beacon position="6200 2900 13000" />
-  <Distance to="Octavius Core" from="Orrus Minor" distance="26840" />
- </Sector>
- <Sector flux="1" space="Solrain" name="Purian Lake" mapcoord="254 455 " >
-  <Jumpgate name="Outer Lighthouse" position="13800 9400 -2300" />
-  <Jumpgate name="Wake" position="10600 16800 16600" />
-  <Jumpgate name="Morain Harbour" position="0 0 0" />
-  <Beacon position="19300 4100 6600" />
-  <Distance to="Wake" from="Outer Lighthouse" distance="20604" />
-  <Distance to="Outer Lighthouse" from="Morain Harbour" distance="16838" />
-  <Distance to="Wake" from="Morain Harbour" distance="25888" />
- </Sector>
- <Sector flux="1" space="Quantar" name="Third Gate" mapcoord="503 395 " >
-  <Jumpgate name="Long Walk" position="0 0 0" />
-  <Jumpgate name="Quantar Hook" position="-20000 10400 -3400" />
-  <Beacon position="-11900 7000 -800" />
-  <Distance to="Long Walk" from="Quantar Hook" distance="22736" />
- </Sector>
- <Sector flux="1" space="Hyperial" name="T&P" mapcoord="493 641 " >
-  <Jumpgate name="Inner Cloud" position="-27100 -12200 -14600" />
-  <Jumpgate name="Far Gate" position="0 0 0" />
-  <Beacon position="-13400 -7500 -8000" />
-  <Distance to="Inner Cloud" from="Far Gate" distance="33135" />
- </Sector>
- <Sector flux="11" space="Octavius" name="Mokk's Battlefield" mapcoord="100 318 " >
-  <Jumpgate name="Outer Edge" position="0 0 0" />
- </Sector>
- <Sector flux="1" space="Hyperial" name="Main Gate" mapcoord="405 551 " >
-  <Jumpgate name="Lesser Locks" position="39100 0 -25700" />
-  <Jumpgate name="Great Venure Belt" position="66100 0 -26800" />
-  <Jumpgate name="Inner Cloud" position="0 0 0" />
-  <Jumpgate name="Reaches" position="40200 0 -43700" />
-  <Beacon position="30000 200 -32600" />
-  <Distance to="Reaches" from="Great Venure Belt" distance="30969" />
-  <Distance to="Lesser Locks" from="Reaches" distance="18055" />
-  <Distance to="Great Venure Belt" from="Lesser Locks" distance="27098" />
-  <Distance to="Inner Cloud" from="Lesser Locks" distance="46731" />
-  <Distance to="Inner Cloud" from="Great Venure Belt" distance="71350" />
-  <Distance to="Reaches" from="Inner Cloud" distance="59344" />
- </Sector>
- <Sector flux="7" space="Unreg" name="Greater Arm" mapcoord="368 364 " >
-  <Jumpgate name="Quantar Gate" position="-20300 -7600 -8700" />
-  <Jumpgate name="Outer Gyre" position="-21600 4800 100" />
-  <Jumpgate name="Saron's Eye" position="0 0 0" />
-  <Beacon position="-11600 800 -1100" />
-  <Distance to="Saron's Eye" from="Outer Gyre" distance="22103" />
-  <Distance to="Quantar Gate" from="Outer Gyre" distance="15217" />
-  <Distance to="Saron's Eye" from="Quantar Gate" distance="23424" />
- </Sector>
- <Sector flux="1" space="Solrain" name="Wanderer's Pond" mapcoord="213 527 " >
-  <Jumpgate name="Inner Lighthouse" position="-20300 -7700 -15600" />
-  <Jumpgate name="Solrain Core" position="0 0 0" />
-  <Beacon position="-14400 -2300 -9800" />
-  <Distance to="Solrain Core" from="Inner Lighthouse" distance="26474" />
- </Sector>
- <Sector flux="6" space="Amananth" name="Dark" mapcoord="364 321 " >
-  <Jumpgate name="Last Point" position="0 0 0" />
-  <Jumpgate name="Aman Gate" position="21800 0 9900" />
-  <Beacon position="11700 200 8800" />
-  <Distance to="Aman Gate" from="Last Point" distance="23933" />
- </Sector>
- <Sector flux="1" space="Solrain" name="Inner Oasis" mapcoord="136 565 " >
-  <Jumpgate name="Midpoint Rift" position="0 0 0" />
-  <Jumpgate name="Tranquillus Minor" position="-8300 12200 14200" />
-  <Beacon position="2100 1100 11900" />
-  <Distance to="Midpoint Rift" from="Tranquillus Minor" distance="20483" />
- </Sector>
- <Sector flux="1" space="Octavius" name="Rim" mapcoord="109 232 " >
-  <Jumpgate name="Divide" position="23400 -15100 17300" />
-  <Jumpgate name="Arkan's Cloud" position="0 0 0" />
-  <Jumpgate name="Outer Rim" position="14300 8300 12900" />
-  <Beacon position="11800 -2900 5400" />
-  <Distance to="Outer Rim" from="Divide" distance="25515" />
-  <Distance to="Arkan's Cloud" from="Divide" distance="32811" />
-  <Distance to="Outer Rim" from="Arkan's Cloud" distance="20960" />
- </Sector>
- <Sector flux="1" space="Solrain" name="Tranquillus Major" mapcoord="181 520 " >
-  <Jumpgate name="Morain Harbour" position="9300 1300 -15100" />
-  <Jumpgate name="Bronci Rift" position="0 0 0" />
-  <Anomaly position="14100 7900 -2200" />
-  <Beacon position="-2500 5200 -10600" />
-  <Distance to="Bronci Rift" from="Morain Harbour" distance="17843" />
- </Sector>
- <Sector flux="1" space="Octavius" name="Imperial Causeway" mapcoord="216 61 " >
-  <Jumpgate name="Verselus' Hook" position="32800 -2600 6000" />
-  <Jumpgate name="Octavius Core" position="0 0 0" />
-  <Beacon position="18600 -1400 3300" />
-  <Anomaly position="22100 8800 -14500" />
-  <Distance to="Octavius Core" from="Verselus' Hook" distance="33474" />
- </Sector>
- <Sector flux="1" space="Quantar" name="Ekoo's Stop" mapcoord="406 403 " >
-  <Jumpgate name="Quantar Gate" position="0 0 0" />
-  <Jumpgate name="Rounds of Quantos" position="-35000 5400 -11200" />
-  <Jumpgate name="Ring View" position="-18600 6700 -2000" />
-  <Jumpgate name="Omni V" position="-29100 23400 15000" />
-  <Beacon position="-20100 19100 5600" />
-  <Distance to="Quantar Gate" from="Omni V" distance="40251" />
-  <Distance to="Ring View" from="Omni V" distance="26007" />
-  <Distance to="Rounds of Quantos" from="Omni V" distance="32317" />
-  <Distance to="Rounds of Quantos" from="Ring View" distance="18903" />
-  <Distance to="Quantar Gate" from="Ring View" distance="19870" />
-  <Distance to="Rounds of Quantos" from="Quantar Gate" distance="37181" />
- </Sector>
- <Sector flux="7" space="Hyperial" name="Hyperian Hook" mapcoord="442 720 " >
-  <Jumpgate name="Far Gate" position="0 0 0" />
-  <Jumpgate name="Rear Gate" position="31500 -16100 -20400" />
-  <Beacon position="13700 -9800 -12200" />
-  <Anomaly position="4700 -18100 -3200" />
-  <Distance to="Far Gate" from="Rear Gate" distance="40859" />
- </Sector>
- <Sector flux="1" space="Solrain" name="Sea of Solrain" mapcoord="220 591 " >
-  <Jumpgate name="Fields" position="0 0 0" />
-  <Jumpgate name="Solrain Core" position="14000 -1800 -7800" />
-  <Beacon position="13900 -11800 -3800" />
-  <Distance to="Fields" from="Solrain Core" distance="16105" />
- </Sector>
- <Sector flux="1" space="Hyperial" name="Rear Gate" mapcoord="444 672 " >
-  <Jumpgate name="Outer Cloud" position="-30100 6000 -19400" />
-  <Jumpgate name="Hyperial" position="-46700 -12900 -7400" />
-  <Jumpgate name="Hyperian Hook" position="0 0 0" />
-  <Beacon position="-21200 -6600 -24500" />
-  <Distance to="Hyperian Hook" from="Outer Cloud" distance="36247" />
-  <Distance to="Hyperial" from="Outer Cloud" distance="27840" />
-  <Distance to="Hyperian Hook" from="Hyperial" distance="48989" />
- </Sector>
- <Sector flux="1" space="Octavius" name="Primus Point" mapcoord="241 284 " >
-  <Jumpgate name="Sark's Passage" position="0 0 0" />
-  <Jumpgate name="Dark Gateway" position="-4600 -29700 -9400" />
-  <Jumpgate name="Arkan's Cloud" position="-19900 -10400 -800" />
-  <Beacon position="-9400 -14700 -4900" />
-  <Building type="Repair Station" position="-9400 -14000 -6000" />
-  <Distance to="Sark's Passage" from="Arkan's Cloud" distance="22464" />
-  <Distance to="Arkan's Cloud" from="Dark Gateway" distance="25986" />
-  <Distance to="Sark's Passage" from="Dark Gateway" distance="31484" />
- </Sector>
- <Sector flux="1" space="Hyperial" name="Far Gate" mapcoord="500 708 " >
-  <Jumpgate name="Hyperial" position="-48600 37100 -29400" />
-  <Jumpgate name="T&P" position="-17700 7500 33300" />
-  <Jumpgate name="Hyperian Hook" position="0 0 0" />
-  <Beacon position="-29200 25800 21600" />
-  <Anomaly position="-51100 29600 11300" />
-  <Building type="Subspace Transciever" position="3200 17700 30900" />
-  <Distance to="T&P" from="Hyperian Hook" distance="38382" />
-  <Distance to="Hyperial" from="Hyperian Hook" distance="67813" />
-  <Distance to="T&P" from="Hyperial" distance="75851" />
- </Sector>
- <Sector flux="1" space="Amananth" name="Gyre" mapcoord="441 190 " >
-  <Jumpgate name="Amananth" position="11200 0 19500" />
-  <Jumpgate name="Aman Hook" position="22500 0 0" />
-  <Jumpgate name="Split" position="0 0 0" />
-  <Beacon position="11200 0 6600" />
-  <Building type="Subspace Transceiver" position="-1000 9500 29600" />
-  <Distance to="Amananth" from="Split" distance="22515" />
-  <Distance to="Amananth" from="Aman Hook" distance="22515" />
-  <Distance to="Split" from="Aman Hook" distance="22453" />
- </Sector>
- <Sector flux="1" space="Solrain" name="Midpoint Rift" mapcoord="106 597 " >
-  <Jumpgate name="Inner Oasis" position="-18300 1000 18100" />
-  <Jumpgate name="Outer Oasis" position="0 0 0" />
-  <Beacon position="-9200 1700 6300" />
-  <Distance to="Outer Oasis" from="Inner Oasis" distance="25764" />
- </Sector>
- <Sector flux="7" space="Unreg" name="Inner Gyre" mapcoord="306 380 " >
-  <Jumpgate name="Light Gateway" position="12300 15400 12700" />
-  <Jumpgate name="Saron's Shoulder" position="0 0 0" />
-  <Jumpgate name="Pulsar" position="-22300 18500 28800" />
-  <Jumpgate name="Aman Gate" position="-12000 12900 17600" />
-  <Beacon position="-700 11500 11700" />
-  <Building type="Subspace Transciever" position="-17700 14500 3300" />
-  <Distance to="Saron's Shoulder" from="Aman Gate" distance="24792" />
-  <Distance to="Pulsar" from="Aman Gate" distance="16276" />
-  <Distance to="Light Gateway" from="Aman Gate" distance="24940" />
-  <Distance to="Pulsar" from="Light Gateway" distance="38377" />
-  <Distance to="Saron's Shoulder" from="Light Gateway" distance="23462" />
-  <Distance to="Saron's Shoulder" from="Pulsar" distance="40804" />
- </Sector>
- <Sector flux="11" space="Solrain" name="Outer Depths" mapcoord="98 723 " >
-  <Jumpgate name="Tribular Canal" position="0 0 0" />
-  <Jumpgate name="Cornea" position="32700 -2500 1200" />
-  <Distance to="Tribular Canal" from="Cornea" distance="32839" />
- </Sector>
- <Sector flux="10" space="Unreg" name="Four Fingers" mapcoord="343 432 " >
-  <Jumpgate name="Outer Ring" />
-  <Jumpgate name="Inner Storm" />
-  <Jumpgate name="Outskirts" />
-  <Jumpgate name="Saron's Eye" />
-  <Distance to="Outer Ring" from="Inner Storm" distance="23449" />
-  <Distance to="Saron's Eye" from="Inner Storm" distance="31050" />
-  <Distance to="Outskirts" from="Inner Storm" distance="19066" />
-  <Distance to="Saron's Eye" from="Outer Ring" distance="23591" />
-  <Distance to="Outskirts" from="Outer Ring" distance="24979" />
-  <Distance to="Saron's Eye" from="Outskirts" distance="15673" />
- </Sector>
- <Sector flux="0" space="Quantar" name="Quantar Core" mapcoord="463 418 " >
-  <Jumpgate name="Quanaus Crossing" position="-1900 -9500 -17000" />
-  <Station name="Quantar Core" position="-5800 -2300 -8500" />
-  <Jumpgate name="Omni IV" position="-13900 3700 -2200" />
-  <Jumpgate name="Omni V" position="-29300 -9500 -9200" />
-  <Jumpgate name="Inner Roh-Cloud" position="0 0 0"/>
-  <Building type="Subspace Transciever" position="-19600 -100 -300" />
-  <Building type="Custom Producer" item="Mechanical Parts" position="-22600 7000 3900" />
-  <Building type="Naval Yard" position="-27000 3300 8400" />
-  <Building type="Naval Yard" position="-31100 2900 5100" />
-  <Building type="Naval Yard" position="-32500 11200 11700" />
-  <Building type="Tooling Center" position="4300 -700 -200" />
-  <Distance to="Inner Roh-Cloud" from="Quantar Core" distance="15588" />
-  <Distance to="Omni IV" from="Quantar Core" distance="11945" />
-  <Distance to="Quanaus Crossing" from="Quantar Core" distance="11738" />
-  <Distance to="Quanaus Crossing" from="Inner Roh-Cloud" distance="19564" />
-  <Distance to="Omni V" from="Inner Roh-Cloud" distance="32107" />
-  <Distance to="Omni V" from="Quantar Core" distance="24458" />
-  <Distance to="Omni IV" from="Quanaus Crossing" distance="23197" />
-  <Distance to="Omni V" from="Quanaus Crossing" distance="28439" />
-  <Distance to="Omni IV" from="Inner Roh-Cloud" distance="14567" />
-  <Distance to="Omni IV" from="Omni V" distance="21396" />
- </Sector>
- <Sector flux="1" space="Amananth" name="Last Parsec" mapcoord="381 169 " >
-  <Jumpgate name="Aman Hook" position="28400 10000 -17500" />
-  <Jumpgate name="Stith" position="0 0 0" />
-  <Jumpgate name="Sea of Shadows" position="26100 10000 16000" />
-  <Beacon position="-10100 12000 44400" />
-  <Distance to="Aman Hook" from="Stith" distance="34857" />
-  <Distance to="Sea of Shadows" from="Stith" distance="32220" />
-  <Distance to="Aman Hook" from="Sea of Shadows" distance="33643" />
- </Sector>
- <Sector flux="9" space="Unreg" name="Saron's Shoulder" mapcoord="316 413 " >
-  <Jumpgate name="Pulsar" position="-12800 15400 9700" />
-  <Jumpgate name="Inner Gyre" position="3800 17800 3800" />
-  <Jumpgate name="Outskirts" position="-20400 10100 -2900" />
-  <Jumpgate name="GBS" position="0 0 0" />
-  <Beacon position="-12000 10700 -600" />
-  <Building type="Subspace Transciever" position="-33600 -200 -17600" />
-  <Distance to="Pulsar" from="Outskirts" distance="15573" />
-  <Distance to="Inner Gyre" from="Outskirts" distance="26364" />
-  <Distance to="Pulsar" from="Inner Gyre" distance="17750" />
-  <Distance to="GBS" from="Pulsar" distance="22817" />
-  <Distance to="GBS" from="Outskirts" distance="23065" />
-  <Distance to="GBS" from="Inner Gyre" distance="18560" />
- </Sector>
- <Sector flux="0" space="Quantar" name="Corridor" mapcoord="481 544 " >
-  <Jumpgate name="Orus' Tail" position="23300 18100 3100" />
-  <Jumpgate name="Dark Trail" position="0 0 0" />
-  <Jumpgate name="Dark End" position="36000 21800 20200" />
-  <Station name="Corridor" position="19500 5800 1700" />
-  <Building type="Science Factory" item="Abattis" position="17800 9900 -1500" />
-  <Building type="Naval Yard" position="14700 6000 2600" />
-  <Building type="Custom Producer" item="Ivy" position="16700 8400 7100" />
-  <Building type="Naval Yard" position="20900 1900 8600" />
-  <Distance to="Dark Trail" from="Corridor" distance="20270" />
-  <Distance to="Orus' Tail" from="Corridor" distance="13136" />
-  <Distance to="Dark End" from="Corridor" distance="29693" />
-  <Distance to="Dark Trail" from="Orus' Tail" distance="29635" />
-  <Distance to="Dark Trail" from="Dark End" distance="46670" />
-  <Distance to="Dark End" from="Orus' Tail" distance="21628" />
- </Sector>
- <Sector flux="0" space="Unreg" name="Lothar's Landing" mapcoord="176 412 " >
-  <Jumpgate name="Far Point" position="0 0 0" />
-  <Station name="Lothar's Landing" position="8300 -3300 5100" />
-  <Distance to="Far Point" from="Lothar's Landing" distance="9921" />
- </Sector>
- <Sector flux="0" space="Quantar" name="TriPoint" mapcoord="524 302 " >
-  <Station name="TriPoint" position="600 -14900 0" />
-  <Jumpgate name="Tictac's Hook" position="0 0 0" />
-  <Building type="Naval Yard" position="-17300 -17900 -3900" />
-  <Distance to="TriPoint" from="Tictac's Hook" distance="15138" />
- </Sector>
- <Sector flux="0" space="Unreg" name="Klatsches Hold" mapcoord="323 555 " >
-  <Jumpgate name="Great Venure Belt" position="0 0 0" />
-  <Station name="Klatsches Hold" position="4500 -3700 7300" />
-  <Distance to="Great Venure Belt" from="Klatsches Hold" distance="9058" />
- </Sector>
- <Sector flux="1" space="Octavius" name="Verselus' Hook" mapcoord="237 142 " >
-  <Jumpgate name="Imperial Causeway" position="-600 -5800 -11500" />
-  <Jumpgate name="Octavian Shore" position="0 0 0" />
-  <Jumpgate name="Dark Fork" position="-42600 -22600 11200" />
-  <Beacon position="-13600 -9100 -5200" />
-  <Distance to="Dark Fork" from="Octavian Shore" distance="49522" />
-  <Distance to="Imperial Causeway" from="Octavian Shore" distance="12919" />
-  <Distance to="Dark Fork" from="Imperial Causeway" distance="50633" />
- </Sector>
- <Sector flux="1" space="Solrain" name="Outer Oasis" mapcoord="74 634 " >
-  <Jumpgate name="Midpoint Rift" position="-18300 1000 18100" />
-  <Jumpgate name="Cornea" position="0 0 0" />
-  <Beacon position="-9200 1700 6300" />
-  <Distance to="Cornea" from="Midpoint Rift" distance="25764" />
- </Sector>
- <Sector flux="1" space="Octavius" name="Octavian Shore" mapcoord="294 125 " >
-  <Jumpgate name="Verselus' Hook" position="0 0 0" />
-  <Jumpgate name="Gurge" position="-18700 -35800 31700" />
-  <Jumpgate name="Blasted Corner" position="34800 -7500 -10900" />
-  <Beacon position="21400 -2600 -9000" />
-  <Distance to="Verselus' Hook" from="Blasted Corner" distance="37185" />
-  <Distance to="Gurge" from="Verselus' Hook" distance="51359" />
-  <Distance to="Gurge" from="Blasted Corner" distance="73990" />
- </Sector>
- <Sector flux="1" space="Solrain" name="Fields" mapcoord="121 502 " >
-  <Jumpgate name="Sea of Solrain" position="13300 -3600 -4900" />
-  <Jumpgate name="Morain Harbour" position="-10000 5100 19700" />
-  <Jumpgate name="Tranquillus Minor" position="0 0 0" />
-  <Beacon position="-700 4400 11800" />
-  <Distance to="Tranquillus Minor" from="Sea of Solrain" distance="14593" />
-  <Distance to="Morain Harbour" from="Sea of Solrain" distance="34933" />
-  <Distance to="Tranquillus Minor" from="Morain Harbour" distance="22639" />
- </Sector>
- <Sector flux="0" space="Solrain" name="Solrain Depot" mapcoord="72 531 " >
-  <Station name="Solrain Depot" position="-10700 3100 -9900" />
-  <Jumpgate name="Tranquillus Minor" position="0 0 0" />
-  <Building type="Custom Producer" item="Sabre" position="-35300 5400 -18100" />
-  <Distance to="Solrain Depot" from="Tranquillus Minor" distance="14271" />
- </Sector>
- <Sector flux="1" space="Quantar" name="Hyperion Gate" mapcoord="414 504 " >
-  <Jumpgate name="Rounds of Quantos" position="38600 17900 -5600" />
-  <Jumpgate name="Great Venure Belt" position="0 0 0" />
-  <Beacon position="59600 10900 -3500" />
-  <Distance to="Great Venure Belt" from="Rounds of Quantos" distance="42917" />
- </Sector>
- <Sector flux="1" space="Octavius" name="Imperial Gates" mapcoord="179 68 " >
-  <Jumpgate name="Octavius Core" position="16200 8400 30000" />
-  <Jumpgate name="Dark Fork"  position="0 0 0" />
-  <Beacon position="5700 4900 20100" />
-  <Distance to="Dark Fork" from="Octavius Core" distance="35148" />
- </Sector>
- <Sector flux="7" space="Amananth" name="Aman Hook" mapcoord="400 78 " >
-  <Jumpgate name="Canis 9502" position="-3200 -21900 -2000" />
-  <Jumpgate name="Last Parsec" position="0 0 0" />
-  <Jumpgate name="Gyre" position="-6800 -11700 30400" />
-  <Beacon position="-14900 -6000 25500" />
-  <Anomaly position="-22800 -8200 16600" />
-  <Distance to="Gyre" from="Last Parsec" distance="33311" />
-  <Distance to="Gyre" from="Canis 9502" distance="34183" />
-  <Distance to="Canis 9502" from="Last Parsec" distance="22192" />
- </Sector>
- <Sector flux="0" space="Hyperial" name="Hyperial" mapcoord="482 672 " >
-  <Station name="Hyperial" position="6600 5800 -16000" />
-  <Jumpgate name="Far Gate" position="0 0 0" />
-  <Jumpgate name="Rear Gate" position="7400 -4300 -16900" />
-  <Building type="Custom Producer" item="Insight" position="-1000 -6900 7000" />
-  <Building type="Custom Producer" item="Deepol" position="1100 -6900 4400" />
-  <Building type="Subspace Tranceiver" position="-4000 4500 -17300" />
-  <Building type="Science Factory" item="Construction Materials" position="-4100 4400 -22000" />
-  <Distance to="Hyperial" from="Rear Gate" distance="10376" />
-  <Distance to="Far Gate" from="Hyperial" distance="18115" />
-  <Distance to="Rear Gate" from="Far Gate" distance="18957" />
- </Sector>
- <Sector flux="1" space="Octavius" name="Dark Gateway" mapcoord="257 318 " >
-  <Jumpgate name="Far Point" position="0 0 0" />
-  <Jumpgate name="Diluted Reaches" position="-36800 9800 -15100" />
-  <Jumpgate name="Greater Locks" position="-6000 37400 4700" />
-  <Jumpgate name="Primus Point" position="-9800 8100 12600" />
-  <Beacon position="-5800 23000 6000" />
-  <Building type="Rearm Arsenal" position="6300 16000 15200" />
-  <Distance to="Far Point" from="Diluted Reaches" distance="41003" />
-  <Distance to="Primus Point" from="Diluted Reaches" distance="38788" />
-  <Distance to="Greater Locks" from="Diluted Reaches" distance="45909" />
-  <Distance to="Primus Point" from="Greater Locks" distance="30602" />
-  <Distance to="Far Point" from="Greater Locks" distance="38130" />
-  <Distance to="Primus Point" from="Far Point" distance="17887" />
- </Sector>
- <Sector flux="1" space="Quantar" name="Outer Roh-Cloud" mapcoord="455 466 " >
-  <Jumpgate name="Dark Trail" position="0 0 0" />
-  <Jumpgate name="Inner Roh-Cloud" position="53800 5900 -1900" />
-  <Beacon position="-18400 2200 -1200" />
-  <Distance to="Dark Trail" from="Inner Roh-Cloud" distance="54109" />
- </Sector>
- <Sector flux="1" space="Octavius" name="Divide" mapcoord="147 209 " >
-  <Jumpgate name="Edge" position="5100 22200 1500" />
-  <Jumpgate name="Rim" position="0 0 0" />
-  <Jumpgate name="Great Pillars" position="8100 52900 17300" />
-  <Beacon position="7600 39700 16200" />
-  <Distance to="Edge" from="Rim" distance="22831" />
-  <Distance to="Rim" from="Great Pillars" distance="56209" />
-  <Distance to="Edge" from="Great Pillars" distance="34624" />
- </Sector>
- <Sector flux="1" space="Octavius" name="Dark Fork" mapcoord="137 110 " >
-  <Jumpgate name="Verselus' Hook" position="25700 21700 23700" />
-  <Jumpgate name="Vorgus 2" position="-9100 24700 -11500" />
-  <Jumpgate name="Imperial Crossroads" position="0 0 0" />
-  <Jumpgate name="Imperial Gates" position="18800 8200 -5600" />
-  <Beacon position="800 17000 2200" />
-  <Distance to="Vorgus 2" from="Imperial Gates" distance="32929" />
-  <Distance to="Verselus' Hook" from="Imperial Gates" distance="32930" />
-  <Distance to="Imperial Crossroads" from="Imperial Gates" distance="21288" />
-  <Distance to="Imperial Crossroads" from="Verselus' Hook" distance="41160" />
-  <Distance to="Vorgus 2" from="Verselus' Hook" distance="49569" />
-  <Distance to="Imperial Crossroads" from="Vorgus 2" distance="28702" />
- </Sector>
- <Sector flux="8" space="Unreg" name="Light Lost" mapcoord="297 470 " >
-  <Jumpgate name="Outskirts" position="300 -15400 49900" />
-  <Jumpgate name="Zealots Refuge" position="0 0 0" />
-  <Anomaly position="18000 9300 46300" />
-  <Beacon position="-11700 -1400 47600" />
-  <Distance to="Zealots Refuge" from="Outskirts" distance="52209" />
- </Sector>
- <Sector flux="0" space="Unreg" name="Evenings End" mapcoord="362 224 " >
-  <Jumpgate name="Gurge" position="0 0 0" />
-  <Station name="Evenings End" position="-4000 6400 -6600" />
-  <Distance to="Gurge" from="Evenings End" distance="10211" />
- </Sector>
- <Sector flux="1" space="Quantar" name="Rounds of Quantos" mapcoord="420 463 " >
-  <Jumpgate name="Hyperion Gate" position="0 0 0" />
-  <Jumpgate name="Ekoo's Stop" position="26600 6300 27200" />
-  <Beacon position="20200 4800 16000" />
-  <Distance to="Hyperion Gate" from="Ekoo's Stop" distance="38536" />
- </Sector>
- <Sector flux="0" space="Octavius" name="Octavius Core" mapcoord="198 99 " >
-  <Jumpgate name="Imperial Causeway" position="0 0 0" />
-  <Jumpgate name="Orrus Major" position="-28400 -2100 700" />
-  <Station name="Octavius Core" position="-11800 1600 10100" />
-  <Jumpgate name="Imperial Gates" position="-100 7200 15400" />
-  <Building type="Subspace Transceiver" position="-3900 11000 17800" />
-  <Building type="Naval Yard" position="-7500 8400 22800" />
-  <Building type="Naval Yard" position="-13100 8100 22800" />
-  <Building type="Naval Yard" position="-16200 10500 17800" />
-  <Building type="Custom Producer" item="HellRazor" position="8000 -2600 -1900" /> 
-  <Building type="Naval Yard" position="-27400 -1600 -7200" />
-  <Distance to="Octavius Core" from="Imperial Causeway" distance="14273" />
-  <Distance to="Imperial Gates" from="Imperial Causeway" distance="16973" />
-  <Distance to="Orrus Major" from="Imperial Causeway" distance="28516" />
-  <Distance to="Orrus Major" from="Octavius Core" distance="18404" />
-  <Distance to="Imperial Gates" from="Octavius Core" distance="15203" />
-  <Distance to="Orrus Major" from="Imperial Gates" distance="33236" />
- </Sector>
- <Sector flux="1" space="Unreg" name="Zealots Refuge" mapcoord="305 524 " >
-  <Jumpgate name="Great Venure Belt" position="-11500 14900 -52800" />
-  <Jumpgate name="Outer Ring" position="2600 26400 -17500" />
-  <Jumpgate name="Light Lost" position="24700 -13700 -54400" />
-  <Jumpgate name="Bronci Rift" position="0 0 0" />
-  <Beacon position="-2300 5700 -28600" />
-  <Distance to="Bronci Rift" from="Light Lost" distance="61267" />
-  <Distance to="Outer Ring" from="Light Lost" distance="58114" />
-  <Distance to="Great Venure Belt" from="Light Lost" distance="46125" />
-  <Distance to="Outer Ring" from="Bronci Rift" distance="31998" />
-  <Distance to="Great Venure Belt" from="Bronci Rift" distance="56094" />
-  <Distance to="Great Venure Belt" from="Outer Ring" distance="40521" />
- </Sector>
- <Sector flux="12" space="Unreg" name="Pulsar" mapcoord="339 401 " >
-  <Jumpgate name="Saron's Shoulder" />
-  <Jumpgate name="Outer Gyre" />
-  <Jumpgate name="Inner Gyre" />
-  <Jumpgate name="Saron's Eye" />
-  <Distance to="Inner Gyre" from="Saron's Eye" distance="23625" />
-  <Distance to="Saron's Eye" from="Outer Gyre" distance="15947" />
-  <Distance to="Inner Gyre" from="Outer Gyre" distance="13627" />
-  <Distance to="Outer Gyre" from="Saron's Shoulder" distance="23324" />
-  <Distance to="Saron's Eye" from="Saron's Shoulder" distance="25179" />
-  <Distance to="Inner Gyre" from="Saron's Shoulder" distance="20272" />
- </Sector>
- <Sector flux="5" space="Quantar" name="Long Walk" mapcoord="533 345 " >
-  <Jumpgate name="Third Gate" position="0 0 0" />
-  <Jumpgate name="Quantar Depot" position="3900 -5500 20900" />
-  <Jumpgate name="Tictac's Hook" position="20900 -21200 4700" />
-  <Jumpgate name="Quadrangle" position="8300 -27900 -6900" />
-  <Beacon position="10100 -15900 -2300" />
-  <Distance to="Quadrangle" from="Third Gate" distance="29926" />
-  <Distance to="Tictac's Hook" from="Third Gate" distance="30133" />
-  <Distance to="Tictac's Hook" from="Quadrangle" distance="18434" />
-  <Distance to="Quantar Depot" from="Third Gate" distance="21919" />
-  <Distance to="Quantar Depot" from="Quadrangle" distance="35915" />
-  <Distance to="Quantar Depot" from="Tictac's Hook" distance="28222" />
- </Sector>
- <Sector flux="1" space="Quantar" name="Square of Quantos" mapcoord="502 452 " >
-  <Jumpgate name="Hook of Roh" position="31800 -18900 -22400" />
-  <Jumpgate name="Inner Roh-Cloud" position="0 0 0" />
-  <Beacon position="9600 -8600 -11500" />
-  <Distance to="Hook of Roh" from="Inner Roh-Cloud" distance="43172" />
- </Sector>
- <Sector flux="8" space="Unreg" name="Outer Ring" mapcoord="329 468 " >
-  <Jumpgate name="Zealots Refuge" />
-  <Jumpgate name="Four Fingers" />
-  <Distance to="Zealots Refuge" from="Four Fingers" distance="36793" />
- </Sector>
- <Sector flux="6" space="Quantar" name="Path of Hordes" mapcoord="480 356 " >
-  <Jumpgate name="Quanaus Crossing" position="14300 -16000 -21100" />
-  <Jumpgate name="Omni IV" position="0 0 0" />
-  <Jumpgate name="Quadrangle" position="-17900 -16400 -38600" />
-  <Beacon position="6800 -810 -13700" />
-  <Distance to="Quanaus Crossing" from="Omni IV" distance="30107" />
-  <Distance to="Quadrangle" from="Omni IV" distance="45626" />
-  <Distance to="Quadrangle" from="Quanaus Crossing" distance="36743" />
- </Sector>
- <Sector flux="1" space="Quantar" name="Dark Trail" mapcoord="451 543 " >
-  <Jumpgate name="Dark Path" position="-33200 -8800 -13100" />
-  <Jumpgate name="Corridor" position="0 0 0" />
-  <Jumpgate name="Outer Roh-Cloud" position="-4300 21700 -15500" />
-  <Beacon position="-14100 -300 -9600" />
-  <Distance to="Corridor" from="Outer Roh-Cloud" distance="27003" />
-  <Distance to="Corridor" from="Dark Path" distance="36757" />
-  <Distance to="Dark Path" from="Outer Roh-Cloud" distance="42110" />
- </Sector>
- <Sector flux="7" space="Unreg" name="Outskirts" mapcoord="289 449 " >
-  <Jumpgate name="Saron's Shoulder" position="43700 18500 -32300" />
-  <Jumpgate name="Light Lost" position="0 0 0" />
-  <Jumpgate name="Four Fingers" position="13800 4000 -27700" />
-  <Beacon position="12300 10400 -16300" />
-  <Building type="Subspace Transciever" position="21500 34200 -20100" />
-  <Distance to="Light Lost" from="Four Fingers" distance="31223" />
-  <Distance to="Four Fingers" from="Saron's Shoulder" distance="33486" />
-  <Distance to="Light Lost" from="Saron's Shoulder" distance="57355" />
- </Sector>
- <Sector flux="6" space="Quantar" name="Callow Passage" mapcoord="554 485 " >
-  <Jumpgate name="Tictac's Hook" position="37000 -29500 -3600" />
-  <Jumpgate name="Dark End" position="0 0 0" />
-  <Beacon position="13100 -25000 16600" />
-  <Distance to="Tictac's Hook" from="Dark End" distance="47409" />
- </Sector>
- <Sector flux="5" space="Octavius" name="Vorgus 2" mapcoord="162 166 " >
-  <Jumpgate name="Octavius Depot" position="0 0 0" />
-  <Jumpgate name="Orrus Minor" position="-40500 15800 -19000" />
-  <Jumpgate name="Dark Fork" position="5000 -19400 -15900" />
-  <Beacon position="-28300 11700 -11700" />
-  <Anomaly position="14800 -19200 -29200" />
-  <Distance to="Orrus Minor" from="Dark Fork" distance="57565" />
-  <Distance to="Dark Fork" from="Octavius Depot" distance="25533" />
-  <Distance to="Orrus Minor" from="Octavius Depot" distance="47409" />
- </Sector>
- <Sector flux="1" space="Octavius" name="Blasted Corner" mapcoord="264 214 " >
-  <Jumpgate name="Octavian Shore" position="27600 -2500 14700" />
-  <Jumpgate name="Outpost" position="0 0 0" />
-  <Beacon position="16700 400 4600" />
-  <Anomaly position="36500 10500 19600" />
-  <Distance to="Octavian Shore" from="Outpost" distance="31391" />
- </Sector>
- <Sector flux="0" space="Octavius" name="Great Pillars" mapcoord="118 177 " >
-  <Jumpgate name="Divide" position="0 0 0" />
-  <Station name="Great Pillars" position="1300 1200 12900" />
-  <Jumpgate name="Imperial Crossroads" position="-3800 13100 11900" />
-  <Building type="Naval Yard" position="-2600 4000 -8100" />
-  <Building type="Custom Producer" item="Sentinel" position="-6100 7200 -12800" />
-  <Building type="Science Factory" item="Duelist" position="100 2700 -3000" />
-  <Distance to="Divide" from="Great Pillars" distance="12914" />
-  <Distance to="Great Pillars" from="Imperial Crossroads" distance="13282" />
-  <Distance to="Divide" from="Imperial Crossroads" distance="18186" />
- </Sector>
- <Sector flux="1" space="Quantar" name="Upper Third" mapcoord="554 602 " >
-  <Jumpgate name="Orus' Tail" position="-7200 -29500 3200" />
-  <Jumpgate name="Orus' Leg" position="0 0 0"/>
-  <Beacon position="-4400 -17700 500" />
-  <Distance to="Orus' Leg" from="Orus' Tail" distance="30524" />
- </Sector>
- <Sector flux="1" space="Octavius" name="Outer Rim" mapcoord="82 216 " >
-  <Jumpgate name="Rim" position="28100 -20700 17300" />
-  <Jumpgate name="Outer Edge" position="0 0 0" />
-  <Beacon position="12700 -11000 13300" />
-  <Distance to="Rim" from="Outer Edge" distance="38971" />
- </Sector>
- <Sector flux="0" space="Quantar" name="Quantar Depot" mapcoord="528 431 " >
-  <Jumpgate name="Hook of Roh" position="0 0 0" />
-  <Jumpgate name="Long Walk" position="15100 2400 33100" />
-  <Station name="Quantar Depot" position="-10600 3100 -9500" />
-  <Building type="Custom Producer" item="Glaive" position="3300 200 -3000" />
-  <Distance to="Quantar Depot" from="Long Walk" distance="49490" />
-  <Distance to="Quantar Depot" from="Hook of Roh" distance="14271" />
-  <Distance to="Long Walk" from="Hook of Roh" distance="36451" />
- </Sector>
- <Sector flux="1" space="Unreg" name="Diluted Reaches" mapcoord="228 309 " >
-  <Jumpgate name="Dark Gateway" position="0 0 0" />
-  <Jumpgate name="Stith" position="17800 -28700 29400" />
-  <Beacon position="5300 -10700 10900" />
-  <Distance to="Dark Gateway" from="Stith" distance="44784" />
- </Sector>
- <Sector flux="1" space="Quantar" name="Omni V" mapcoord="430 410 " >
-  <Jumpgate name="Quantar Core" position="0 0 0" />
-  <Jumpgate name="Ekoo's Stop" position="-27200 -16700 18700" />
-  <Beacon position="-16300 -5900 9700" />
-  <Distance to="Ekoo's Stop" from="Quantar Core" distance="36992" />
- </Sector>
- <Sector flux="1" space="Hyperial" name="Reaches" mapcoord="429 578 " >
-  <Jumpgate name="Outer Cloud" position="0 0 0" />
-  <Jumpgate name="Main Gate" position="22500 -14500 -21100" />
-  <Beacon position="10600 -3900 -10900" />
-  <Asteroid name="Emma" type="Semifluxor" position="8800 -5700 -8400" />
-  <Distance to="Outer Cloud" from="Main Gate" distance="34051" />
- </Sector>
- <Sector flux="0" space="Solrain" name="Cornea" mapcoord="113 672 " >
-  <Jumpgate name="Azure Churn" position="5300 3400 7800" />
-  <Jumpgate name="Outer Oasis" position="-24800 -5500 4600" />
-  <Jumpgate name="Outer Depths" position="0 0 0" />
-  <Station name="Cornea" position="-11500 -2100 4700" />
-  <Building type="Naval Yard" position="-28100 -2900 -1300" />
-  <Building type="Custom Producer" item="Echo" position=...
 
[truncated message content]

[Opengate-svn] SF.net SVN: opengate: [576] trunk/data

[<ult...@us...>]

Revision: 576
          http://svn.sourceforge.net/opengate/?rev=576&view=rev
Author:   ultrasick
Date:     2007-06-18 13:20:49 -0700 (Mon, 18 Jun 2007)

Log Message:
-----------
moving more stuff to the misc dir

Added Paths:
-----------
    trunk/data/misc/credits.txt
    trunk/data/misc/ids.xml

Removed Paths:
-------------
    trunk/data/credits.txt
    trunk/data/ids.xml

Deleted: trunk/data/credits.txt
===================================================================
--- trunk/data/credits.txt	2007-06-18 20:18:48 UTC (rev 575)
+++ trunk/data/credits.txt	2007-06-18 20:20:49 UTC (rev 576)
@@ -1,23 +0,0 @@
-Project leader:
----------------
-- eGore
-
-Regular contributors:
----------------------
-
-- eGore (source code, 3d models)
-- Spom (source code)
-- Ultrasick (graphics, website, 3d models)
-
-Other contributors:
--------------------
-
-- AFK_ (source code)
-
-Special thanks to ...
----------------------
-
-... Delwin for providing his super fast computer to do blender renderings for a dozen times!
-... LordOtter for his great webradio which I (Ultrasick) listened to for hours while I was working on Opengate! :-)
-... Ramiel (www.jagthesite.com) for providing nice base textures for the Lady Kickstart!
-... www.a1freesoundeffects.com for the sonar ping sound file we used in the open source splash screen!
\ No newline at end of file

Deleted: trunk/data/ids.xml
===================================================================
(Binary files differ)

Added: trunk/data/misc/credits.txt
===================================================================
--- trunk/data/misc/credits.txt	                        (rev 0)
+++ trunk/data/misc/credits.txt	2007-06-18 20:20:49 UTC (rev 576)
@@ -0,0 +1,23 @@
+Project leader:
+---------------
+- eGore
+
+Regular contributors:
+---------------------
+
+- eGore (source code, 3d models)
+- Spom (source code)
+- Ultrasick (graphics, website, 3d models)
+
+Other contributors:
+-------------------
+
+- AFK_ (source code)
+
+Special thanks to ...
+---------------------
+
+... Delwin for providing his super fast computer to do blender renderings for a dozen times!
+... LordOtter for his great webradio which I (Ultrasick) listened to for hours while I was working on Opengate! :-)
+... Ramiel (www.jagthesite.com) for providing nice base textures for the Lady Kickstart!
+... www.a1freesoundeffects.com for the sonar ping sound file we used in the open source splash screen!
\ No newline at end of file


Property changes on: trunk/data/misc/credits.txt
___________________________________________________________________
Name: svn:eol-style
   + native

Added: trunk/data/misc/ids.xml
===================================================================
(Binary files differ)


Property changes on: trunk/data/misc/ids.xml
___________________________________________________________________
Name: svn:mime-type
   + application/xml
Name: svn:eol-style
   + native


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opengate-svn] SF.net SVN: opengate: [608] trunk/data

[<ult...@us...>]

Revision: 608
          http://svn.sourceforge.net/opengate/?rev=608&view=rev
Author:   ultrasick
Date:     2007-07-01 07:54:50 -0700 (Sun, 01 Jul 2007)

Log Message:
-----------
uploading xml file for the bender gun

Added Paths:
-----------
    trunk/data/guns/
    trunk/data/guns/bender.xml

Added: trunk/data/guns/bender.xml
===================================================================
(Binary files differ)


Property changes on: trunk/data/guns/bender.xml
___________________________________________________________________
Name: svn:mime-type
   + application/xml
Name: svn:eol-style
   + native


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opengate-svn] SF.net SVN: opengate: [611] trunk/data

[<spo...@us...>]

Revision: 611
          http://svn.sourceforge.net/opengate/?rev=611&view=rev
Author:   spom_spom
Date:     2007-07-05 12:32:38 -0700 (Thu, 05 Jul 2007)

Log Message:
-----------
Adapt engine- and gun mointpoints from xml-file. Add laser as default gun. Improved chase camera (keys: 1--6)

Modified Paths:
--------------
    branches/ogsector/ToDo
    branches/ogsector/data/gui/layouts/dialogs/MarketDialog.layout
    branches/ogsector/data/materials/ammo.material
    branches/ogsector/resources.cfg
    branches/ogsector/src/Avatar.cpp
    branches/ogsector/src/DeviceManager.cpp
    branches/ogsector/src/DeviceManager.h
    branches/ogsector/src/Entity.h
    branches/ogsector/src/EntityManager.cpp
    branches/ogsector/src/EntityManager.h
    branches/ogsector/src/GameStateManager.cpp
    branches/ogsector/src/MarketDialog.cpp
    branches/ogsector/src/Projectile.cpp
    branches/ogsector/src/Projectile.h
    branches/ogsector/src/Sector.cpp
    branches/ogsector/src/SectorObjects.cpp
    branches/ogsector/src/SectorObjects.h
    branches/ogsector/src/ShipConfigDialog.cpp
    branches/ogsector/src/ShipConfigDialog.h
    branches/ogsector/src/UnDockedState.cpp
    branches/ogsector/src/UnDockedState.h
    branches/ogsector/src/Vessel.cpp
    branches/ogsector/src/Vessel.h
    branches/ogsector/src/VesselManager.cpp
    branches/ogsector/src/common.cpp
    branches/ogsector/win32/ogsectorclient/resources.cfg
    trunk/data/guns/bender.xml
    trunk/data/misc/ids.xml
    trunk/data/ships/octavius/apteryx/apteryx.xml
    trunk/data/ships/quantar/storm/storm.xml
    trunk/data/ships/squadrok/squid/squid.xml
    trunk/data/ships/tauseti/lady_kickstart/lady_kickstart.xml

Added Paths:
-----------
    branches/ogsector/data/textures/BeamGreen.png

Modified: branches/ogsector/ToDo
===================================================================
--- branches/ogsector/ToDo	2007-07-04 21:32:38 UTC (rev 610)
+++ branches/ogsector/ToDo	2007-07-05 19:32:38 UTC (rev 611)
@@ -164,3 +164,5 @@
 	-Fire: "Spark, " Funke, Brand, Leuchtfeuer, Phoenix, Fl\xE4chenbrand, Feuerball, Hephaistos, Vulkanus, Hitze, Flamme, Sonne, Plasma, Hestia = (griech.) G\xF6ttin des Herdfeuers, Loki = (germ.) Gott des Feuers, Pele = (polyn.) G\xF6ttin der Vulkane und des Feuers, Asche, irrlicht
 
 	-Wave: "Frizzle, " Brandung,Tsunami,Kr\xE4usel, Rayleigh waves, Love wave, Gicht, Monsterwelle, Aegir = (germ.) Gott des Meeres,Poseidon = (griech.) Gott des Wassers und Meeres, Sedna = (innuit) G\xF6ttin des Meeres, Woge, Brecher, D\xFCnung, Seegang, See, Wellenschlag, Ebbe, Flut, Str\xF6mung, leises Pl\xE4tschern, crystal
+	
+	-Guns: Dazzler
\ No newline at end of file

Modified: branches/ogsector/data/gui/layouts/dialogs/MarketDialog.layout
===================================================================
--- branches/ogsector/data/gui/layouts/dialogs/MarketDialog.layout	2007-07-04 21:32:38 UTC (rev 610)
+++ branches/ogsector/data/gui/layouts/dialogs/MarketDialog.layout	2007-07-05 19:32:38 UTC (rev 611)
@@ -120,6 +120,15 @@
               <Property Name="UnifiedPosition"  Value="{{0.0, 100},{0.0,  60}}" />
               <Property Name="UnifiedSize"      Value="{{0.0,  50},{0.0,  20}}" />
             </Window>
+
+            <Window Type="opengate/StaticLabel" Name="MarketItemDetailedView/EquipmentSpecs5a">
+              <Property Name="UnifiedPosition"  Value="{{0.0,   0},{0.0,  80}}" />
+              <Property Name="UnifiedSize"      Value="{{0.0, 100},{0.0,  20}}" />
+            </Window>
+            <Window Type="opengate/StaticLabel" Name="MarketItemDetailedView/EquipmentSpecs5b">
+              <Property Name="UnifiedPosition"  Value="{{0.0, 100},{0.0,  80}}" />
+              <Property Name="UnifiedSize"      Value="{{0.0,  50},{0.0,  20}}" />
+            </Window>
           </Window>
           <Window Type="opengate/StaticLabel" Name="MarketItemDetailedView/TextFrame/Amount">
             <Property Name="UnifiedPosition"  Value="{{0.0, 0},{1.0,  -60}}" />

Modified: branches/ogsector/data/materials/ammo.material
===================================================================
--- branches/ogsector/data/materials/ammo.material	2007-07-04 21:32:38 UTC (rev 610)
+++ branches/ogsector/data/materials/ammo.material	2007-07-05 19:32:38 UTC (rev 611)
@@ -17,3 +17,23 @@
 		}
 	}
 }
+
+material BeamGreen
+{
+	technique
+	{
+		pass
+		{
+			depth_check on
+			depth_write off
+			lighting off
+//			scene_blend add
+			scene_blend alpha_blend
+
+			texture_unit
+			{
+				texture BeamGreen.png
+			}
+		}
+	}
+}

Added: branches/ogsector/data/textures/BeamGreen.png
===================================================================
(Binary files differ)


Property changes on: branches/ogsector/data/textures/BeamGreen.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: branches/ogsector/resources.cfg
===================================================================
--- branches/ogsector/resources.cfg	2007-07-04 21:32:38 UTC (rev 610)
+++ branches/ogsector/resources.cfg	2007-07-05 19:32:38 UTC (rev 611)
@@ -12,6 +12,7 @@
 FileSystem=../../trunk/data/shields
 FileSystem=../../trunk/data/ECMs
 FileSystem=../../trunk/data/power_plants
+FileSystem=../../trunk/data/guns
 FileSystem=../../trunk/data/ships/octavius/apteryx
 FileSystem=../../trunk/data/ships/quantar/storm
 FileSystem=../../trunk/data/ships/tauseti/lady_kickstart

Modified: branches/ogsector/src/Avatar.cpp
===================================================================
--- branches/ogsector/src/Avatar.cpp	2007-07-04 21:32:38 UTC (rev 610)
+++ branches/ogsector/src/Avatar.cpp	2007-07-05 19:32:38 UTC (rev 611)
@@ -113,24 +113,44 @@
 
 bool Avatar::unLoadItem( Entity * item ){
 
-  switch( item->entityType() ){
-  case POWERPLANT: vessel_->setPowerPlant( NULL ); 
-    break;
-  case ENGINE:     vessel_->setEngine( NULL ); 
-    break;
-  case RADAR:      vessel_->setRadar( NULL );
-    break;
-  case ECM:        vessel_->setEcm( NULL );
-    break;
-  case SHIELD:     vessel_->setShield( NULL );
-    break;
-  case CAPACITOR:  vessel_->setCapacitor( NULL );
-    break;
-  default: break;
+  if ( item ){
+    std::vector < Entity * > items; items.push_back( item );
+
+    switch( item->entityType() ){
+    case POWERPLANT: 
+      if ( vessel_->powerPlant() != NULL ){
+	addCargoToFloor( items );
+	vessel_->setPowerPlant( NULL ); 
+      } break;
+    case ENGINE:     
+      if ( vessel_->engine() != NULL ){
+	addCargoToFloor( items );
+	vessel_->setEngine( NULL ); 
+      } break;
+    case RADAR:
+      if ( vessel_->radar() != NULL ){
+	addCargoToFloor( items );
+	vessel_->setRadar( NULL );
+      } break;
+    case ECM: 
+      if ( vessel_->ecm() != NULL ){
+	addCargoToFloor( items );
+	vessel_->setEcm( NULL );
+      } break;
+    case SHIELD:    
+      if ( vessel_->shield() != NULL ){
+	addCargoToFloor( items );
+	vessel_->setShield( NULL );
+      } break;
+    case CAPACITOR:  
+      if ( vessel_->capacitor() != NULL ){
+	addCargoToFloor( items );
+	vessel_->setCapacitor( NULL );
+      }	break;
+    default: break;
+    }
   }
 
-  std::vector < Entity * > items; items.push_back( item );
-  addCargoToFloor( items );
   return true;
 }
 

Modified: branches/ogsector/src/DeviceManager.cpp
===================================================================
--- branches/ogsector/src/DeviceManager.cpp	2007-07-04 21:32:38 UTC (rev 610)
+++ branches/ogsector/src/DeviceManager.cpp	2007-07-05 19:32:38 UTC (rev 611)
@@ -93,7 +93,7 @@
     return;
   }
 
-  for ( pElem = hRoot.FirstChild( "faction" ).Element(); pElem != 0; pElem = pElem->NextSiblingElement() ) {
+  for ( pElem = hRoot.FirstChild( "faction" ).Element(); pElem != 0; pElem = pElem->NextSiblingElement("faction") ) {
     pElemId =  pElem->FirstChildElement( "faction_id" );
     pElemName =  pElem->FirstChildElement( "name_en" );
     if ( pElemId && pElemName )  {

Modified: branches/ogsector/src/DeviceManager.h
===================================================================
--- branches/ogsector/src/DeviceManager.h	2007-07-04 21:32:38 UTC (rev 610)
+++ branches/ogsector/src/DeviceManager.h	2007-07-05 19:32:38 UTC (rev 611)
@@ -31,11 +31,13 @@
 namespace OpenGate{
 
 enum EntityType{NONE,ENTITY,VESSEL,COMMODITY,POWERPLANT,ENGINE,RADAR,ECM,CAPACITOR,SHIELD,GUN,MISSILE,MODX};
+enum GunType{LASER,BULLET};
 
 /*!
  * \brief This is a storage to handle current status of several things
  *
  * \todo Describe what it is used for, I don't really get it.
+ * The class holds all global information about games devices and ids
  * \author Carsten <spo...@us...>
  */
 

Modified: branches/ogsector/src/Entity.h
===================================================================
--- branches/ogsector/src/Entity.h	2007-07-04 21:32:38 UTC (rev 610)
+++ branches/ogsector/src/Entity.h	2007-07-05 19:32:38 UTC (rev 611)
@@ -337,7 +337,44 @@
   Uint32 capacity_;
 };
 
+class Gun : public Equipment{
+public:
+  Gun(): Equipment(){
+    rtti_ = GUN;
+    type_ = LASER;
+  }
 
+  void setType( GunType type ) { type_ = type; }
+  GunType type() const { return type_; }
+  
+  void setEnergy( Uint32 energy ){ powerConsumption_ = energy;
+    if ( powerConsumption_ < 1e4 ) powerConsumption_ *= 1000; }
+    
+  void setDamage( Uint32 damage ) { damage_ = damage; 
+    if ( damage_ < 1e4 ) damage_ *= 1000; }
+  Uint32 damage( ) const { return damage_; }
+
+  void setSpeed( Uint32 speed ) { 
+    std::cout << "setSpeed: " << speed << std::endl;
+    speed_ = speed; 
+  }
+  Uint32 speed()  const { return speed_; }
+
+  void setLifeTime( Ogre::Real lifeTime ) { lifeTime_ = lifeTime; }
+  Ogre::Real lifeTime() const { return lifeTime_; };
+
+  void setFireDelay( Ogre::Real fireDelay ) { fireDelay_ = fireDelay; }
+  Ogre::Real fireDelay() const { return fireDelay_; }
+
+protected:
+  GunType type_;
+  Uint32 damage_;
+  Uint32 speed_;
+  Ogre::Real lifeTime_;
+  Ogre::Real fireDelay_;
+};
+
+
 /*!
  * \brief This class defines a commodity (goods, ore, etc. to build stuff from)
  *

Modified: branches/ogsector/src/EntityManager.cpp
===================================================================
--- branches/ogsector/src/EntityManager.cpp	2007-07-04 21:32:38 UTC (rev 610)
+++ branches/ogsector/src/EntityManager.cpp	2007-07-05 19:32:38 UTC (rev 611)
@@ -128,6 +128,18 @@
   return NULL;
 }
 
+Gun * EquipmentManager::gun( const std::string & name ){
+  Entity * item = entity( name );
+  if ( !item ) return NULL;  
+  
+  if ( item->entityType() == GUN ) {
+    return dynamic_cast< Gun * >(item);
+  } else {
+    LogManager::getSingleton().warn( name + " is no gun." );
+  }
+  return NULL;
+}
+
 Entity * EquipmentManager::loadAndCreate( const std::string & fileName ){
 
   log_->info( "Read equipment: " + fileName );
@@ -182,12 +194,13 @@
     int category = toInt( pElem->FirstChild()->Value() );
 
     switch( category ){
-    case 1: entity = new Commodity(); break;
-    case 2: entity = new PowerPlant(); break;
-    case 4: entity = new Capacitor(); break;
-    case 6: entity = new Engine(); break;
-    case 7: entity = new Shield(); break;
-    case 8: entity = new Radar(); break;
+    case 1:  entity = new Commodity(); break;
+    case 2:  entity = new PowerPlant(); break;
+    case 4:  entity = new Capacitor(); break;
+    case 6:  entity = new Engine(); break;
+    case 7:  entity = new Shield(); break;
+    case 8:  entity = new Radar(); break;
+    case 10: entity = new Gun(); break;
     default:
       log_->fatal( fileName + " category_id " + toStr( category ) + " unknown." );
       return NULL;
@@ -314,6 +327,20 @@
 
     break;
   case GUN:
+    pElem = hRoot.ChildElement( "velocity", 0 ).Element();
+    if ( pElem ) dynamic_cast< Gun * >( entity )->setSpeed( toInt( pElem->FirstChild()->Value() ) );
+
+    pElem = hRoot.ChildElement( "life_time", 0 ).Element();
+    if ( pElem ) dynamic_cast< Gun * >( entity )->setLifeTime( toDouble( pElem->FirstChild()->Value() ) );
+
+    pElem = hRoot.ChildElement( "fire_delay", 0 ).Element();
+    if ( pElem ) dynamic_cast< Gun * >( entity )->setFireDelay( toDouble( pElem->FirstChild()->Value() ) );
+
+    pElem = hRoot.ChildElement( "energy_per_shot", 0 ).Element();
+    if ( pElem ) dynamic_cast< Gun * >( entity )->setEnergy( toInt( pElem->FirstChild()->Value() ) );
+
+    pElem = hRoot.ChildElement( "damage", 0 ).Element();
+    if ( pElem ) dynamic_cast< Gun * >( entity )->setDamage( toInt( pElem->FirstChild()->Value() ) );
     break;
   case MISSILE:
     break;

Modified: branches/ogsector/src/EntityManager.h
===================================================================
--- branches/ogsector/src/EntityManager.h	2007-07-04 21:32:38 UTC (rev 610)
+++ branches/ogsector/src/EntityManager.h	2007-07-05 19:32:38 UTC (rev 611)
@@ -147,6 +147,7 @@
   Radar      * radar(      const std::string & name );
   Shield     * shield(     const std::string & name );
   Capacitor  * capacitor(  const std::string & name );
+  Gun        * gun(        const std::string & name );
 
 };
 

Modified: branches/ogsector/src/GameStateManager.cpp
===================================================================
--- branches/ogsector/src/GameStateManager.cpp	2007-07-04 21:32:38 UTC (rev 610)
+++ branches/ogsector/src/GameStateManager.cpp	2007-07-05 19:32:38 UTC (rev 611)
@@ -334,6 +334,7 @@
   equipmentManager_->load( devices_.resourcePaths(), "radars" );
   equipmentManager_->load( devices_.resourcePaths(), "shields" );
   equipmentManager_->load( devices_.resourcePaths(), "power_plants" );
+  equipmentManager_->load( devices_.resourcePaths(), "guns" );
 
   devices_.gameStateRoot = this;
 

Modified: branches/ogsector/src/MarketDialog.cpp
===================================================================
--- branches/ogsector/src/MarketDialog.cpp	2007-07-04 21:32:38 UTC (rev 610)
+++ branches/ogsector/src/MarketDialog.cpp	2007-07-05 19:32:38 UTC (rev 611)
@@ -545,14 +545,8 @@
     CEGUI::WindowManager::getSingleton().getWindow( "MarketItemDetailedView/TextFrame/Rank" )
       ->setProperty("Text", CEGUI::String("Required rank:" + toStr( item->techLevel() ) ) );
 
-    CEGUI::String str1a("");
-    CEGUI::String str1b("");
-    CEGUI::String str2a("");
-    CEGUI::String str2b("");
-    CEGUI::String str3a("");
-    CEGUI::String str3b("");
-    CEGUI::String str4a("");
-    CEGUI::String str4b("");
+    CEGUI::String str1a(""), str1b(""), str2a(""), str2b(""), str3a(""), str3b("");
+    CEGUI::String str4a(""), str4b(""), str5a(""), str5b("");
 
     switch( item->entityType() ){
     case POWERPLANT:
@@ -578,6 +572,13 @@
       str1a = "Efficiency:"  ; str1b = toStr( dynamic_cast< Capacitor *>( item )->efficiency() );
       str2a = "Max. Power:"  ; str2b = toStr( dynamic_cast< Capacitor *>( item )->capacity()/1000 ) + "K";
       break;
+    case GUN:
+      str1a = "Damage:"      ; str1b = toStr( dynamic_cast< Gun *>( item )->damage() / 1000 ) + "K";
+      str2a = "Speed:"       ; str2b = toStr( dynamic_cast< Gun *>( item )->speed() );
+      str3a = "Life time:"   ; str3b = toStr( dynamic_cast< Gun *>( item )->lifeTime() );
+      str4a = "Fire delay:"  ; str4b = toStr( dynamic_cast< Gun *>( item )->fireDelay() );
+      str5a = "Energy:"      ; str5b = toStr( dynamic_cast< Gun *>( item )->powerConsumption() / 1000) + "K";
+      break;
     default:
       break;
     }
@@ -590,6 +591,8 @@
     CEGUI::WindowManager::getSingleton().getWindow( "MarketItemDetailedView/EquipmentSpecs3b" )->setProperty( "Text", str3b );
     CEGUI::WindowManager::getSingleton().getWindow( "MarketItemDetailedView/EquipmentSpecs4a" )->setProperty( "Text", str4a );
     CEGUI::WindowManager::getSingleton().getWindow( "MarketItemDetailedView/EquipmentSpecs4b" )->setProperty( "Text", str4b );
+    CEGUI::WindowManager::getSingleton().getWindow( "MarketItemDetailedView/EquipmentSpecs5a" )->setProperty( "Text", str5a );
+    CEGUI::WindowManager::getSingleton().getWindow( "MarketItemDetailedView/EquipmentSpecs5b" )->setProperty( "Text", str5b );
     
   }
 }

Modified: branches/ogsector/src/Projectile.cpp
===================================================================
--- branches/ogsector/src/Projectile.cpp	2007-07-04 21:32:38 UTC (rev 610)
+++ branches/ogsector/src/Projectile.cpp	2007-07-05 19:32:38 UTC (rev 611)
@@ -29,9 +29,9 @@
 
 namespace OpenGate{
 
-Projectile::Projectile( BaseObject * parent, long shotCounter, Ogre::Real speed, Uint32 damage, Ogre::Real liveTime )
+Projectile::Projectile( BaseObject * parent, long shotCounter, const GunObject & gun, const Ogre::Vector3 & mountPoint )
   : BaseObject( parent->name() + "_" + toStr( shotCounter ), parent->sector() ), parent_( parent ), 
-    shotCount_( shotCounter),  damage_( damage ), maxLiveTime_( liveTime ){
+    shotCount_( shotCounter),  damage_( gun.gun()->damage() ), maxLifeTime_( gun.gun()->lifeTime() ){
   selectable_ = false;
 
   Ogre::String bulletName( name_ + "_" + toStr( shotCounter ) );
@@ -40,11 +40,15 @@
   bullet_  = NULL;
   shape_   = NULL;
 
-  Ogre::Vector3 position( parent_->mainNode()->getPosition() );
-  Ogre::Quaternion direction( parent_->mainNode()->getOrientation() );
-
   bool bullet = true;
+  switch ( gun.gun()->type() ){
+  case LASER: bullet = false; break;
+  case BULLET: bullet = true; break;
+  }
 
+  Ogre::Quaternion direction( parent_->mainNode()->getOrientation() );
+  Ogre::Vector3 relGunPos( ( gun.sceneNode().getParentSceneNode()->getOrientation() * gun.sceneNode().getPosition() ) * 
+			   gun.sceneNode().getParentSceneNode()->getParentSceneNode()->getScale() );
   if ( bullet ){
     int maxBB = 20;
     bullet_ = sceneMgr_->createBillboardSet( bulletName + "_BBS", maxBB );
@@ -64,26 +68,27 @@
     mainNode_->attachObject( bullet_ );
 
   } else {
-    beam_ = sceneMgr_->createManualObject( bulletName + "_MObj" );
-    beam_->begin( "WhiteNoBackground", Ogre::RenderOperation::OT_TRIANGLE_LIST); 
-    
-//     beam_->position( direction.xAxis().normalisedCopy() * -0.2 );
-//     beam_->position( direction.xAxis().normalisedCopy() *  0.2 );
-//     beam_->position( direction.xAxis().normalisedCopy() *  0.2 + direction.zAxis().normalisedCopy() * 1.0 );
-//     beam_->position( direction.xAxis().normalisedCopy() * -0.2 + direction.zAxis().normalisedCopy() * 1.0 );
+    beam_ = sceneMgr_->createManualObject( bulletName + "_ManualObj" );
 
-    beam_->position( -0.2, 0, 0 );
-    beam_->position( 0.2, 0, 0 );
-    beam_->position( 0.2, 0, 1.0 );
-    beam_->position( -0.2, 0, 1.0 );
-    
+    Ogre::Real width = 0.25;
+    beam_->begin( "BeamGreen", Ogre::RenderOperation::OT_TRIANGLE_LIST); 
+    beam_->position( 0.0, -width, 0.0 ); beam_->textureCoord( 0, 0 );
+    beam_->position( 0.0,  width, 0.0 ); beam_->textureCoord( 1, 0 );
+    beam_->position( 0.0,  width, 1.0 ); beam_->textureCoord( 1, 1 );
+    beam_->position( 0.0, -width, 1.0 ); beam_->textureCoord( 0, 1 );
     beam_->quad( 0, 1, 2, 3 );
     beam_->quad( 0, 3, 2, 1 );
     beam_->end();
-
+  
     shape_ = mainNode_->createChildSceneNode( bulletName + "_transform" );
     shape_->attachObject( beam_ );
 
+    if ( fabs( relGunPos[ 0 ] ) > 1e-3 ){
+      shape_->roll( Ogre::Degree( 0.0 ) );
+    } else {
+      shape_->roll( Ogre::Radian( atan( relGunPos[ 1 ] / relGunPos[ 0 ] ) ) );
+    }
+
     mainNode_->setOrientation( direction );
   }
 
@@ -120,16 +125,13 @@
 //   mainNode_->attachObject( bullet_ );
 
 
-  mainNode_->setPosition( position );
-  mainNode_->setPosition( position +
-			  direction.zAxis().normalisedCopy() * -6.2 +
-			  direction.xAxis().normalisedCopy() * 1.5 +
-			  direction.yAxis().normalisedCopy() * -0.2 );
+  mainNode_->setPosition( gun.sceneNode().getWorldPosition() - direction.zAxis() * relGunPos[ 2 ] );
 
   lifeTime_ = 0.0;
   oldTime_ = 0.0;
 
-  vel_ = speed * -direction.zAxis().normalisedCopy() + parent->velocity();
+  vel_ = gun.gun()->speed() * -direction.zAxis().normalisedCopy() + parent->velocity();
+  ammoHit_ = false;
 }
 
 Projectile::~Projectile() {
@@ -152,19 +154,16 @@
 
 void Projectile::collide( BaseObject * object ){
   if ( name_ != object->name() ){
-    vel_ *= 0.0;
 
     //** show us a small visible feedback;
     if ( bullet_ ){
+      vel_ *= 0.0;
       bullet_->getBillboard( 0 )->setColour( Ogre::ColourValue(0.0, 1.0, 0.0) );
       bullet_->getBillboard( 0 )->setDimensions( 5, 5 );
+      lifeTime_ = max( lifeTime_, maxLifeTime_ - 0.1f );
     }
-    lifeTime_ = max( lifeTime_, maxLiveTime_ - 0.1f );
-
-//     sector_->collisionContext()->removeObject( collObj_ );
-//     OgreOpcode::CollisionManager::getSingletonPtr()->detachShape( collObj_->getShape() );
   }
-
+  ammoHit_ = true;
   sector_->sendVesselAmmoHit( *this, object );
 }
 
@@ -172,20 +171,32 @@
   if ( elapsedTime < 0.001 ) return true;
   
   lifeTime_ += elapsedTime;
-  if ( lifeTime_ >= maxLiveTime_ ) return false;
+  if ( lifeTime_ >= maxLifeTime_ ) return false;
 
   if ( vel_.length() > 0.1 ){
 
-    Ogre::Ray bulletRay( mainNode_->getPosition(), vel_.normalisedCopy() );
+    if ( !ammoHit_ ){
 
-    if ( !OpcodeCollisionDetection::getSingleton().checkCollideRay( this, bulletRay, (vel_ * elapsedTime).length() ) ){
-      if ( bullet_ ){
-	mainNode_->translate( vel_ * elapsedTime );
-      } else if ( beam_ ){
-	mainNode_->translate( vel_ * elapsedTime );
-	shape_->setScale( 1.0, 1.0, (vel_ * lifeTime_).length() );
-	//	mainNode_->translate( 0.0, 0.0, - (vel_ * elapsedTime ).length()/2.0 );
+      Ogre::Ray bulletRay( mainNode_->getPosition(), vel_.normalisedCopy() );
+      
+      if ( !OpcodeCollisionDetection::getSingleton().checkCollideRay( this, bulletRay, (vel_ * elapsedTime).length() ) ){
+	if ( bullet_ ){
+	  mainNode_->translate( vel_ * elapsedTime );
+	} else if ( beam_ ){
+	  mainNode_->translate( vel_ * elapsedTime );
+	  Ogre::Real beamLength = min( (vel_ * lifeTime_).length(), 300.0f );
+
+	  Ogre::Real beamWidthScale = 1.0;
+// 	  if ( beamLength > 299.0f ) beamWidthScale = 1;
+
+	  shape_->scale( 1.0, beamWidthScale, beamLength / shape_->getScale()[2] );
+	}
       }
+    } else {
+      if ( beam_ ){
+	shape_->scale( 1.0, 1.0, max( 1.0f, ( shape_->getScale()[2]-(vel_ * elapsedTime).length()) )
+		       /shape_->getScale()[2] );
+      }
     }
   }
   return true;

Modified: branches/ogsector/src/Projectile.h
===================================================================
--- branches/ogsector/src/Projectile.h	2007-07-04 21:32:38 UTC (rev 610)
+++ branches/ogsector/src/Projectile.h	2007-07-05 19:32:38 UTC (rev 611)
@@ -28,7 +28,7 @@
 
 class Projectile : public BaseObject {
 public:
-  Projectile( BaseObject * parent, long shotCount, Ogre::Real speed, Uint32 damage, Ogre::Real liveTime );
+  Projectile( BaseObject * parent, long shotCount, const GunObject & gun, const Ogre::Vector3 & mountPoint );
 
   virtual ~Projectile();
 
@@ -46,7 +46,7 @@
 
   Ogre::Vector3 velocity() const { return vel_; }
 
-  Ogre::Real liveTime() const { return maxLiveTime_; }
+  Ogre::Real lifeTime() const { return maxLifeTime_; }
 
   Uint16 shotCount() const { return shotCount_; }
 
@@ -62,8 +62,9 @@
 
   Ogre::SceneNode * shape_;
 
-  Ogre::Real maxLiveTime_;
+  Ogre::Real maxLifeTime_;
   Ogre::Real oldTime_;
+  bool ammoHit_;
 };
 
 

Modified: branches/ogsector/src/Sector.cpp
===================================================================
--- branches/ogsector/src/Sector.cpp	2007-07-04 21:32:38 UTC (rev 610)
+++ branches/ogsector/src/Sector.cpp	2007-07-05 19:32:38 UTC (rev 611)
@@ -148,9 +148,9 @@
   populate( "testsector.xml" );
 //   createCircle();
 
-//   SectorObject *obj = createStaticObject( "lady_kickstart.mesh", "lady_kickstart", Ogre::Vector3( 0,0,450) );
-//   obj->setBaseRot( -90, -90, 0 );
-//   obj->setBaseSize( Ogre::Vector3( 10, 3.4, 10.9 ) );
+  SectorObject *obj = createStaticObject( "lady_kickstart.mesh", "lady_kickstart", Ogre::Vector3( 0,0,450) );
+  obj->setBaseRot( -90, -90, 0 );
+  obj->setBaseSize( Ogre::Vector3( 10, 3.4, 10.9 ) );
 
   itTarget_ = sectorObjects_.begin();
 }
@@ -239,6 +239,7 @@
 						   (*it)->factionName() + "/" + (*it)->name(),
 						   Ogre::Vector3( -1000.0, 50 * factionCounter, 
 								  -100.0 + 100 * vesselCounter ) );
+
 	  obj->setBaseRot(  (*it)->baseYaw(),  (*it)->basePitch(),  (*it)->baseRoll() );
 	  obj->setBaseSize( (*it)->baseSize() );
 	  vesselCounter++;
@@ -249,7 +250,8 @@
   }
  
 
-  for ( pElem = hRoot.FirstChild( "sectorobject" ).Element(); pElem != 0; pElem = pElem->NextSiblingElement() ) {
+  for ( pElem = hRoot.FirstChild( "sectorobject" ).Element(); pElem != 0; 
+	pElem = pElem->NextSiblingElement("sectorobject") ) {
     std::string name;
     pSubElem = pElem->FirstChildElement( "name" );
     if ( pSubElem ){
@@ -535,7 +537,7 @@
   avatar_->reset();
   avatar_->mainNode()->setPosition( 0.0, 0.0, 500.0 );
   avatar_->mainNode()->setOrientation( Ogre::Quaternion( 1.0, 0.0, 0.0, 0.0 ) );
-  avatar_->setVelocity( Ogre::Vector3( 0.0, 0.0, -20.0 ) );
+  //  avatar_->setVelocity( Ogre::Vector3( 0.0, 0.0, -20.0 ) );
   
   avatar_->setVisible( false );
   sendVesselRegister( avatar_ );
@@ -918,7 +920,7 @@
   if ( network_->online() ){
     MessageBodyShipProjectileFired msg( projectile.parent().childID(), projectile.shotCount(),
 					projectile.position(), projectile.velocity(), 
-					projectile.damage(), projectile.liveTime() );
+					projectile.damage(), projectile.lifeTime() );
     network_->send( msg );
   }
 }
@@ -928,8 +930,8 @@
 
     std::map< long, SectorObjectMoveable * >::iterator it;
     if ( ( it = movableObjects_.find( createGlobalID( msg.senderID(), msg.childID() ) ) ) != movableObjects_.end() ){
-      Projectile * pro = new Projectile( it->second, msg.shotCount(), msg.velocity().length(), msg.damage(), msg.liveTime() );
-      it->second->addProjectile( pro );    
+//       Projectile * pro = new Projectile( it->second, msg.shotCount(), msg.velocity().length(), msg.damage(), msg.liveTime() );
+//       it->second->addProjectile( pro );    
     } else {
       log_->warn( "Unknown shooter" );
     }

Modified: branches/ogsector/src/SectorObjects.cpp
===================================================================
--- branches/ogsector/src/SectorObjects.cpp	2007-07-04 21:32:38 UTC (rev 610)
+++ branches/ogsector/src/SectorObjects.cpp	2007-07-05 19:32:38 UTC (rev 611)
@@ -102,6 +102,12 @@
   collObj_ = OpcodeCollisionDetection::getSingleton().createObject( this );
 }
 
+void SectorObject::setBaseRot( const Ogre::Real & yaw, const Ogre::Real & pitch, const Ogre::Real & roll ){
+  mainNodeEntityRot_->yaw( Ogre::Degree( yaw ) ); 
+  mainNodeEntityRot_->pitch( Ogre::Degree( pitch ) ); 
+  mainNodeEntityRot_->roll( Ogre::Degree( roll ) ); 
+}
+
 void SectorObject::scale( const Ogre::Vector3 & scale ){
   baseSize_ = scale * ( entity_->getBoundingBox().getMaximum() - entity_->getBoundingBox().getMinimum() );
   mainNodeEntityScale_->scale( scale );
@@ -137,14 +143,9 @@
   mainNodeEntityScale_->scale( scale );
 
   baseSize_ = size;
+  baseScale_ = scale;
 }
 
-void SectorObject::setBaseRot( const Ogre::Real & yaw, const Ogre::Real & pitch, const Ogre::Real & roll ){
-  mainNodeEntityRot_->yaw( Ogre::Degree( yaw ) ); 
-  mainNodeEntityRot_->pitch( Ogre::Degree( pitch ) ); 
-  mainNodeEntityRot_->roll( Ogre::Degree( roll ) ); 
-}
-
 SectorObjectMoveable::SectorObjectMoveable( const Ogre::String & name, Sector * sector, int userID, int childID, 
 					    Vessel * vessel )
   : SectorObject( name, sector, userID, childID ), vessel_( vessel ) {
@@ -154,12 +155,28 @@
 
   LogManager::getSingleton().info( "Create " + name + " with " +  vessel_->name() );
 
+  std::map < int, std::vector < Ogre::Vector3 > > gunMountPoints( vessel_->gunMountPoints() );
+    
+  for ( std::map < int, std::vector < Ogre::Vector3 > >::iterator it = gunMountPoints.begin(); 
+	it != gunMountPoints.end(); it ++ ){
+    for ( uint i = 0; i < it->second.size(); i ++ ){
+
+      Ogre::SceneNode * mountPoint = mainNodeEntityRot_->createChildSceneNode( name_ + "_GunMountPoint" + toStr( i ) );
+
+      GunObject *gun = new GunObject( EquipmentManager::getSingleton().gun( "Bender" ), mountPoint, capacity_ );
+
+      mountPoint->setPosition( it->second[ i ] );
+      activeGuns_.push_back( gun );
+    }
+  }
+
+
   setBaseRot( vessel_->baseYaw(), vessel_->basePitch(), vessel_->baseRoll() );
   setBaseSize( vessel_->baseSize() );
 
   if ( vessel_->factionID() == 4 ){
     thrusterParticles_ = NULL;
-
+    
     thrusterBbs_ = sceneMgr_->createBillboardSet( name_ + "thrust_BBS" );
     thrusterBbs_->setMaterialName("squadrok/thrusterLight");
     Ogre::Billboard *bb = thrusterBbs_->createBillboard( mainNode_->getOrientation().zAxis().normalisedCopy() * 10.0 );
@@ -167,14 +184,18 @@
     mainNode_->attachObject( thrusterBbs_ );
   } else {
     thrusterBbs_ = NULL;
-
+    
     thrusterParticles_ = sceneMgr_->createParticleSystem( name_ + "Thruster" );
     thrusterParticles_->setMaterialName( "Examples/Flare" );
     thrusterParticles_->setDefaultDimensions( 2, 1 );
-    Ogre::ParticleEmitter *pEmit1 = thrusterParticles_->addEmitter( "Point" );
-    pEmit1->setDirection( mainNode_->getOrientation().zAxis() );
-    pEmit1->setPosition( Ogre::Vector3( 0.0f, 0.5f, 5.0f ) );
-    pEmit1->setColour( Ogre::ColourValue::Blue, Ogre::ColourValue::Green);
+
+    std::vector < Ogre::Vector3 > engineMountPoints( vessel_->engineMountPoints() );
+    for ( uint i = 0; i < engineMountPoints.size(); i ++ ){
+      Ogre::ParticleEmitter *pEmit = thrusterParticles_->addEmitter( "Point" );
+      pEmit->setDirection( mainNode_->getOrientation().zAxis() );
+      pEmit->setPosition( ( mainNodeEntityRot_->getOrientation() * engineMountPoints[ i ] ) * mainNodeEntityScale_->getScale() );
+      pEmit->setColour( Ogre::ColourValue::Blue, Ogre::ColourValue::Green );
+    }
     mainNode_->attachObject( thrusterParticles_ );
   }
 
@@ -184,24 +205,34 @@
 }
 
 SectorObjectMoveable::~SectorObjectMoveable() {
+  if ( explosion_ ){
+    mainNode_->detachObject( explosion_ );
+    sceneMgr_->destroyParticleSystem( explosion_ );
+  }
+
   if ( thrusterParticles_ ){
     mainNode_->detachObject( thrusterParticles_ );
     sceneMgr_->destroyParticleSystem( thrusterParticles_ );
   }
-  if ( explosion_ ){
-    mainNode_->detachObject( explosion_ );
-    sceneMgr_->destroyParticleSystem( explosion_ );
-  }
   if ( thrusterBbs_ ){
     mainNode_->detachObject( thrusterBbs_ );
     sceneMgr_->destroyBillboardSet( thrusterBbs_ );
   }
 
+  //  Projectile globalisieren.
+
   for ( std::set < Projectile * >::iterator it = projectiles_.begin(); it != projectiles_.end(); ){
     delete *it;
     projectiles_.erase( it++ );
   }
-  //  Projectile globalisieren.
+
+  for ( std::list < GunObject * >::iterator it = activeGuns_.begin(); it != activeGuns_.end(); ){
+    GunObject *gun = (*it);
+    activeGuns_.remove( *(it++) );
+    mainNodeEntityRot_->removeAndDestroyChild( gun->sceneNode()->getName() );
+    delete gun;
+  }
+
 }
 
 bool SectorObjectMoveable::update( Ogre::Real elapsedTime ){
@@ -430,7 +461,7 @@
   if ( thrusterParticles_ ){
     int nEmits = thrusterParticles_->getNumEmitters( );
     Ogre::Real thrustRate = 0;
-    if ( maxThrust() > 0 ) thrustRate = (float)thrust_ / maxThrust_ * 100;
+    if ( maxThrust() > 0 ) thrustRate = (float)thrust_ / maxThrust_ * 100.0;
     
     for ( int i = 0; i < nEmits; i ++ ){
       Ogre::ParticleEmitter * pEmit;
@@ -512,47 +543,24 @@
     lastShieldSend_ = shield_;
   };
 
+  for ( std::list < GunObject * >::iterator it = activeGuns_.begin(); it!= activeGuns_.end(); it++){
+    (*it)->update( elapsedTime );
+  }
+
   fire( elapsedTime );
   return true;
 }
 
 void SectorObjectMoveableLocal::fire( Ogre::Real elapsedTime ){
-
-  Ogre::Real delayTime = 0.2;
-
-  fireDelay_ -= elapsedTime;
-
-  if ( fireDelay_ <= 0 ){
-
-    Uint32 damage = 1000000;
-//     Ogre::Real liveTime = 0.14;
-//     ammoSpeed_ = 10000;
-
-    Ogre::Real liveTime = 1.4;
-    ammoSpeed_ = 1000;
-
-    if ( firePressed_ ){
-      if ( capacity_ > damage ){
-	Projectile * pro = new Projectile( this, shotsFired_, ammoSpeed_, damage, liveTime );
+  if ( firePressed_ ){
+    for ( std::list< GunObject * >::iterator it = activeGuns_.begin(); it != activeGuns_.end(); it++ ){
+      if ( (*it)->fire() ){
+	Projectile * pro = new Projectile( this, shotsFired_, *(*it), (*it)->mountPosition() );
 	addProjectile( pro );
 	sector_->sendProjectile( *pro );
-
-	fireDelay_ = delayTime;
 	shotsFired_++;
-	capacity_ -= damage;
-      } 
+      }
     }
-//   int nEmits = fireParticles_->getNumEmitters( );
-
-//   for ( int i = 0; i < nEmits; i ++ ){
-//     Ogre::ParticleEmitter * pEmit;  pEmit = fireParticles_->getEmitter( i );
-//     pEmit->setEnabled( true );
-//     pEmit->setTimeToLive( 1.8 );
-//     pEmit->setEmissionRate( 1000.0 );
-//     pEmit->setParticleVelocity( 1000.0 );
-//     pEmit->setDuration( 0.2 );
-//   }
-
   }
 }
 
@@ -666,8 +674,43 @@
   if ( vessel_->capacitor() ) maxCapacity_ = vessel_->capacitor()->capacity();
   capacity_   = maxCapacity_;
 
-  fireDelay_  = 0;
+//   std::map < int, std::vector < Ogre::Vector3 > > gunMountPoints( vessel_->gunMountPoints() );
 
+//   for ( std::map < int, std::vector < Ogre::Vector3 > >::iterator it = gunMountPoints.begin(); 
+// 	it != gunMountPoints.end(); it ++ ){
+//     for ( uint i = 0; i < it->second.size(); i ++ ){
+
+//       Ogre::SceneNode * mountPoint = mainNode_->createChildSceneNode( name_ + "_mountPoint" + toStr( i ) );
+
+//       GunObject *gun = new GunObject( EquipmentManager::getSingleton().gun( "Bender" ), mountPoint, capacity_ );
+
+// //       gun->setMountPosition( baseScale_ * it->second[ i ] );
+
+
+//       mountPoint->setPosition( it->second[ i ] );
+//       std::cout << mountPoint->getPosition() << std::endl;
+
+//       //      mountPoint->yaw( Ogre::Degree( vessel_->baseYaw() ),Ogre::Node::TS_PARENT ); 
+//       mountPoint->yaw( Ogre::Degree( vessel_->baseYaw() ) ); 
+//       mountPoint->_update(false, false);
+
+//       std::cout << mountPoint->getPosition() << std::endl;
+
+// //       mountPoint->pitch( Ogre::Degree( vessel_->basePitch() ) ); 
+// //       mountPoint->roll( Ogre::Degree( vessel_->baseRoll() ) ); 
+//       mountPoint->scale( baseScale_ );
+//       mountPoint->_update( false, false);
+
+//       std::cout << mountPoint->getPosition() << std::endl;
+
+// // 			  direction.zAxis().normalisedCopy() * -6.2 +
+// // 			  direction.xAxis().normalisedCopy() * 1.5 +
+// // 			  direction.yAxis().normalisedCopy() * -0.2 );
+
+//       activeGuns_.push_back( gun );
+//     }
+//   }
+
   targetArrow_ = NULL;
   flightArrow_ = NULL;
   forceMovement_ = false;

Modified: branches/ogsector/src/SectorObjects.h
===================================================================
--- branches/ogsector/src/SectorObjects.h	2007-07-04 21:32:38 UTC (rev 610)
+++ branches/ogsector/src/SectorObjects.h	2007-07-05 19:32:38 UTC (rev 611)
@@ -22,6 +22,7 @@
 #define PLAYERSHIP__H
 
 #include <OgrePrerequisites.h>
+#include <OgreSceneNode.h>
 
 #include "common.h"
 #include "networkProtocol.h"
@@ -43,6 +44,47 @@
 class Projectile;
 class OpcodeCollisionDetection;
 
+class GunObject{
+public:
+  GunObject( Gun * gun, Ogre::SceneNode * mountPoint, Uint32 & capacity ) 
+    : gun_( gun ), mountPoint_( mountPoint ), capacity_( &capacity ) {
+    delayTime_ = 0;
+  }
+  ~GunObject( ) { }
+
+  void update( const Ogre::Real elapsedTime ){
+    delayTime_ -= elapsedTime;
+  }
+
+  bool fire(){
+    if ( delayTime_ < 0 ){
+      if ( *capacity_ > gun_->powerConsumption() ){
+	*capacity_ -= gun_->powerConsumption();
+	delayTime_ = gun_->fireDelay();
+	return true;
+      }
+    }
+    return false;
+  }
+
+  Gun * gun(){ return gun_;}
+
+  Gun * gun() const { return gun_;}
+
+  //  void setMountPosition( const Ogre::Vector3 & mountPosition ) { mountPosition_ = mountPosition; }
+  Ogre::Vector3 mountPosition() const { return mountPoint_->getWorldPosition(); }
+
+  Ogre::SceneNode * sceneNode() { return mountPoint_; }
+  Ogre::SceneNode & sceneNode() const { return *mountPoint_; }
+
+protected:
+  Gun * gun_;
+  Ogre::SceneNode * mountPoint_;
+  Uint32 * capacity_;
+  Ogre::Real    delayTime_;
+  Ogre::Vector3 mountPosition_;
+};
+
 class BaseObject{
 public:
   BaseObject( const Ogre::String & name, Sector * sector, int userId = 0, int childId = 0  );
@@ -140,6 +182,7 @@
 
   bool isOnRadar_;
   Ogre::Vector3 baseSize_;
+  Ogre::Vector3 baseScale_;
 };
 
 /*! Base class for movable objects, instances are only used for foreign player objects. */
@@ -320,8 +363,13 @@
 
   int lastFrameCount_;
   bool statusChanged_;
+
+  Uint32 capacity_;
+  std::list < GunObject * > activeGuns_;  
 };
 
+
+
 /*! Movable sector objets which is controled by the client */
 class SectorObjectMoveableLocal : public SectorObjectMoveable {
 public:
@@ -349,13 +397,9 @@
   virtual void hitByAmmo( Uint32 damage );
 
 protected:
-  Ogre::Real ammoSpeed_;
-  Ogre::Real fireDelay_;
-  Uint32 capacity_;
   Uint32 maxCapacity_;
   Uint32 lastShieldSend_; 
   Ogre::Real thrustRate_;
-  
 };
 
 class SectorObjectMoveableAi : public SectorObjectMoveableLocal {
@@ -398,7 +442,10 @@
   }
   inline bool firePressed( ) const { return firePressed_; }
 
-  inline Ogre::Real ammoSpeed() const { return ammoSpeed_; } 
+  inline Ogre::Real ammoSpeed() const { 
+    if ( activeGuns_.size() > 0) return (*activeGuns_.begin() )->gun()->speed();
+    return 0.0; 
+  } 
 
   virtual bool deathSequence( Ogre::Real elapsedTime );
 

Modified: branches/ogsector/src/ShipConfigDialog.cpp
===================================================================
--- branches/ogsector/src/ShipConfigDialog.cpp	2007-07-04 21:32:38 UTC (rev 610)
+++ branches/ogsector/src/ShipConfigDialog.cpp	2007-07-05 19:32:38 UTC (rev 611)
@@ -215,36 +215,6 @@
   }
 }
 
-bool ShipConfigDialog::handleSelectShipButton( const CEGUI::EventArgs & e ){
-  devices_->avatar->setVessel( *(*itVessel_) );
-  LogManager::getSingleton().info( std::string( "Select vessel: " ) + devices_->avatar->vessel()->name() + " id:" + toStr( devices_->avatar->vessel()->id() ) );
-  updateEquipmentView();
-  return true;
-}
-
-bool ShipConfigDialog::handleCloseButton( const CEGUI::EventArgs & e ){
-  hide();
-  return true;
-}
-
-bool ShipConfigDialog::handleNextShipButton( const CEGUI::EventArgs & e ){
-  if ( vessels_.size() > 0 ){
-    itVessel_++;
-    if ( itVessel_ == vessels_.end() ) itVessel_ = vessels_.begin();
-    updateShipView();
-  }
-  return true;
-}
-
-bool ShipConfigDialog::handlePrevShipButton( const CEGUI::EventArgs & e ){
-  if ( vessels_.size() > 0 ){
-    if ( itVessel_ == vessels_.begin() ) itVessel_ = vessels_.end();
-    itVessel_--;
-    updateShipView();
-  }
-  return true;
-}
-
 void ShipConfigDialog::updateEquipmentView(){
 
   std::list< std::deque < Entity * > > * floorCargo = DeviceManager::getSingleton().avatar->floorCargo();
@@ -269,57 +239,33 @@
   }
 
   if ( DeviceManager::getSingleton().avatar->vessel()->powerPlant() ){
-    CEGUI::WindowManager::getSingleton().getWindow( equipmentButtons_[ 0 ]->getName() + "ShipConfigEquipmentItem/Load" )->hide();
-    CEGUI::WindowManager::getSingleton().getWindow( equipmentButtons_[ 0 ]->getName() + "ShipConfigEquipmentItem/UnLoad" )->show();
-    CEGUI::WindowManager::getSingleton().getWindow( equipmentButtons_[ 0 ]->getName() + "ShipConfigEquipmentButton/NextItem")->hide();
-    CEGUI::WindowManager::getSingleton().getWindow( equipmentButtons_[ 0 ]->getName() + "ShipConfigEquipmentButton/PrevItem")->hide();
     powerGridEngineThrust_ = 100;
-    fillShipConfigButton( equipmentButtons_[ 0 ], POWERPLANT, DeviceManager::getSingleton().avatar->vessel()->powerPlant() );
+    fillShipConfigButton( equipmentButtons_[ 0 ], POWERPLANT, DeviceManager::getSingleton().avatar->vessel()->powerPlant(), true  );
   } else {
     fillShipConfigButton( equipmentButtons_[ 0 ], POWERPLANT, pplants );
   }
   if ( DeviceManager::getSingleton().avatar->vessel()->engine() ){
-    CEGUI::WindowManager::getSingleton().getWindow( equipmentButtons_[ 1 ]->getName() + "ShipConfigEquipmentItem/Load" )->hide();
-    CEGUI::WindowManager::getSingleton().getWindow( equipmentButtons_[ 1 ]->getName() + "ShipConfigEquipmentItem/UnLoad" )->show();
-    CEGUI::WindowManager::getSingleton().getWindow( equipmentButtons_[ 1 ]->getName() + "ShipConfigEquipmentButton/NextItem")->hide();
-    CEGUI::WindowManager::getSingleton().getWindow( equipmentButtons_[ 1 ]->getName() + "ShipConfigEquipmentButton/PrevItem")->hide();
-    fillShipConfigButton( equipmentButtons_[ 1 ], ENGINE, DeviceManager::getSingleton().avatar->vessel()->engine() );
+    fillShipConfigButton( equipmentButtons_[ 1 ], ENGINE, DeviceManager::getSingleton().avatar->vessel()->engine(), true  );
   } else {
     fillShipConfigButton( equipmentButtons_[ 1 ], ENGINE, engines );
   }
   if ( DeviceManager::getSingleton().avatar->vessel()->radar() ){
-    CEGUI::WindowManager::getSingleton().getWindow( equipmentButtons_[ 2 ]->getName() + "ShipConfigEquipmentItem/Load" )->hide();
-    CEGUI::WindowManager::getSingleton().getWindow( equipmentButtons_[ 2 ]->getName() + "ShipConfigEquipmentItem/UnLoad" )->show();
-    CEGUI::WindowManager::getSingleton().getWindow( equipmentButtons_[ 2 ]->getName() + "ShipConfigEquipmentButton/NextItem")->hide();
-    CEGUI::WindowManager::getSingleton().getWindow( equipmentButtons_[ 2 ]->getName() + "ShipConfigEquipmentButton/PrevItem")->hide();
-    fillShipConfigButton( equipmentButtons_[ 2 ], RADAR, DeviceManager::getSingleton().avatar->vessel()->radar() );
+    fillShipConfigButton( equipmentButtons_[ 2 ], RADAR, DeviceManager::getSingleton().avatar->vessel()->radar(), true );
   } else {
     fillShipConfigButton( equipmentButtons_[ 2 ], RADAR, radars );
   }
   if ( DeviceManager::getSingleton().avatar->vessel()->ecm() ){
-    CEGUI::WindowManager::getSingleton().getWindow( equipmentButtons_[ 3 ]->getName() + "ShipConfigEquipmentItem/Load" )->hide();
-    CEGUI::WindowManager::getSingleton().getWindow( equipmentButtons_[ 3 ]->getName() + "ShipConfigEquipmentItem/UnLoad" )->show();
-    CEGUI::WindowManager::getSingleton().getWindow( equipmentButtons_[ 3 ]->getName() + "ShipConfigEquipmentButton/NextItem")->hide();
-    CEGUI::WindowManager::getSingleton().getWindow( equipmentButtons_[ 3 ]->getName() + "ShipConfigEquipmentButton/PrevItem")->hide();
-    fillShipConfigButton( equipmentButtons_[ 3 ], ECM, DeviceManager::getSingleton().avatar->vessel()->ecm() );
+    fillShipConfigButton( equipmentButtons_[ 3 ], ECM, DeviceManager::getSingleton().avatar->vessel()->ecm(), true );
   } else {
     fillShipConfigButton( equipmentButtons_[ 3 ], ECM, ecms );
   }
   if ( DeviceManager::getSingleton().avatar->vessel()->shield() ){
-    CEGUI::WindowManager::getSingleton().getWindow( equipmentButtons_[ 4 ]->getName() + "ShipConfigEquipmentItem/Load" )->hide();
-    CEGUI::WindowManager::getSingleton().getWindow( equipmentButtons_[ 4 ]->getName() + "ShipConfigEquipmentItem/UnLoad" )->show();
-    CEGUI::WindowManager::getSingleton().getWindow( equipmentButtons_[ 4 ]->getName() + "ShipConfigEquipmentButton/NextItem")->hide();
-    CEGUI::WindowManager::getSingleton().getWindow( equipmentButtons_[ 4 ]->getName() + "ShipConfigEquipmentButton/PrevItem")->hide();
-    fillShipConfigButton( equipmentButtons_[ 4 ], SHIELD, DeviceManager::getSingleton().avatar->vessel()->shield() );
+    fillShipConfigButton( equipmentButtons_[ 4 ], SHIELD, DeviceManager::getSingleton().avatar->vessel()->shield(), true );
   } else {
     fillShipConfigButton( equipmentButtons_[ 4 ], SHIELD, shields );
   }
   if ( DeviceManager::getSingleton().avatar->vessel()->capacitor() ){
-    CEGUI::WindowManager::getSingleton().getWindow( equipmentButtons_[ 5 ]->getName() + "ShipConfigEquipmentItem/Load" )->hide();
-    CEGUI::WindowManager::getSingleton().getWindow( equipmentButtons_[ 5 ]->getName() + "ShipConfigEquipmentItem/UnLoad" )->show();
-    CEGUI::WindowManager::getSingleton().getWindow( equipmentButtons_[ 5 ]->getName() + "ShipConfigEquipmentButton/NextItem")->hide();
-    CEGUI::WindowManager::getSingleton().getWindow( equipmentButtons_[ 5 ]->getName() + "ShipConfigEquipmentButton/PrevItem")->hide();
-    fillShipConfigButton( equipmentButtons_[ 5 ], CAPACITOR, DeviceManager::getSingleton().avatar->vessel()->capacitor() );
+    fillShipConfigButton( equipmentButtons_[ 5 ], CAPACITOR, DeviceManager::getSingleton().avatar->vessel()->capacitor(), true );
   } else {
     fillShipConfigButton( equipmentButtons_[ 5 ], CAPACITOR, capacitors );
   }
@@ -345,13 +291,14 @@
     fillShipConfigButton( window, entity, (*(items)[ 0 ])[ 0 ] );
   } else {
     CEGUI::WindowManager::getSingleton().getWindow(  window->getName() + "ShipConfigEquipmentItem/Load")->hide();
+    CEGUI::WindowManager::getSingleton().getWindow(  window->getName() + "ShipConfigEquipmentItem/UnLoad")->hide();
     CEGUI::WindowManager::getSingleton().getWindow(  window->getName() + "ShipConfigEquipmentButton/PrevItem")->hide();
     CEGUI::WindowManager::getSingleton().getWindow(  window->getName() + "ShipConfigEquipmentButton/NextItem")->hide();
     fillShipConfigButton( window, entity, NULL );
   }
 }
 
-void ShipConfigDialog::fillShipConfigButton( CEGUI::Window * window, EntityType entity, Entity * item ){
+void ShipConfigDialog::fillShipConfigButton( CEGUI::Window * window, EntityType entity, Entity * item, bool mounted ){
   CEGUI::String labelName( DeviceManager::getSingleton().categoryName( entity ) );
   if ( labelName == "unknown" ) labelName = "";
 
@@ -362,16 +309,22 @@
     itemName  = item->name();
     imageName = item->ceguiSmallImageName();
     window->setUserData( item );
+    if ( mounted ){
+      CEGUI::WindowManager::getSingleton().getWindow( window->getName() + "ShipConfigEquipmentItem/Load")->hide();
+      CEGUI::WindowManager::getSingleton().getWindow( window->getName() + "ShipConfigEquipmentItem/UnLoad")->show();
+      CEGUI::WindowManager::getSingleton().getWindow( window->getName() + "ShipConfigEquipmentButton/NextItem")->hide();
+      CEGUI::WindowManager::getSingleton().getWindow( window->getName() + "ShipConfigEquipmentButton/PrevItem")->hide();
+    }
   } else{
     window->setUserData( NULL );
-    CEGUI::WindowManager::getSingleton().getWindow(  window->getName() + "ShipConfigEquipmentItem/Load")->hide();
-    CEGUI::WindowManager::getSingleton().getWindow(  window->getName() + "ShipConfigEquipmentButton/PrevItem")->hide();
-    CEGUI::WindowManager::getSingleton().getWindow(  window->getName() + "ShipConfigEquipmentButton/NextItem")->hide();
+    CEGUI::WindowManager::getSingleton().getWindow( window->getName() + "ShipConfigEquipmentItem/Load")->hide();
+    CEGUI::WindowManager::getSingleton().getWindow( window->getName() + "ShipConfigEquipmentButton/PrevItem")->hide();
+    CEGUI::WindowManager::getSingleton().getWindow( window->getName() + "ShipConfigEquipmentButton/NextItem")->hide();
   }
 
   if ( DeviceManager::getSingleton().avatar->vessel()->fixEquipment() ){
-    CEGUI::WindowManager::getSingleton().getWindow(  window->getName() + "ShipConfigEquipmentItem/Load")->hide();
-    CEGUI::WindowManager::getSingleton().getWindow(  window->getName() + "ShipConfigEquipmentItem/UnLoad")->hide();
+    CEGUI::WindowManager::getSingleton().getWindow( window->getName() + "ShipConfigEquipmentItem/Load")->hide();
+    CEGUI::WindowManager::getSingleton().getWindow( window->getName() + "ShipConfigEquipmentItem/UnLoad")->hide();
   }
 
   CEGUI::WindowManager::getSingleton().getWindow(  window->getName() + "ShipConfigEquipmentButton/Label" )->
@@ -407,41 +360,6 @@
   }
 }
 
-bool ShipConfigDialog::handeMainWindowShown( const CEGUI::EventArgs & e ){
-  updateEquipmentView();
-  return true;
-}
-
-bool ShipConfigDialog::handleLoadItem( const CEGUI::EventArgs & e ){
-  const CEGUI::WindowEventArgs & we = static_cast< const CEGUI::WindowEventArgs & >( e );
-  CEGUI::Window * itemWindow = we.window->getParent();
-  Entity *item = (Entity *)itemWindow->getUserData();
-
-  if ( item ){
-    if ( item->entityType() == POWERPLANT ) powerGridEngineThrust_ = 100;
-
-    if ( DeviceManager::getSingleton().avatar->loadItem( item ) ){
-      CEGUI::WindowManager::getSingleton().getWindow( itemWindow->getName()+"ShipConfigEquipmentItem/Load" )->hide();
-      CEGUI::WindowManager::getSingleton().getWindow( itemWindow->getName()+"ShipConfigEquipmentItem/UnLoad" )->show();
-    }
-  }
-  return updatePowerGrid( );
-}
-
-bool ShipConfigDialog::handleUnLoadItem( const CEGUI::EventArgs & e ){
-  const CEGUI::WindowEventArgs & we = static_cast< const CEGUI::WindowEventArgs & >( e );
-  CEGUI::Window * itemWindow = we.window->getParent();
-  Entity *item = (Entity *)itemWindow->getUserData();
-
-  if ( item ){
-    if ( DeviceManager::getSingleton().avatar->unLoadItem( item ) ){
-      CEGUI::WindowManager::getSingleton().getWindow( itemWindow->getName()+"ShipConfigEquipmentItem/Load" )->show();
-      CEGUI::WindowManager::getSingleton().getWindow( itemWindow->getName()+"ShipConfigEquipmentItem/UnLoad" )->hide();
-    }
-  }
-  return updatePowerGrid( );
-}
-
 bool ShipConfigDialog::updatePowerGrid( ){
   double powerLine = 0;
   double powerOut = 0;
@@ -522,6 +440,92 @@
   return true;
 }
 
+bool ShipConfigDialog::handleSelectShipButton( const CEGUI::EventArgs & e ){
+  if ( (*itVessel_)->name() != devices_->avatar->vessel()->name() 
+       && (*itVessel_)->factionID() != 4 ){
 
+    for ( unsigned int i = 0; i < equipmentButtons_.size(); i ++ ){
+      Entity *item = (Entity *)equipmentButtons_[ i ]->getUserData();
 
+      if ( item ){
+	if ( DeviceManager::getSingleton().avatar->unLoadItem( item ) ){
+	  CEGUI::WindowManager::getSingleton().getWindow( equipmentButtons_[ i ]->getName() + 
+							  "ShipConfigEquipmentItem/Load" )->show();
+	  CEGUI::WindowManager::getSingleton().getWindow( equipmentButtons_[ i ]->getName() + 
+							  "ShipConfigEquipmentItem/UnLoad" )->hide();
+	}
+      }
+    }
+    
+    LogManager::getSingleton().info( std::string( "Select vessel: " ) + devices_->avatar->vessel()->name() + 
+				     " id:" + toStr( devices_->avatar->vessel()->id() ) );
+
+    devices_->avatar->setVessel( *(*itVessel_) );
+    updatePowerGrid();
+    updateEquipmentView();
+  }
+  return true;
+}
+
+bool ShipConfigDialog::handleCloseButton( const CEGUI::EventArgs & e ){
+  hide();
+  return true;
+}
+
+bool ShipConfigDialog::handleNextShipButton( const CEGUI::EventArgs & e ){
+  if ( vessels_.size() > 0 ){
+    itVessel_++;
+    if ( itVessel_ == vessels_.end() ) itVessel_ = vessels_.begin();
+    updateShipView();
+  }
+  return true;
+}
+
+bool ShipConfigDialog::handlePrevShipButton( const CEGUI::EventArgs & e ){
+  if ( vessels_.size() > 0 ){
+    if ( itVessel_ == vessels_.begin() ) itVessel_ = vessels_.end();
+    itVessel_--;
+    updateShipView();
+  }
+  return true;
+}
+
+bool ShipConfigDialog::handeMainWindowShown( const CEGUI::EventArgs & e ){
+  updateEquipmentView();
+  return true;
+}
+
+bool ShipConfigDialog::handleLoadItem( const CEGUI::EventArgs & e ){
+  const CEGUI::WindowEventArgs & we = static_cast< const CEGUI::WindowEventArgs & >( e );
+  CEGUI::Window * itemWindow = we.window->getParent();
+  Entity *item = (Entity *)itemWindow->getUserData();
+
+  if ( item ){
+    if ( item->entityType() == POWERPLANT ) powerGridEngineThrust_ = 100;
+
+    if ( DeviceManager::getSingleton().avatar->loadItem( item ) ){
+      CEGUI::WindowManager::getSingleton().getWindow( itemWindow->getName()+"ShipConfigEquipmentItem/Load" )->hide();
+      CEGUI::WindowManager::getSingleton().getWindow( itemWindow->getName()+"ShipConfigEquipmentItem/UnLoad" )->show();
+    }
+  }
+  return updatePowerGrid( );
+}
+
+bool ShipConfigDialog::handleUnLoadItem( const CEGUI::EventArgs & e ){
+  const CEGUI::WindowEventArgs & we = static_cast< const CEGUI::WindowEventArgs & >( e );
+  CEGUI::Window * itemWindow = we.window->getParent();
+  Entity *item = (Entity *)itemWindow->getUserData();
+
+  if ( item ){
+    if ( DeviceManager::getSingleton().avatar->unLoadItem( item ) ){
+      CEGUI::WindowManager::getSingleton().getWindow( itemWindow->getName()+"ShipConfigEquipmentItem/Load" )->show();
+      CEGUI::WindowManager::getSingleton().getWindow( itemWindow->getName()+"ShipConfigEquipmentItem/UnLoad" )->hide();
+    }
+  }
+  return updatePowerGrid( );
+}
+
+
+
+
 } // namespace OpenGate

Modified: branches/ogsector/src/ShipConfigDialog.h
===================================================================
--- branches/ogsector/src/ShipConfigDialog.h	2007-07-04 21:32:38 UTC (rev 610)
+++ branches/ogsector/src/ShipConfigDialog.h	2007-07-05 19:32:38 UTC (rev 611)
@@ -52,7 +52,7 @@
   void populateEquipmentButtons( );
   void updateEquipmentView();
   void fillShipConfigButton( CEGUI::Window *, EntityType entity, std::vector < std::deque< Entity * > * > & items );
-  void fillShipConfigButton( CEGUI::Window * window, EntityType entity, Entity * item );
+  void fillShipConfigButton( CEGUI::Window * window, EntityType entity, Entity * item, bool mounted = false);
   bool updatePowerGrid( );
   
   /*! This changes the ship rendered to the texture rttTex_. It is called by handleNextShipButton() or handlePrevShipButton(). */

Modified: branches/ogsector/src/UnDockedState.cpp
===================================================================
--- branches/ogsector/src/UnDockedState.cpp	2007-07-04 21:32:38 UTC (rev 610)
+++ branches/ogsector/src/UnDockedState.cpp	2007-07-05 19:32:38 UTC (rev 611)
@@ -54,15 +54,13 @@
   network_ = devices_->network;
 
   overlayRootWindow_ = CEGUI::WindowManager::getSingleton().loadWindowLayout((CEGUI::utf8*)"opengateUnDocked.layout");
+  hudIsVisible_ = true;
+  cameraViewKey_ = 1;
 
   mainCamera_ = sceneMgr_->createCamera( "MainCamera" );
-//   mainCamera_->setPosition( Ogre::Vector3( 0, 0, 500 ) );
-//   mainCamera_->lookAt( Ogre::Vector3( 0, 0, 0 ) );
   mainCamera_->setNearClipDistance( 1 );
 
   secondCamera_ = sceneMgr_->createCamera( "SecondCamera" );
-//   secondCamera_->setPosition( Ogre::Vector3( 0, 0, 500 ) );
-//   secondCamera_->lookAt( Ogre::Vector3( 0, 0, 0 ) );
   secondCamera_->setNearClipDistance( 1 );
 
   windowsWidth_ = window_->getWidth( );
@@ -150,7 +148,7 @@
   try{
     sector_ = new Sector( sceneMgr_, network_ );
   } catch( Ogre::Exception& e ) {
-    std::cout << e.getFullDescription().c_str() << std::endl;
+    log_->fatal( e.getFullDescription().c_str() );
   }
   sector_->setListener( this );
 
@@ -198,10 +196,12 @@
   duelistPilot_ = false;
   duelistTarget_ = false;
 
-  timeSinceLastSectorUpdate_ = 0.0;
+  timeSinceLastSectorUpdate_  = 0.0;
   timeSinceLastNetworkUpdate_ = 0.0;
+  timeSinceLastHudUpdate_     = 0.0;
 
-//   cameraRotateSpeed_ = 36;
+  cameraRotateX_ = 0;
+  cameraRotateY_ = 0;
 //   cameraRotateScale_ = 0.0f;
 //   cameraMoveSpeed_ = 100;
 //   cameraMoveScale_ = 0.0f;
@@ -253,7 +253,7 @@
   CEGUI::WindowManager::getSingleton().getWindow( (CEGUI::utf8*)"Config/BackButton" )->subscribeEvent(
       CEGUI::PushButton::EventClicked, CEGUI::Event::Subscriber(&UnDockedState::handleConfigBackButton, this ) ) ;
 
-  toggleNextCamera_( 1 );
+  toggleNextCamera_( 0 );
 
  //** start update SceneManager, if not set this leeds to strange behaviour by switching states
  //** opengateclient: OgreRenderQueueSortingGrouping.cpp:355: void Ogre::QueuedRenderableCollection::addRenderable(Ogre::Pass*, Ogre::Renderable*): Assertion `retPair.second && "Error inserting new pass entry into PassGroupRenderableMap"' failed.
@@ -311,6 +311,7 @@
   configMode_ = devices_->gameStateRoot->configDialog()->isVisible();
 
   if ( configMode_ ){
+    overlayRootWindow_->show();
     hudOverlay_->hide( );
     Ogre::OverlayManager::getSingleton().getByName( "Radar" )->hide();
     CEGUI::MouseCursor::getSingleton().show();
@@ -318,6 +319,7 @@
     CEGUI::MouseCursor::getSingleton().hide();
     hudOverlay_->show( );
     Ogre::OverlayManager::getSingleton().getByName( "Radar" )->show();
+    if ( cameraViewKey_ != 1 ) hideHud();
   }
   return true;
 }
@@ -354,8 +356,8 @@
   }
 
   //** update my camera;
-  updateCamera_();
-  updateHUD_();
+  updateCamera_( evt.timeSinceLastFrame );
+  updateHUD_( evt.timeSinceLastFrame );
 
 //   renderSpaceDust();
   return true;
@@ -439,6 +441,12 @@
     //** prev Target;
     if ( e.key == OIS::KC_P ) { setTarget( sector_->prevTarget() ); }
     
+    if ( e.key == OIS::KC_1 ) { if ( cameraMode_ == 0 ) showHud(); cameraViewKey_ = 1; }
+    if ( e.key == OIS::KC_2 ) { hideHud(); cameraViewKey_ = 2; }
+    if ( e.key == OIS::KC_3 ) { hideHud(); cameraViewKey_ = 3; }
+    if ( e.key == OIS::KC_4 ) { hideHud(); cameraViewKey_ = 4; }
+    if ( e.key == OIS::KC_5 ) { hideHud(); cameraViewKey_ = 5; }
+
     //** Toggle through camera modes;
     if ( e.key == OIS::KC_6 ) { toggleNextCamera_(); }
     
@@ -695,7 +703,7 @@
 }
 
 void UnDockedState::toggleNextCamera_( int mode ){
-  int maxCameraModes = 4;
+  int maxCameraModes = 2;
 
   //** circle through cameraModes;
   if ( mode == -1 ){
@@ -705,35 +713,35 @@
   }
 
   switch ( cameraMode_ ){
-  case 0: //** free camera at orign
-    mainCamera_->setPosition( Ogre::Vector3( 0, 0, 500 ) );
+  case 0: //** first person avatar camera
+    showHud();
+    mainCamera_->setOrientation( sector_->avatarObject()->mainNode()->getOrientation() );
     if ( sector_->avatarObject() != NULL ){
-      mainCamera_->setAutoTracking( false, sector_->avatarObject()->mainNode() );
-      sector_->avatarObject()->setVisible( true );
-    }
-    break;
-  case 1: //** first person avatar camera
-    if ( sector_->avatarObject() != NULL ){
       sector_->avatarObject()->setVisible( false );
       break;
     }
-  case 2: //** avatar chase camera;
+  case 1: //** avatar chase camera;
+    hideHud();
+    cameraRotateX_ = 0;
+    cameraRotateY_ = 0;
+    cameraViewKey_ = 1;
     if ( sector_->avatarObject() != NULL ){
       sector_->avatarObject()->setVisible( true );
       break;
     }
-  case 3: //** free avatar tracking-camera at orign
-    mainCamera_->setPosition( Ogre::Vector3( 0, 0, 500 ) );
-    mainCamera_->lookAt( Ogre::Vector3( 0, 0, -300 ) );
-    if ( sector_->avatarObject() != NULL ){
-      mainCamera_->setAutoTracking( true, sector_->avatarObject()->mainNode() );
-      sector_->avatarObject()->setVisible( true );
-    }
-    break;
+//   case 2: //** free avatar tracking-camera at orign;
+//     hideHud();
+//     mainCamera_->setPosition( Ogre::Vector3( 0, 0, 500 ) );
+//     mainCamera_->lookAt( Ogre::Vector3( 0, 0, -300 ) );
+//     if ( sector_->avatarObject() != NULL ){
+// //       mainCamera_->setAutoTracking( true, sector_->avatarObject()->mainNode() );
+//       sector_->avatarObject()->setVisible( true );
+//     }
+//     break;
   }
 }
 
-void UnDockedState::updateCamera_(){
+void UnDockedState::updateCamera_( Ogre::Real elapsedTime ){
   if ( sector_->avatarObject() != NULL ){
     Ogre::Vector3 avatarPos( sector_->avatarObject()->mainNode()->getPosition() );
 
@@ -758,21 +766,59 @@
     if ( target_ != NULL ) secondCamera_->setPosition( avatarPos + distNorm * ( dist.length() - 2.0 * target_->maxBaseSize() ) );
 
     switch ( cameraMode_ ){
-    case 0: //** free camera at orign
-      mainCamera_->lookAt( sector_->avatarObject()->mainNode()->getPosition( ) );
-      break;
-    case 1: //** first person avatar camera
-      mainCamera_->setPosition( avatarPos );
+    case 0: //** first person avatar camera;
+      sector_->avatarObject()->setVisible( false );
+      mainCamera_->setPosition( avatarPos  );
       mainCamera_->setOrientation( avatarOrient );
-      sector_->avatarObject()->setVisible( false );
+      switch( cameraViewKey_ ){
+      case 1:
+	mainCamera_->setOrientation( avatarOrient );
+	break;
+      case 2: // look left
+	mainCamera_->yaw( Ogre::Degree( 90 ) );
+	break;
+      case 3: // look right
+	mainCamera_->yaw( Ogre::Degree( -90 ) );
+	break;
+      case 4: // look up
+	mainCamera_->pitch( Ogre::Degree( 90 ) );
+	break;
+      case 5: // look back;
+	mainCamera_->yaw( Ogre::Degree( 180 ) );
+	break;
+      }
       break;
-    case 2: //** avatar chase camera
-      mainCamera_->setPosition( avatarPos + avatarOrient.zAxis() * 100 );
-      mainCamera_->setOrientation( avatarOrient );
+    case 1: { //** avatar chase camera;
+      switch( cameraViewKey_ ){
+      case 1:
+	break;
+      case 2:
+	cameraRotateX_ -= Ogre::Degree( ( 30.0 * elapsedTime ) );
+	break;
+      ca...
 
[truncated message content]

[Opengate-svn] SF.net SVN: opengate: [628] trunk/data

[<ult...@us...>]

Revision: 628
          http://svn.sourceforge.net/opengate/?rev=628&view=rev
Author:   ultrasick
Date:     2007-07-07 04:21:18 -0700 (Sat, 07 Jul 2007)

Log Message:
-----------
adding required political status
+ changeing efficiency value for T-E-15 from 80% to 79% (using in game value instead of jossh value)
+ changeing efficiency value for Kydango from 80% to 76% (using in game value instead of jossh value)

Modified Paths:
--------------
    trunk/data/capacitors/summoner.xml
    trunk/data/engines/money.xml
    trunk/data/engines/t-e-15.xml
    trunk/data/power_plants/contender.xml
    trunk/data/power_plants/contender_xpr.xml
    trunk/data/power_plants/spud.xml
    trunk/data/radars/cyclops.xml
    trunk/data/radars/hall_monitor.xml
    trunk/data/radars/outlook.xml
    trunk/data/radars/t-r-9.xml
    trunk/data/shields/alpaa.xml
    trunk/data/shields/flatiron.xml
    trunk/data/shields/himelea.xml
    trunk/data/shields/kydango.xml
    trunk/data/shields/pod.xml
    trunk/data/shields/shelter.xml
    trunk/data/shields/t-s-13.xml

Modified: trunk/data/capacitors/summoner.xml
===================================================================
(Binary files differ)

Modified: trunk/data/engines/money.xml
===================================================================
(Binary files differ)

Modified: trunk/data/engines/t-e-15.xml
===================================================================
(Binary files differ)

Modified: trunk/data/power_plants/contender.xml
===================================================================
(Binary files differ)

Modified: trunk/data/power_plants/contender_xpr.xml
===================================================================
(Binary files differ)

Modified: trunk/data/power_plants/spud.xml
===================================================================
(Binary files differ)

Modified: trunk/data/radars/cyclops.xml
===================================================================
(Binary files differ)

Modified: trunk/data/radars/hall_monitor.xml
===================================================================
(Binary files differ)

Modified: trunk/data/radars/outlook.xml
===================================================================
(Binary files differ)

Modified: trunk/data/radars/t-r-9.xml
===================================================================
(Binary files differ)

Modified: trunk/data/shields/alpaa.xml
===================================================================
(Binary files differ)

Modified: trunk/data/shields/flatiron.xml
===================================================================
(Binary files differ)

Modified: trunk/data/shields/himelea.xml
===================================================================
(Binary files differ)

Modified: trunk/data/shields/kydango.xml
===================================================================
(Binary files differ)

Modified: trunk/data/shields/pod.xml
===================================================================
(Binary files differ)

Modified: trunk/data/shields/shelter.xml
===================================================================
(Binary files differ)

Modified: trunk/data/shields/t-s-13.xml
===================================================================
(Binary files differ)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opengate-svn] SF.net SVN: opengate: [629] trunk/data

[<ult...@us...>]

Revision: 629
          http://svn.sourceforge.net/opengate/?rev=629&view=rev
Author:   ultrasick
Date:     2007-07-07 05:47:43 -0700 (Sat, 07 Jul 2007)

Log Message:
-----------
adding required political status (but not in the prostheses.xml, uranium.xml and not in the zinc.xml)
+ added faction id in prostheses.xml, uranium.xml and zinc.xml
+ changed damage value from 240 to 192 from the bender gun (using in game value instead of jossh value)
+ changed fire delay value from 0.8 to 0.6 from the bender gun (using in game value instead of jossh value)

Modified Paths:
--------------
    trunk/data/commodities/prostheses.xml
    trunk/data/commodities/uranium.xml
    trunk/data/commodities/zinc.xml
    trunk/data/guns/bender.xml
    trunk/data/power_plants/gatherer.xml
    trunk/data/power_plants/t-p-16.xml
    trunk/data/radars/knocker.xml
    trunk/data/radars/night_watchman.xml

Modified: trunk/data/commodities/prostheses.xml
===================================================================
(Binary files differ)

Modified: trunk/data/commodities/uranium.xml
===================================================================
(Binary files differ)

Modified: trunk/data/commodities/zinc.xml
===================================================================
(Binary files differ)

Modified: trunk/data/guns/bender.xml
===================================================================
(Binary files differ)

Modified: trunk/data/power_plants/gatherer.xml
===================================================================
(Binary files differ)

Modified: trunk/data/power_plants/t-p-16.xml
===================================================================
(Binary files differ)

Modified: trunk/data/radars/knocker.xml
===================================================================
(Binary files differ)

Modified: trunk/data/radars/night_watchman.xml
===================================================================
(Binary files differ)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opengate-svn] SF.net SVN: opengate: [639] trunk/data

[<spo...@us...>]

Revision: 639
          http://opengate.svn.sourceforge.net/opengate/?rev=639&view=rev
Author:   spom_spom
Date:     2007-07-27 08:12:58 -0700 (Fri, 27 Jul 2007)

Log Message:
-----------
Add asteroid with experimental bump mapping. fixed some small issues.

Modified Paths:
--------------
    branches/ogsector/data/MediaFromOgre/AdvancedMaterials/Examples-Advanced.material
    branches/ogsector/data/gui/layouts/dialogs/MarketDialog.layout
    branches/ogsector/data/gui/schemes/opengate.scheme
    branches/ogsector/data/materials/squid.material
    branches/ogsector/externals/ois-1.0RC1/Makefile.in
    branches/ogsector/externals/ois-1.0RC1/demos/Makefile.in
    branches/ogsector/externals/ois-1.0RC1/includes/Makefile.in
    branches/ogsector/externals/ois-1.0RC1/src/Makefile.in
    branches/ogsector/ogre.cfg
    branches/ogsector/resources.cfg
    branches/ogsector/src/DeviceManager.h
    branches/ogsector/src/Entity.h
    branches/ogsector/src/EntityManager.cpp
    branches/ogsector/src/GameStateManager.cpp
    branches/ogsector/src/MarketDialog.cpp
    branches/ogsector/src/OpcodeWrapper.cpp
    branches/ogsector/src/Projectile.cpp
    branches/ogsector/src/Sector.cpp
    branches/ogsector/src/Sector.h
    branches/ogsector/src/SectorObjects.cpp
    branches/ogsector/src/SectorObjects.h
    branches/ogsector/src/UnDockedState.cpp
    branches/ogsector/src/opengateclient.cpp
    trunk/data/guns/excavator.xml
    trunk/data/misc/testsector.xml
    trunk/data/ships/quantar/storm/storm.material
    trunk/data/ships/tauseti/lady_kickstart/lady_kickstart.material

Added Paths:
-----------
    branches/ogsector/data/asteroids/
    branches/ogsector/data/asteroids/asteroid.material
    branches/ogsector/data/asteroids/asteroid.png
    branches/ogsector/data/asteroids/asteroid01.blend
    branches/ogsector/data/asteroids/asteroid01.mesh
    branches/ogsector/data/asteroids/asteroidBump.png

Modified: branches/ogsector/data/MediaFromOgre/AdvancedMaterials/Examples-Advanced.material
===================================================================
--- branches/ogsector/data/MediaFromOgre/AdvancedMaterials/Examples-Advanced.material	2007-07-17 18:14:16 UTC (rev 638)
+++ branches/ogsector/data/MediaFromOgre/AdvancedMaterials/Examples-Advanced.material	2007-07-27 15:12:58 UTC (rev 639)
@@ -1,3 +1,74 @@
+// -------------------------------
+// Cel Shading Section
+// -------------------------------
+vertex_program Ogre/CelShadingVP cg
+{
+	source Example_CelShading.cg
+	entry_point main_vp
+	profiles vs_1_1 arbvp1
+
+	default_params
+	{
+		param_named_auto lightPosition light_position_object_space 0
+		param_named_auto eyePosition camera_position_object_space
+		param_named_auto worldViewProj worldviewproj_matrix
+		param_named shininess float 10 
+	}
+}
+
+fragment_program Ogre/CelShadingFP cg
+{
+	source Example_CelShading.cg
+	entry_point main_fp
+	profiles ps_1_1 arbfp1 fp20
+}
+
+
+material Examples/CelShading
+{
+	technique
+	{
+		pass
+		{
+			vertex_program_ref Ogre/CelShadingVP
+			{
+				// map shininess from custom renderable param 1
+				param_named_auto shininess custom 1
+			}
+			fragment_program_ref Ogre/CelShadingFP
+			{
+				// map diffuse from custom renderable param 2
+				param_named_auto diffuse custom 2
+				// map specular from custom renderable param 2
+				param_named_auto specular custom 3
+			}
+			texture_unit
+			{
+				texture cel_shading_diffuse.png 1d
+				tex_address_mode clamp
+				filtering none
+			}
+			texture_unit
+			{
+				texture cel_shading_specular.png 1d
+				tex_address_mode clamp
+				filtering none
+				tex_coord_set 1
+			}
+			texture_unit
+			{
+				texture cel_shading_edge.png 1d
+				tex_address_mode clamp
+				filtering none
+				tex_coord_set 2
+			}
+		}
+	}
+	
+}
+
+
+
 //------------------------
 // Bump mapping section
 //------------------------
@@ -497,3 +568,600 @@
 	}
 }
 
+//---------------------------
+// Projective texture section
+//---------------------------
+
+
+vertex_program Examples/TexProjectionVP cg
+{
+	source Example_Projection.cg
+	entry_point generalPurposeProjection_vp
+	profiles vs_1_1 arbvp1
+}
+
+fragment_program Examples/TexProjectionFP cg
+{
+	source Example_Projection.cg
+	entry_point generalPurposeProjection_fp
+	// sorry, ps_1_1 can't do this, fp20 can though
+	profiles ps_2_0 arbfp1 fp20
+}
+
+material Examples/GeneralTexProjection
+{
+	technique
+	{
+		pass 
+		{
+			
+			vertex_program_ref Examples/TexProjectionVP
+			{
+				param_named_auto worldViewProjMatrix worldviewproj_matrix
+				param_named_auto worldMatrix world_matrix
+				// You'll need to update the tex projection, I suggest using
+				// the Frustum class
+				//param_named_auto texWorldViewProj worldviewproj_matrix
+			}
+			fragment_program_ref Examples/TexProjectionFP
+			{
+				// no params
+			}
+			texture_unit
+			{
+				// Project the OGRE logo
+				texture ogrelogo.png
+				tex_address_mode clamp
+			}
+		}
+		
+			
+	}
+    
+}
+
+//----------------------------
+// Distortion effects
+//----------------------------
+
+vertex_program Examples/FresnelRefractReflectVP cg
+{
+	source Example_Fresnel.cg
+	entry_point main_vp
+	profiles vs_1_1 arbvp1
+}
+vertex_program Examples/FresnelRefractReflectVPold cg
+{
+	source Example_Fresnel.cg
+	entry_point main_vp_old
+	profiles vs_1_1 arbvp1
+}
+
+fragment_program Examples/FresnelRefractReflectFP cg
+{
+	source Example_Fresnel.cg
+	entry_point main_fp
+	// sorry, ps_1_1 and fp20 can't do this
+	profiles ps_2_0 arbfp1
+}
+
+fragment_program Examples/FresnelRefractReflectPS asm
+{
+	source Example_FresnelPS.asm
+	// sorry, only for ps_1_4 :)
+	syntax ps_1_4
+
+}
+
+material Examples/FresnelReflectionRefraction
+{
+	// ps_2_0 / arbfp1
+	technique
+	{
+		pass 
+		{
+			
+			vertex_program_ref Examples/FresnelRefractReflectVP
+			{
+				param_named_auto worldViewProjMatrix worldviewproj_matrix
+				param_named_auto eyePosition camera_position_object_space
+				param_named_auto timeVal time 0.05
+				param_named scroll float 1  
+				param_named scale float 1 
+				param_named noise float 1 
+				// scroll and noisePos will need updating per frame
+			}
+			fragment_program_ref Examples/FresnelRefractReflectFP
+			{
+				param_named fresnelBias float -0.1 
+				param_named fresnelScale float 1.8 
+				param_named fresnelPower float 8  
+				param_named tintColour float4 0 0.0.05 0.05 1
+				param_named noiseScale float 0.05 
+			}
+			// Noise
+			texture_unit
+			{
+				// Perlin noise volume
+				texture waves2.dds
+				// min / mag filtering, no mip
+				filtering linear linear none
+			}
+			// Reflection
+			texture_unit
+			{
+				// Will be filled in at runtime
+				texture Reflection
+				tex_address_mode clamp
+				// needed by ps.1.4
+				tex_coord_set 1
+			}
+			// Refraction
+			texture_unit
+			{
+				// Will be filled in at runtime
+				texture Refraction
+				tex_address_mode clamp
+				// needed by ps.1.4
+				tex_coord_set 2
+			}
+		}
+		
+			
+	}
+
+	// ATI 8500 +
+	technique
+	{
+		pass
+		{
+			vertex_program_ref Examples/FresnelRefractReflectVPold
+			{
+				param_named_auto worldViewProjMatrix worldviewproj_matrix
+				param_named_auto eyePosition camera_position_object_space
+				param_named fresnelBias float -0.3
+				param_named fresnelScale float 1.4
+				param_named fresnelPower float 8
+				param_named_auto timeVal time_0_1 20
+				param_named scroll float 1 
+				param_named scale float 4 
+				param_named noise float 1
+				// scroll and noisePos will need updating per frame
+			}
+
+			// for ATI RADEON 8500 - 9200
+			fragment_program_ref Examples/FresnelRefractReflectPS
+			{
+				// distortionRange
+				param_indexed 0  float 0.025  
+				// tintColour
+				param_indexed 1  float4 0.05 0.12 0.15 1
+			}
+
+			// Noise
+			texture_unit
+			{
+				// Perlin noise volume
+				texture perlinvolume.dds 3d
+				// min / mag filtering, no mip
+				filtering linear linear none
+			}
+			// Reflection
+			texture_unit
+			{
+				// Will be filled in at runtime
+				texture Reflection
+				tex_address_mode clamp
+				// needed by ps.1.4
+				tex_coord_set 1
+			}
+			// Refraction
+			texture_unit
+			{
+				// Will be filled in at runtime
+				texture Refraction
+				tex_address_mode clamp
+				// needed by ps.1.4
+				tex_coord_set 2
+			}
+		}
+	}    
+}
+
+// Normal-mapped Athene statue
+material Examples/Athene/NormalMapped
+{
+
+	// This is the preferred technique which uses both vertex and
+	// fragment programs, supports coloured lights
+	technique
+	{
+		// Base ambient pass
+		pass
+		{
+			// base colours, not needed for rendering, but as information
+			// to lighting pass categorisation routine
+			ambient 1 1 1
+			diffuse 0 0 0 
+			specular 0 0 0 0 
+			// Really basic vertex program
+			// NB we don't use fixed function here because GL does not like
+			// mixing fixed function and vertex programs, depth fighting can
+			// be an issue
+			vertex_program_ref Ogre/BasicVertexPrograms/AmbientOneTexture
+			{
+				param_named_auto worldViewProj worldviewproj_matrix
+				param_named_auto ambient ambient_light_colour
+			}
+			
+		}
+		// Now do the lighting pass
+		// NB we don't do decal texture here because this is repeated per light
+		pass
+		{
+			// base colours, not needed for rendering, but as information
+			// to lighting pass categorisation routine
+			ambient 0 0 0 
+			
+			// do this for each light
+			iteration once_per_light
+
+		
+			scene_blend add
+
+			// Vertex program reference
+			vertex_program_ref Examples/BumpMapVP
+			{
+				param_named_auto lightPosition light_position_object_space 0
+				param_named_auto worldViewProj worldviewproj_matrix
+			}
+
+			// Fragment program
+			fragment_program_ref Examples/BumpMapFP
+			{
+				param_named_auto lightDiffuse light_diffuse_colour 0 
+			}
+
+			// texture shadow receiver program
+			shadow_receiver_vertex_program_ref Examples/BumpMapVPShadowRcv
+			{
+				param_named_auto lightPosition light_position_object_space 0
+				param_named_auto worldViewProj worldviewproj_matrix
+				param_named_auto worldMatrix world_matrix
+				param_named_auto texViewProj texture_viewproj_matrix
+			}
+			// Additive texture shadow receiver program
+			shadow_receiver_fragment_program_ref Examples/BumpMapFPShadowRcv
+			{
+				param_named_auto lightDiffuse light_diffuse_colour 0 
+			}
+			
+			// Base bump map
+			texture_unit
+			{
+				texture atheneNormalMap.png
+				colour_op replace
+			}
+			// Normalisation cube map
+			texture_unit
+			{
+				cubic_texture nm.png combinedUVW
+				tex_coord_set 1
+				tex_address_mode clamp
+			}
+		}
+		
+		// Decal pass
+		pass
+		{
+			// base colours, not needed for rendering, but as information
+			// to lighting pass categorisation routine
+			lighting off
+			// Really basic vertex program
+			// NB we don't use fixed function here because GL does not like
+			// mixing fixed function and vertex programs, depth fighting can
+			// be an issue
+			vertex_program_ref Ogre/BasicVertexPrograms/AmbientOneTexture
+			{
+				param_named_auto worldViewProj worldviewproj_matrix
+				param_named ambient float4 1 1 1 1
+			}
+			scene_blend dest_colour zero
+			texture_unit
+			{
+				texture egyptrockyfull.jpg 
+			}
+			
+		}
+	}
+
+	// This is the fallback which cards which don't have fragment program 
+	// support will use
+	// Note that it still requires vertex program support
+	technique
+	{
+		// Base ambient pass
+		pass
+		{
+			// base colours, not needed for rendering, but as information
+			// to lighting pass categorisation routine
+			ambient 1 1 1
+			diffuse 0 0 0 
+			specular 0 0 0 0
+			// Really basic vertex program
+			// NB we don't use fixed function here because GL does not like
+			// mixing fixed function and vertex programs, depth fighting can
+			// be an issue
+			vertex_program_ref Ogre/BasicVertexPrograms/AmbientOneTexture
+			{
+				param_named_auto worldViewProj worldviewproj_matrix
+				param_named_auto ambient ambient_light_colour
+			}
+			
+		}
+		// Now do the lighting pass
+		// NB we don't do decal texture here because this is repeated per light
+		pass
+		{
+			// base colours, not needed for rendering, but as information
+			// to lighting pass categorisation routine
+			ambient 0 0 0 
+			// do this for each light
+			iteration once_per_light
+
+		
+			scene_blend add
+
+			// Vertex program reference
+			vertex_program_ref Examples/BumpMapVP
+			{
+				param_named_auto lightPosition light_position_object_space 0
+				param_named_auto worldViewProj worldviewproj_matrix
+			}
+			
+			// Base bump map
+			texture_unit
+			{
+				texture atheneNormalMap.png
+				colour_op replace
+			}
+			// Normalisation cube map, with dot product on bump map
+			texture_unit
+			{
+				cubic_texture nm.png combinedUVW
+				tex_coord_set 1
+				tex_address_mode clamp
+				colour_op_ex dotproduct src_texture src_current
+				colour_op_multipass_fallback dest_colour zero
+			}
+		}
+		
+		// Decal pass
+		pass
+		{
+			lighting off
+			// Really basic vertex program
+			// NB we don't use fixed function here because GL does not like
+			// mixing fixed function and vertex programs, depth fighting can
+			// be an issue
+			vertex_program_ref Ogre/BasicVertexPrograms/AmbientOneTexture
+			{
+				param_named_auto worldViewProj worldviewproj_matrix
+				param_named ambient float4 1 1 1 1
+			}
+			scene_blend dest_colour zero
+			texture_unit
+			{
+				texture egyptrockyfull.jpg
+			}
+			
+		}
+
+	}
+}
+
+// Basic Athene statue
+material Examples/Athene/Basic
+{
+
+	technique
+	{
+		pass
+		{
+			ambient 0.3 0.3 0.3
+			diffuse 1.0 1.0 0.9
+
+			texture_unit
+			{
+				texture egyptrockyfull.jpg 
+			}
+			
+		}
+	}
+}
+
+
+// Any number of lights, diffuse and specular
+material Examples/Athene/NormalMappedSpecular
+{
+
+	// This is the preferred technique which uses both vertex and
+	// fragment programs, supports coloured lights
+	technique
+	{
+		// Base ambient pass
+		pass
+		{
+			// base colours, not needed for rendering, but as information
+			// to lighting pass categorisation routine
+			ambient 1 1 1
+			diffuse 0 0 0 
+			specular 0 0 0 0
+			// Really basic vertex program
+			// NB we don't use fixed function here because GL does not like
+			// mixing fixed function and vertex programs, depth fighting can
+			// be an issue
+			vertex_program_ref Ogre/BasicVertexPrograms/AmbientOneTexture
+			{
+				param_named_auto worldViewProj worldviewproj_matrix
+				param_named_auto ambient ambient_light_colour
+			}
+			
+		}
+		// Now do the lighting pass
+		// NB we don't do decal texture here because this is repeated per light
+		pass
+		{
+			// base colours, not needed for rendering, but as information
+			// to lighting pass categorisation routine
+			ambient 0 0 0 
+			// do this for each light
+			iteration once_per_light
+
+		
+			scene_blend add
+
+			// Vertex program reference
+			vertex_program_ref Examples/BumpMapVPSpecular
+			{
+				param_named_auto lightPosition light_position_object_space 0
+				param_named_auto eyePosition camera_position_object_space
+				param_named_auto worldViewProj worldviewproj_matrix
+			}
+
+			// Fragment program
+			fragment_program_ref Examples/BumpMapFPSpecular
+			{
+				param_named_auto lightDiffuse light_diffuse_colour 0 
+				param_named_auto lightSpecular light_specular_colour 0
+			}
+			
+			// Base bump map
+			texture_unit
+			{
+				texture atheneNormalMap.png
+				colour_op replace
+			}
+			// Normalisation cube map
+			texture_unit
+			{
+				cubic_texture nm.png combinedUVW
+				tex_coord_set 1
+				tex_address_mode clamp
+			}
+			// Normalisation cube map #2
+			texture_unit
+			{
+				cubic_texture nm.png combinedUVW
+				tex_coord_set 2
+				tex_address_mode clamp
+			}
+		}
+		
+		// Decal pass
+		pass
+		{
+			lighting off
+			// Really basic vertex program
+			// NB we don't use fixed function here because GL does not like
+			// mixing fixed function and vertex programs, depth fighting can
+			// be an issue
+			vertex_program_ref Ogre/BasicVertexPrograms/AmbientOneTexture
+			{
+				param_named_auto worldViewProj worldviewproj_matrix
+				param_named ambient float4 1 1 1 1
+			}
+			scene_blend dest_colour zero
+			texture_unit
+			{
+				texture egyptrockyfull.jpg 
+			}
+			
+		}
+	}
+
+	// This is the fallback which cards which don't have fragment program 
+	// support will use, NB does not support specular colour
+	// Note that it still requires vertex program support
+	technique
+	{
+		// Base ambient pass
+		pass
+		{
+			// base colours, not needed for rendering, but as information
+			// to lighting pass categorisation routine
+			ambient 1 1 1
+			diffuse 0 0 0 
+			specular 0 0 0 0
+			// Really basic vertex program
+			// NB we don't use fixed function here because GL does not like
+			// mixing fixed function and vertex programs, depth fighting can
+			// be an issue
+			vertex_program_ref Ogre/BasicVertexPrograms/AmbientOneTexture
+			{
+				param_named_auto worldViewProj worldviewproj_matrix
+				param_named_auto ambient ambient_light_colour
+			}
+			
+		}
+		// Now do the lighting pass
+		// NB we don't do decal texture here because this is repeated per light
+		pass
+		{
+			// base colours, not needed for rendering, but as information
+			// to lighting pass categorisation routine
+			ambient 0 0 0 
+			// do this for each light
+			iteration once_per_light
+
+		
+			scene_blend add
+
+			// Vertex program reference
+			vertex_program_ref Examples/BumpMapVP
+			{
+				param_named_auto lightPosition light_position_object_space 0
+				param_named_auto worldViewProj worldviewproj_matrix
+			}
+			
+			// Base bump map
+			texture_unit
+			{
+				texture atheneNormalMap.png
+				colour_op replace
+			}
+			// Normalisation cube map, with dot product on bump map
+			texture_unit
+			{
+				cubic_texture nm.png combinedUVW
+				tex_coord_set 1
+				tex_address_mode clamp
+				colour_op_ex dotproduct src_texture src_current
+				colour_op_multipass_fallback dest_colour zero
+			}
+		}
+		
+		// Decal pass
+		pass
+		{
+			lighting off
+			// Really basic vertex program
+			// NB we don't use fixed function here because GL does not like
+			// mixing fixed function and vertex programs, depth fighting can
+			// be an issue
+			vertex_program_ref Ogre/BasicVertexPrograms/AmbientOneTexture
+			{
+				param_named_auto worldViewProj worldviewproj_matrix
+				param_named ambient float4 1 1 1 1
+			}
+			scene_blend dest_colour zero
+			texture_unit
+			{
+				texture egyptrockyfull.jpg 
+			}
+			
+		}
+
+	}
+}
+

Added: branches/ogsector/data/asteroids/asteroid.material
===================================================================
--- branches/ogsector/data/asteroids/asteroid.material	                        (rev 0)
+++ branches/ogsector/data/asteroids/asteroid.material	2007-07-27 15:12:58 UTC (rev 639)
@@ -0,0 +1,226 @@
+vertex_program Asteroid/BumpMapVP cg
+{
+	source Example_BumpMapping.cg
+	entry_point main_vp
+	profiles vs_1_1 arbvp1
+}
+
+// Bump map fragment program, support for this is optional
+fragment_program Asteroid/BumpMapFP cg
+{
+	source Example_BumpMapping.cg
+	entry_point main_fp
+	profiles vs_1_1 arbfp1 fp20
+} 
+
+// Bump map with specular vertex program, support for this is required
+vertex_program Asteroid/BumpMapVPSpecular cg
+{
+	source Example_BumpMapping.cg
+	entry_point specular_vp
+	profiles vs_1_1 arbvp1
+}
+
+// Bump map fragment program, support for this is optional
+fragment_program Asteroid/BumpMapFPSpecular cg
+{
+	source Example_BumpMapping.cg
+	entry_point specular_fp
+	profiles vs_1_1 arbfp1 fp20
+}
+
+material Asteroid/BumpMapping
+{ 
+
+	// This is the preferred technique which uses both vertex and
+	// fragment programs, supports coloured lights
+	technique
+	{
+		// Base ambient pass
+		pass
+		{
+			// base colours, not needed for rendering, but as information
+			// to lighting pass categorisation routine
+			ambient 1 1 1
+			diffuse 0 0 0 
+			specular 0 0 0 0 
+			// Really basic vertex program
+			// NB we don't use fixed function here because GL does not like
+			// mixing fixed function and vertex programs, depth fighting can
+			// be an issue
+			vertex_program_ref Ogre/BasicVertexPrograms/AmbientOneTexture
+			{
+				param_named_auto worldViewProj worldviewproj_matrix
+				param_named_auto ambient ambient_light_colour
+			}
+			
+		}
+		// Now do the lighting pass
+		// NB we don't do decal texture here because this is repeated per light
+		pass
+		{
+			// base colours, not needed for rendering, but as information
+			// to lighting pass categorisation routine
+			ambient 0 0 0 
+			
+			// do this for each light
+			iteration once_per_light
+
+		
+			scene_blend add
+
+			// Vertex program reference
+			vertex_program_ref Asteroid/BumpMapVP
+			{
+				param_named_auto lightPosition light_position_object_space 0
+				param_named_auto worldViewProj worldviewproj_matrix
+			}
+
+			// Fragment program
+			fragment_program_ref Asteroid/BumpMapFP
+			{
+				param_named_auto lightDiffuse light_diffuse_colour 0 
+			}
+			
+			// Base bump map
+			texture_unit
+			{
+				texture asteroidBump.png
+				colour_op replace
+			}
+			// Normalisation cube map
+			texture_unit
+			{
+				cubic_texture nm.png combinedUVW
+				tex_coord_set 1
+				tex_address_mode clamp
+			}
+		}
+		
+		// Decal pass
+		pass
+		{
+			// base colours, not needed for rendering, but as information
+			// to lighting pass categorisation routine
+			lighting off
+			// Really basic vertex program
+			// NB we don't use fixed function here because GL does not like
+			// mixing fixed function and vertex programs, depth fighting can
+			// be an issue
+			vertex_program_ref Ogre/BasicVertexPrograms/AmbientOneTexture
+			{
+				param_named_auto worldViewProj worldviewproj_matrix
+				param_named ambient float4 1 1 1 1
+			}
+			scene_blend dest_colour zero
+			texture_unit
+			{
+				texture asteroid.png 
+			}
+			
+		}
+	}
+
+	// This is the fallback which cards which don't have fragment program 
+	// support will use
+	// Note that it still requires vertex program support
+	technique
+	{
+		// Base ambient pass
+		pass
+		{
+			// base colours, not needed for rendering, but as information
+			// to lighting pass categorisation routine
+			ambient 1 1 1
+			diffuse 0 0 0 
+			specular 0 0 0 0
+			// Really basic vertex program
+			// NB we don't use fixed function here because GL does not like
+			// mixing fixed function and vertex programs, depth fighting can
+			// be an issue
+			vertex_program_ref Ogre/BasicVertexPrograms/AmbientOneTexture
+			{
+				param_named_auto worldViewProj worldviewproj_matrix
+				param_named_auto ambient ambient_light_colour
+			}
+			
+		}
+		// Now do the lighting pass
+		// NB we don't do decal texture here because this is repeated per light
+		pass
+		{
+			// base colours, not needed for rendering, but as information
+			// to lighting pass categorisation routine
+			ambient 0 0 0 
+			// do this for each light
+			iteration once_per_light
+
+		
+			scene_blend add
+
+			// Vertex program reference
+			vertex_program_ref Asteroid/BumpMapVP
+			{
+				param_named_auto lightPosition light_position_object_space 0
+				param_named_auto worldViewProj worldviewproj_matrix
+			}
+			
+			// Base bump map
+			texture_unit
+			{
+				texture asteroidBump.png
+				colour_op replace
+			}
+			// Normalisation cube map, with dot product on bump map
+			texture_unit
+			{
+				cubic_texture nm.png combinedUVW
+				tex_coord_set 1
+				tex_address_mode clamp
+				colour_op_ex dotproduct src_texture src_current
+				colour_op_multipass_fallback dest_colour zero
+			}
+		}
+		
+		// Decal pass
+		pass
+		{
+			lighting off
+			// Really basic vertex program
+			// NB we don't use fixed function here because GL does not like
+			// mixing fixed function and vertex programs, depth fighting can
+			// be an issue
+			vertex_program_ref Ogre/BasicVertexPrograms/AmbientOneTexture
+			{
+				param_named_auto worldViewProj worldviewproj_matrix
+				param_named ambient float4 1 1 1 1
+			}
+			scene_blend dest_colour zero
+			texture_unit
+			{
+				texture asteroid.png 
+			}
+			 
+		}
+ 
+	}
+}
+
+material Asteroid
+{
+	receive_shadows on
+	technique
+	{
+		pass
+		{
+//			ambient 0.500000 0.500000 0.500000 1.000000
+//			diffuse 0.900000 0.900000 0.900000 1.000000
+			emissive 0.800000 0.800000 0.800000 1.000000
+			texture_unit
+			{
+				texture asteroid.png
+			}
+		}
+	}
+}
+

Added: branches/ogsector/data/asteroids/asteroid.png
===================================================================
(Binary files differ)


Property changes on: branches/ogsector/data/asteroids/asteroid.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/ogsector/data/asteroids/asteroid01.blend
===================================================================
(Binary files differ)


Property changes on: branches/ogsector/data/asteroids/asteroid01.blend
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/ogsector/data/asteroids/asteroid01.mesh
===================================================================
(Binary files differ)


Property changes on: branches/ogsector/data/asteroids/asteroid01.mesh
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/ogsector/data/asteroids/asteroidBump.png
===================================================================
(Binary files differ)


Property changes on: branches/ogsector/data/asteroids/asteroidBump.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: branches/ogsector/data/gui/layouts/dialogs/MarketDialog.layout
===================================================================
--- branches/ogsector/data/gui/layouts/dialogs/MarketDialog.layout	2007-07-17 18:14:16 UTC (rev 638)
+++ branches/ogsector/data/gui/layouts/dialogs/MarketDialog.layout	2007-07-27 15:12:58 UTC (rev 639)
@@ -1,15 +1,17 @@
 <?xml version="1.0" ?>
 <GUILayout>
-    <Window Type="opengate/StaticGreenImage" Name="MarketDialog">
-<!--     <Window Type="opengate/StaticGreenImage" Name="MarketDialog"> -->
+<!-- used ingame  -->
+    <Window Type="opengate/StaticGreenImage"    Name="MarketDialog">
       <Property Name="MousePassThroughEnabled" Value="True" />
-      <Property Name="UnifiedPosition" Value="{{0.0,100},{0.0,115}}" />
-      <Property Name="UnifiedSize" Value="{{1.0,-167},{1.0,-217}}" />
-      <Property Name="Text" Value="Market" />
+      <Property Name="UnifiedPosition"         Value="{{0.0,  100},{0.0,  115}}" />
+      <Property Name="UnifiedSize"             Value="{{1.0, -167},{1.0, -217}}" />
+      <Property Name="Text"                    Value="Market" />
 
 <!-- ********************* -->
 <!--  Item Detailed View   -->
 <!-- ********************* -->
+
+<!-- used ingame  -->
       <Window Type="opengate/StaticGreenImage" Name="MarketItemDetailedView">
         <Property Name="UnifiedPosition"       Value="{{0,220},{0.0,10}}" />
         <Property Name="UnifiedSize"           Value="{{1.0,-230},{1.0,-170}}" />
@@ -131,7 +133,7 @@
             </Window>
           </Window>
           <Window Type="opengate/StaticLabel" Name="MarketItemDetailedView/TextFrame/Amount">
-            <Property Name="UnifiedPosition"  Value="{{0.0, 0},{1.0,  -60}}" />
+            <Property Name="UnifiedPosition"  Value="{{0.0, 0},{1.0, -60}}" />
             <Property Name="UnifiedSize"      Value="{{1.0, 0},{0.0,  20}}" />
             <Property Name="Text"             Value="Amount available:" />
             <Window Type="opengate/StaticLabel" Name="MarketItemDetailedView/TextFrame/Amount/Text">
@@ -174,7 +176,7 @@
             <Property Name="RiseOnClick"             Value="False" />
             <Property Name="MousePassThroughEnabled" Value="True" />
           </Window> 
-          <Window Type="opengate/EmptyButton" Name="MarketItemDetailedView/NotNowButton">
+          <Window Type="opengate/ImageButton" Name="MarketItemDetailedView/NotNowButton">
             <Property Name="UnifiedPosition"  Value="{{1.0, -80},{1.0, -26}}" />
             <Property Name="UnifiedSize"      Value="{{0.0,  80},{0.0,  20}}" />
             <Property Name="Text"             Value="Not now" />
@@ -186,12 +188,12 @@
             <Property Name="RiseOnClick"             Value="False" />
             <Property Name="MousePassThroughEnabled" Value="True" />
           </Window> 
-          <Window Type="opengate/EmptyButton" Name="MarketItemDetailedView/AcceptButton">
+          <Window Type="opengate/ImageButton" Name="MarketItemDetailedView/AcceptButton">
             <Property Name="UnifiedPosition"  Value="{{1.0, -170},{1.0, -26}}" />
             <Property Name="UnifiedSize"      Value="{{0.0,   80},{0.0,  20}}" />
             <Property Name="Text"             Value="Accept now" />
           </Window> 
-          <Window Type="opengate/EmptyButton" Name="MarketItemDetailedView/Decrease100">
+          <Window Type="opengate/ImageButton" Name="MarketItemDetailedView/Decrease100">
             <Property Name="UnifiedPosition"  Value="{{0.0,   0},{1.0, -24}}" />
             <Property Name="UnifiedSize"      Value="{{0.0,  22},{0.0,  17}}" />
             <Property Name="Visible"          Value="False" />
@@ -199,7 +201,7 @@
             <Property Name="HoverImage"       Value="set:opengate image:MarketDecrease100Hover" />
             <Property Name="PushedImage"      Value="set:opengate image:MarketDecrease100Pushed" />
           </Window>
-          <Window Type="opengate/EmptyButton" Name="MarketItemDetailedView/Decrease10">
+          <Window Type="opengate/ImageButton" Name="MarketItemDetailedView/Decrease10">
             <Property Name="UnifiedPosition"  Value="{{0.0,  25},{1.0, -24}}" />
             <Property Name="UnifiedSize"      Value="{{0.0,  22},{0.0,  17}}" />
             <Property Name="Visible"          Value="False" />
@@ -207,7 +209,7 @@
             <Property Name="HoverImage"       Value="set:opengate image:MarketDecrease10Hover" />
             <Property Name="PushedImage"      Value="set:opengate image:MarketDecrease10Pushed" />
           </Window>
-          <Window Type="opengate/EmptyButton" Name="MarketItemDetailedView/Decrease1">
+          <Window Type="opengate/ImageButton" Name="MarketItemDetailedView/Decrease1">
             <Property Name="UnifiedPosition"  Value="{{0.0,  50},{1.0, -24}}" />
             <Property Name="UnifiedSize"      Value="{{0.0,  22},{0.0,  17}}" />
             <Property Name="NormalImage"      Value="set:opengate image:MarketDecrease1Normal" />
@@ -226,14 +228,14 @@
             <Property Name="UnifiedPosition"   Value="{{0.0, 76},{1.0, -24}}" />
             <Property Name="UnifiedSize"       Value="{{0.0, 41},{0.0,  17}}" />
           </Window>
-          <Window Type="opengate/EmptyButton" Name="MarketItemDetailedView/Increase1">
+          <Window Type="opengate/ImageButton" Name="MarketItemDetailedView/Increase1">
             <Property Name="UnifiedPosition"  Value="{{0.0, 120},{1.0, -24}}" />
             <Property Name="UnifiedSize"      Value="{{0.0,  22},{0.0,  17}}" />
             <Property Name="NormalImage"      Value="set:opengate image:MarketIncrease1Normal" />
             <Property Name="HoverImage"       Value="set:opengate image:MarketIncrease1Hover" />
             <Property Name="PushedImage"      Value="set:opengate image:MarketIncrease1Pushed" />
           </Window>
-          <Window Type="opengate/EmptyButton" Name="MarketItemDetailedView/Increase10">
+          <Window Type="opengate/ImageButton" Name="MarketItemDetailedView/Increase10">
             <Property Name="UnifiedPosition"  Value="{{0.0, 145},{1.0, -24}}" />
             <Property Name="UnifiedSize"      Value="{{0.0,  22},{0.0,  17}}" />
             <Property Name="Visible"          Value="False" />
@@ -241,7 +243,7 @@
             <Property Name="HoverImage"       Value="set:opengate image:MarketIncrease10Hover" />
             <Property Name="PushedImage"      Value="set:opengate image:MarketIncrease10Pushed" />
           </Window>
-          <Window Type="opengate/EmptyButton" Name="MarketItemDetailedView/Increase100">
+          <Window Type="opengate/ImageButton" Name="MarketItemDetailedView/Increase100">
             <Property Name="UnifiedPosition"  Value="{{0.0, 170},{1.0, -24}}" />
             <Property Name="UnifiedSize"      Value="{{0.0,  22},{0.0,  17}}" />
             <Property Name="Visible"          Value="False" />
@@ -249,7 +251,7 @@
             <Property Name="HoverImage"       Value="set:opengate image:MarketIncrease100Hover" />
             <Property Name="PushedImage"      Value="set:opengate image:MarketIncrease100Pushed" />
           </Window>
-          <Window Type="opengate/EmptyButton" Name="MarketItemDetailedView/SellAll">
+          <Window Type="opengate/ImageButton" Name="MarketItemDetailedView/SellAll">
             <Property Name="UnifiedPosition"  Value="{{0.0, 195},{1.0, -24}}" />
             <Property Name="UnifiedSize"      Value="{{0.0,  22},{0.0,  17}}" />
             <Property Name="NormalImage"      Value="set:opengate image:MarketSellAllNormal" />
@@ -471,6 +473,7 @@
           <Property Name="Text"            Value="" />
         </Window>
       </Window>
+
 <!-- ********************* -->
 <!--  Catagorie Selection   -->
 <!-- ********************* -->
@@ -615,287 +618,314 @@
           </Window>
         </Window>
       </Window>
+
 <!-- ********************* -->
 <!--  Market Item Selection   -->
 <!-- ********************* -->
-      <Window Type="opengate/StaticGreenImage"   Name="MarketWindow">
-        <Property Name="UnifiedPosition"         Value="{{0,225},{0.0,10}}" />
-        <Property Name="UnifiedSize"             Value="{{1.0,-496},{1.0,-170}}" />
-        <Property Name="BackgroundEnabled"       Value="False" />
-        <Property Name="FrameEnabled"            Value="False" />
-        <Window Type="opengate/StaticGreenImage"   Name="MarketItemWindow">
-          <Property Name="UnifiedPosition"         Value="{{0.0, 0},{0.0, 31}}" />
+
+<!-- used ingame  -->
+      <Window Type="opengate/StaticWindow"          Name="MarketWindow">
+        <Property Name="UnifiedPosition"           Value="{{0.0,  225},{0.0,   10}}" />
+        <Property Name="UnifiedSize"               Value="{{1.0, -496},{1.0, -170}}" />
+        <Property Name="BackgroundEnabled"         Value="False" />
+        <Property Name="FrameEnabled"              Value="False" />
+<!-- used ingame  -->			           
+        <Window Type="opengate/StaticWindow"        Name="MarketWindow/ItemFrame">
+          <Property Name="UnifiedPosition"         Value="{{0.0,   0},{0.0,  31}}" />
           <Property Name="UnifiedSize"             Value="{{1.0, -31},{1.0, -31}}" />
           <Property Name="BackgroundEnabled"       Value="False" />
           <Property Name="FrameEnabled"            Value="False" />
-        </Window>
-        <Window Type="opengate/StaticGreenImage" Name="MarketItemWindowTopLeft">
-          <Property Name="UnifiedPosition"       Value="{{0.0,0},{0.0,0}}" />
-          <Property Name="UnifiedSize"           Value="{{0.0,31},{0.0,31}}" />
-          <Property Name="BackgroundEnabled"     Value="False" />
-          <Property Name="FrameEnabled"          Value="False" />
-          <Property Name="Image"                 Value="set:opengate image:StaticGreenTopLeft"/>
-        </Window>
-        <Window Type="opengate/StaticGreenImage" Name="MarketItemWindowTop">
-          <Property Name="UnifiedPosition"       Value="{{0.0,31},{0.0,0}}" />
-          <Property Name="UnifiedSize"           Value="{{1.0,-62},{0.0,31}}" />
-          <Property Name="BackgroundEnabled"     Value="False" />
-          <Property Name="FrameEnabled"          Value="False" />
+        </Window>			           
+        <Window Type="opengate/StaticImage"         Name="MarketWindow/TopFrame/LeftImage">
+          <Property Name="UnifiedPosition"         Value="{{0.0,  0},{0.0,  0}}" />
+          <Property Name="UnifiedSize"             Value="{{0.0, 31},{0.0, 31}}" />
+          <Property Name="BackgroundEnabled"       Value="False" />
+          <Property Name="FrameEnabled"            Value="False" />
+          <Property Name="Image"                   Value="set:opengate image:StaticGreenTopLeft"/>
+        </Window>			           
+        <Window Type="opengate/StaticImage"         Name="MarketWindow/TopFrame/TopImage">
+          <Property Name="UnifiedPosition"         Value="{{0.0,  31},{0.0,  0}}" />
+          <Property Name="UnifiedSize"             Value="{{1.0, -62},{0.0, 31}}" />
+          <Property Name="BackgroundEnabled"       Value="False" />
+          <Property Name="FrameEnabled"            Value="False" />
           <Property Name="Image"                   Value="set:opengate image:StaticGreenTop"/>
-          <Window Type="opengate/StaticLabel"      Name="MarketItem/Title">
+<!-- used ingame  -->			           
+          <Window Type="opengate/StaticLabel"       Name="MarketWindow/Title">
             <Property Name="UnifiedPosition"       Value="{{0.0,   0},{0.0, 7}}" />
             <Property Name="UnifiedSize"           Value="{{0.0, 100},{1.0, 0}}" />
             <Property Name="Text"                  Value="Public market" />
-            <Property Name="Font"             Value="BlueHighway-14" />
-          </Window>
-          <Window Type="opengate/StaticImage" Name="MarketItemSortCategoryHighlight">
-            <Property Name="UnifiedPosition" Value="{{0.0,100},{0.0,8}}" />
-            <Property Name="UnifiedSize" Value="{{0.0,16},{0.0,16}}" />
-            <Property Name="BackgroundEnabled" Value="False" />
-            <Property Name="FrameEnabled" Value="False" />
-            <Property Name="AlwaysOnTop" Value="True" />
+            <Property Name="Font"                  Value="BlueHighway-14" />
+          </Window>			           
+<!-- used ingame  -->			           
+          <Window Type="opengate/StaticImage"         Name="MarketWindow/Sort/CategoryHighlightImage">
+            <Property Name="UnifiedPosition"         Value="{{0.0, 100},{0.0,  8}}" />
+            <Property Name="UnifiedSize"             Value="{{0.0,  16},{0.0, 16}}" />
+            <Property Name="BackgroundEnabled"       Value="False" />
+            <Property Name="FrameEnabled"            Value="False" />
+            <Property Name="AlwaysOnTop"             Value="True" />
             <Property Name="MousePassThroughEnabled" Value="True" />
-            <Property Name="Image" Value="set:opengate image:MarketItemSortHighlight" />
+            <Property Name="Image"                   Value="set:opengate image:MarketItemSortHighlight" />
           </Window>
-          <Window Type="opengate/EmptyButton" Name="MarketItemSortAlphaAscend">
-            <Property Name="UnifiedPosition" Value="{{0.0,100},{0.0,8}}" />
-            <Property Name="UnifiedSize" Value="{{0.0,16},{0.0,16}}" />
-            <Property Name="NormalImage" Value="set:opengate image:MarketItemSortAlphaAscendNormal" />
-            <Property Name="HoverImage" Value="set:opengate image:MarketItemSortAlphaAscendHover" />
-            <Property Name="PushedImage" Value="set:opengate image:MarketItemSortAlphaAscendHover" />
+<!-- used ingame  -->
+          <Window Type="opengate/ImageButton"         Name="MarketWindow/Sort/AlphaAscendButton">
+            <Property Name="UnifiedPosition"         Value="{{0.0, 100},{0.0,  8}}" />
+            <Property Name="UnifiedSize"             Value="{{0.0,  16},{0.0, 16}}" />
+            <Property Name="NormalImage"             Value="set:opengate image:MarketItemSortAlphaAscendNormal" />
+            <Property Name="HoverImage"              Value="set:opengate image:MarketItemSortAlphaAscendHover" />
+            <Property Name="PushedImage"             Value="set:opengate image:MarketItemSortAlphaAscendHover" />
           </Window>
-          <Window Type="opengate/EmptyButton" Name="MarketItemSortAlphaDescend">
-            <Property Name="UnifiedPosition" Value="{{0.0,100},{0.0,8}}" />
-            <Property Name="UnifiedSize" Value="{{0.0,16},{0.0,16}}" />
-            <Property Name="NormalImage" Value="set:opengate image:MarketItemSortAlphaDescendNormal" />
-            <Property Name="HoverImage" Value="set:opengate image:MarketItemSortAlphaDescendHover" />
-            <Property Name="PushedImage" Value="set:opengate image:MarketItemSortAlphaDescendHover" />
-            <Property Name="Visible" Value="False" />
+<!-- used ingame  -->
+          <Window Type="opengate/ImageButton"         Name="MarketWindow/Sort/AlphaDescendButton">
+            <Property Name="UnifiedPosition"         Value="{{0.0, 100},{0.0,  8}}" />
+            <Property Name="UnifiedSize"             Value="{{0.0,  16},{0.0, 16}}" />
+            <Property Name="NormalImage"             Value="set:opengate image:MarketItemSortAlphaDescendNormal" />
+            <Property Name="HoverImage"              Value="set:opengate image:MarketItemSortAlphaDescendHover" />
+            <Property Name="PushedImage"             Value="set:opengate image:MarketItemSortAlphaDescendHover" />
+            <Property Name="Visible"                 Value="False" />
           </Window>
-          <Window Type="opengate/EmptyButton" Name="MarketItemSortCost">
-            <Property Name="UnifiedPosition" Value="{{0.0,118},{0.0,8}}" />
-            <Property Name="UnifiedSize" Value="{{0.0,16},{0.0,16}}" />
-            <Property Name="NormalImage" Value="set:opengate image:MarketItemSortCostNormal" />
-            <Property Name="HoverImage" Value="set:opengate image:MarketItemSortCostHover" />
-            <Property Name="PushedImage" Value="set:opengate image:MarketItemSortCostHover" />
-            <Property Name="Disabled" Value="True" />
+<!-- used ingame  -->
+          <Window Type="opengate/ImageButton"         Name="MarketWindow/Sort/CostButton">
+            <Property Name="UnifiedPosition"         Value="{{0.0, 118},{0.0,  8}}" />
+            <Property Name="UnifiedSize"             Value="{{0.0,  16},{0.0, 16}}" />
+            <Property Name="NormalImage"             Value="set:opengate image:MarketItemSortCostNormal" />
+            <Property Name="HoverImage"              Value="set:opengate image:MarketItemSortCostHover" />
+            <Property Name="PushedImage"             Value="set:opengate image:MarketItemSortCostHover" />
+            <Property Name="Disabled"                Value="True" />
           </Window>
-          <Window Type="opengate/EmptyButton" Name="MarketItemSortSizeAscend">
-            <Property Name="UnifiedPosition" Value="{{0.0,136},{0.0,8}}" />
-            <Property Name="UnifiedSize" Value="{{0.0,16},{0.0,16}}" />
-            <Property Name="NormalImage" Value="set:opengate image:MarketItemSortSizeAscendNormal" />
-            <Property Name="HoverImage" Value="set:opengate image:MarketItemSortSizeAscendHover" />
-            <Property Name="PushedImage" Value="set:opengate image:MarketItemSortSizeAscendHover" />
+<!-- used ingame  -->
+          <Window Type="opengate/ImageButton"         Name="MarketWindow/Sort/SizeAscendButton">
+            <Property Name="UnifiedPosition"         Value="{{0.0, 136},{0.0,  8}}" />
+            <Property Name="UnifiedSize"             Value="{{0.0,  16},{0.0, 16}}" />
+            <Property Name="NormalImage"             Value="set:opengate image:MarketItemSortSizeAscendNormal" />
+            <Property Name="HoverImage"              Value="set:opengate image:MarketItemSortSizeAscendHover" />
+            <Property Name="PushedImage"             Value="set:opengate image:MarketItemSortSizeAscendHover" />
           </Window>
-          <Window Type="opengate/EmptyButton" Name="MarketItemSortSizeDescend">
-            <Property Name="UnifiedPosition" Value="{{0.0,136},{0.0,8}}" />
-            <Property Name="UnifiedSize" Value="{{0.0,16},{0.0,16}}" />
-            <Property Name="NormalImage" Value="set:opengate image:MarketItemSortSizeDescendNormal" />
-            <Property Name="HoverImage" Value="set:opengate image:MarketItemSortSizeDescendHover" />
-            <Property Name="PushedImage" Value="set:opengate image:MarketItemSortSizeDescendHover" />
-            <Property Name="Visible" Value="False" />
+<!-- used ingame  -->
+          <Window Type="opengate/ImageButton"         Name="MarketWindow/Sort/SizeDescendButton">
+            <Property Name="UnifiedPosition"         Value="{{0.0, 136},{0.0,  8}}" />
+            <Property Name="UnifiedSize"             Value="{{0.0,  16},{0.0, 16}}" />
+            <Property Name="NormalImage"             Value="set:opengate image:MarketItemSortSizeDescendNormal" />
+            <Property Name="HoverImage"              Value="set:opengate image:MarketItemSortSizeDescendHover" />
+            <Property Name="PushedImage"             Value="set:opengate image:MarketItemSortSizeDescendHover" />
+            <Property Name="Visible"                 Value="False" />
           </Window>
-          <Window Type="opengate/EmptyButton" Name="MarketItemSortRank">
-            <Property Name="UnifiedPosition" Value="{{0.0,154},{0.0,8}}" />
-            <Property Name="UnifiedSize" Value="{{0.0,16},{0.0,16}}" />
-            <Property Name="NormalImage" Value="set:opengate image:MarketItemSortRankNormal" />
-            <Property Name="HoverImage" Value="set:opengate image:MarketItemSortRankHover" />
-            <Property Name="PushedImage" Value="set:opengate image:MarketItemSortRankHover" />
+<!-- used ingame  -->
+          <Window Type="opengate/ImageButton"         Name="MarketWindow/Sort/RankButton">
+            <Property Name="UnifiedPosition"         Value="{{0.0, 154},{0.0,  8}}" />
+            <Property Name="UnifiedSize"             Value="{{0.0,  16},{0.0, 16}}" />
+            <Property Name="NormalImage"             Value="set:opengate image:MarketItemSortRankNormal" />
+            <Property Name="HoverImage"              Value="set:opengate image:MarketItemSortRankHover" />
+            <Property Name="PushedImage"             Value="set:opengate image:MarketItemSortRankHover" />
           </Window>
-          <Window Type="opengate/EmptyButton" Name="MarketItemSortAmountAscend">
-            <Property Name="UnifiedPosition" Value="{{0.0,172},{0.0,8}}" />
-            <Property Name="UnifiedSize" Value="{{0.0,16},{0.0,16}}" />
-            <Property Name="NormalImage" Value="set:opengate image:MarketItemSortAmountAscendNormal" />
-            <Property Name="HoverImage" Value="set:opengate image:MarketItemSortAmountAscendHover" />
-            <Property Name="PushedImage" Value="set:opengate image:MarketItemSortAmountAscendHover" />
-            <Property Name="Disabled" Value="True" />
+<!-- used ingame  -->
+          <Window Type="opengate/ImageButton"         Name="MarketWindow/Sort/AmountAscendButton">
+            <Property Name="UnifiedPosition"         Value="{{0.0, 172},{0.0,  8}}" />
+            <Property Name="UnifiedSize"             Value="{{0.0,  16},{0.0, 16}}" />
+            <Property Name="NormalImage"             Value="set:opengate image:MarketItemSortAmountAscendNormal" />
+            <Property Name="HoverImage"              Value="set:opengate image:MarketItemSortAmountAscendHover" />
+            <Property Name="PushedImage"             Value="set:opengate image:MarketItemSortAmountAscendHover" />
+            <Property Name="Disabled"                Value="True" />
           </Window>
-          <Window Type="opengate/EmptyButton" Name="MarketItemSortAmountDescend">
-            <Property Name="UnifiedPosition" Value="{{0.0,172},{0.0,8}}" />
-            <Property Name="UnifiedSize" Value="{{0.0,16},{0.0,16}}" />
-            <Property Name="NormalImage" Value="set:opengate image:MarketItemSortAmountDescendNormal" />
-            <Property Name="HoverImage" Value="set:opengate image:MarketItemSortAmountDescendHover" />
-            <Property Name="PushedImage" Value="set:opengate image:MarketItemSortAmountDescendHover" />
-            <Property Name="Visible" Value="False" />
-            <Property Name="Disabled" Value="True" />
+<!-- used ingame  -->
+          <Window Type="opengate/ImageButton"         Name="MarketWindow/Sort/AmountDescendButton">
+            <Property Name="UnifiedPosition"         Value="{{0.0, 172},{0.0,  8}}" />
+            <Property Name="UnifiedSize"             Value="{{0.0,  16},{0.0, 16}}" />
+            <Property Name="NormalImage"             Value="set:opengate image:MarketItemSortAmountDescendNormal" />
+            <Property Name="HoverImage"              Value="set:opengate image:MarketItemSortAmountDescendHover" />
+            <Property Name="PushedImage"             Value="set:opengate image:MarketItemSortAmountDescendHover" />
+            <Property Name="Visible"                 Value="False" />
+            <Property Name="Disabled"                Value="True" />
           </Window>
-          <Window Type="opengate/StaticImage" Name="MarketItemSortHighlight">
-            <Property Name="UnifiedPosition" Value="{{0.0,195},{0.0,8}}" />
-            <Property Name="UnifiedSize" Value="{{0.0,16},{0.0,16}}" />
-            <Property Name="BackgroundEnabled" Value="False" />
-            <Property Name="FrameEnabled" Value="False" />
-            <Property Name="AlwaysOnTop" Value="True" />
-            <Property Name="Image" Value="set:opengate image:MarketItemSortHighlight" />
-            <Property Name="Disabled" Value="True" />
+<!-- used ingame  -->
+          <Window Type="opengate/StaticImage"         Name="MarketWindow/Sort/OrderHighlightImage">
+            <Property Name="UnifiedPosition"         Value="{{0.0, 195},{0.0,  8}}" />
+            <Property Name="UnifiedSize"             Value="{{0.0,  16},{0.0, 16}}" />
+            <Property Name="BackgroundEnabled"       Value="False" />
+            <Property Name="FrameEnabled"            Value="False" />
+            <Property Name="AlwaysOnTop"             Value="True" />
+            <Property Name="Image"                   Value="set:opengate image:MarketItemSortHighlight" />
+            <Property Name="Disabled"                Value="True" />
           </Window>
-          <Window Type="opengate/EmptyButton" Name="MarketItemSortAscend">
-            <Property Name="UnifiedPosition" Value="{{0.0,195},{0.0,8}}" />
-            <Property Name="UnifiedSize" Value="{{0.0,16},{0.0,16}}" />
-            <Property Name="NormalImage" Value="set:opengate image:MarketItemSortAscendNormal" />
-            <Property Name="HoverImage" Value="set:opengate image:MarketItemSortAscendHover" />
-            <Property Name="PushedImage" Value="set:opengate image:MarketItemSortAscendHover" />
+<!-- used ingame  -->
+          <Window Type="opengate/ImageButton"         Name="MarketWindow/Sort/AscendOrderButton">
+            <Property Name="UnifiedPosition"         Value="{{0.0, 195},{0.0,  8}}" />
+            <Property Name="UnifiedSize"             Value="{{0.0,  16},{0.0, 16}}" />
+            <Property Name="NormalImage"             Value="set:opengate image:MarketItemSortAscendNormal" />
+            <Property Name="HoverImage"              Value="set:opengate image:MarketItemSortAscendHover" />
+            <Property Name="PushedImage"             Value="set:opengate image:MarketItemSortAscendHover" />
           </Window>
-          <Window Type="opengate/EmptyButton" Name="MarketItemSortDescend">
-            <Property Name="UnifiedPosition" Value="{{0.0,213},{0.0,8}}" />
-            <Property Name="UnifiedSize" Value="{{0.0,16},{0.0,16}}" />
-            <Property Name="NormalImage" Value="set:opengate image:MarketItemSortDescendNormal" />
-            <Property Name="HoverImage" Value="set:opengate image:MarketItemSortDescendHover" />
-            <Property Name="PushedImage" Value="set:opengate image:MarketItemSortDescendHover" />
+<!-- used ingame  -->
+          <Window Type="opengate/ImageButton"         Name="MarketWindow/Sort/DescendOrderButton">
+            <Property Name="UnifiedPosition"         Value="{{0.0, 213},{0.0,  8}}" />
+            <Property Name="UnifiedSize"             Value="{{0.0,  16},{0.0, 16}}" />
+            <Property Name="NormalImage"             Value="set:opengate image:MarketItemSortDescendNormal" />
+            <Property Name="HoverImage"              Value="set:opengate image:MarketItemSortDescendHover" />
+            <Property Name="PushedImage"             Value="set:opengate image:MarketItemSortDescendHover" />
           </Window>
-          <Window Type="opengate/EmptyButton" Name="MarketItemSortShowAll">
-            <Property Name="UnifiedPosition" Value="{{1.0,-61},{0.0,8}}" />
-            <Property Name="UnifiedSize" Value="{{0.0,61},{0.0,16}}" />
-            <Property Name="NormalImage" Value="set:opengate image:MarketItemSortShowAllNormal" />
-            <Property Name="HoverImage" Value="set:opengate image:MarketItemSortDescendHover" />
-            <Property Name="PushedImage" Value="set:opengate image:MarketItemSortShowAllHover" />
-            <Property Name="Disabled" Value="True" />
+<!-- used ingame  -->
+          <Window Type="opengate/StaticImage"         Name="MarketWindow/Sort/ShowAllHighlightImage">
+            <Property Name="UnifiedPosition"         Value="{{1.0, -61},{0.0,  8}}" />
+            <Property Name="UnifiedSize"             Value="{{0.0,  61},{0.0, 16}}" />
+            <Property Name="BackgroundEnabled"       Value="False" />
+            <Property Name="FrameEnabled"            Value="False" />
+            <Property Name="Image"                   Value="set:opengate image:MarketItemSortShowAllHighlight" />
           </Window>
-          <Window Type="opengate/StaticImage" Name="MarketItemSortShowAllHighlight">
-            <Property Name="UnifiedPosition" Value="{{1.0,-61},{0.0,8}}" />
-            <Property Name="UnifiedSize" Value="{{0.0,61},{0.0,16}}" />
-            <Property Name="BackgroundEnabled" Value="False" />
-            <Property Name="FrameEnabled" Value="False" />
-            <Property Name="Image" Value="set:opengate image:MarketItemSortShowAllHighlight" />
+<!-- used ingame  -->
+          <Window Type="opengate/ImageButton"         Name="MarketWindow/Sort/ShowAllButton">
+            <Property Name="UnifiedPosition"         Value="{{1.0, -61},{0.0,  8}}" />
+            <Property Name="UnifiedSize"             Value="{{0.0,  61},{0.0, 16}}" />
+            <Property Name="NormalImage"             Value="set:opengate image:MarketItemSortShowAllNormal" />
+            <Property Name="HoverImage"              Value="set:opengate image:MarketItemSortDescendHover" />
+            <Property Name="PushedImage"             Value="set:opengate image:MarketItemSortShowAllHover" />
+            <Property Name="Disabled"                Value="True" />
           </Window>
         </Window>
-        <Window Type="opengate/StaticGreenImage" Name="MarketItemWindowBottom">
-          <Property Name="UnifiedPosition" Value="{{0.0,0},{0.0,31}}" />
-          <Property Name="UnifiedSize" Value="{{1.0,-31},{0.0,1}}" />
-          <Property Name="BackgroundEnabled" Value="False" />
-          <Property Name="FrameEnabled" Value="False" />
-          <Property Name="Image" Value="set:opengate image:StaticGreenHorizLine"/>
+
+        <Window Type="opengate/StaticImage"         Name="MarketWindow/TopFrame/BottomImage">
+          <Property Name="UnifiedPosition"         Value="{{0.0,   0},{0.0, 31}}" />
+          <Property Name="UnifiedSize"             Value="{{1.0, -31},{0.0,  1}}" />
+          <Property Name="BackgroundEnabled"       Value="False" />
+          <Property Name="FrameEnabled"            Value="False" />
+          <Property Name="Image"                   Value="set:opengate image:StaticGreenHorizLine"/>
         </Window>
-        <Window Type="opengate/StaticGreenImage" Name="MarketItemWindowTopRight">
-          <Property Name="UnifiedPosition" Value="{{1.0,-31},{0.0,0}}" />
-          <Property Name="UnifiedSize" Value="{{0.0,31},{0.0,31}}" />
-          <Property Name="BackgroundEnabled" Value="False" />
-          <Property Name="FrameEnabled" Value="False" />
-          <Property Name="Image" Value="set:opengate image:StaticGreenTopRight"/>
+        <Window Type="opengate/StaticImage"         Name="MarketWindow/TopFrame/RightImage">
+          <Property Name="UnifiedPosition"         Value="{{1.0, -31},{0.0,  0}}" />
+          <Property Name="UnifiedSize"             Value="{{0.0,  31},{0.0, 31}}" />
+          <Property Name="BackgroundEnabled"       Value="False" />
+          <Property Name="FrameEnabled"            Value="False" />
+          <Property Name="Image"                   Value="set:opengate image:StaticGreenTopRight"/>
         </Window>
-        <Window Type="opengate/StaticGreenImage" Name="MarketItemWindowRight">
-          <Property Name="UnifiedPosition" Value="{{1.0,-31},{0.0,31}}" />
-          <Property Name="UnifiedSize" Value="{{0.0,31},{1.0,-62}}" />
-          <Property Name="RiseOnClick" Value="False" />
-          <Property Name="BackgroundEnabled" Value="False" />
-          <Property Name="FrameEnabled" Value="False" />
-          <Property Name="Image" Value="set:opengate image:StaticGreenRight"/>
+        <Window Type="opengate/StaticImage"         Name="MarketWindow/RightFrame/RightImage">
+          <Property Name="UnifiedPosition"         Value="{{1.0, -31},{0.0,  31}}" />
+          <Property Name="UnifiedSize"             Value="{{0.0,  31},{1.0, -62}}" />
+          <Property Name="RiseOnClick"             Value="False" />
+          <Property Name="BackgroundEnabled"       Value="False" />
+          <Property Name="FrameEnabled"            Value="False" />
+          <Property Name="Image"                   Value="set:opengate image:StaticGreenRight"/>
         </Window>
-        <Window Type="opengate/StaticGreenImage" Name="MarketItemWindowBottomRight">
-          <Property Name="UnifiedPosition" Value="{{1.0,-31},{1.0,-31}}" />
-          <Property Name="UnifiedSize" Value="{{0.0,31},{0.0,31}}" />
-          <Property Name="BackgroundEnabled" Value="False" />
-          <Property Name="FrameEnabled" Value="False" />
-          <Property Name="Image" Value="set:opengate image:StaticGreenBottomRight"/>
+        <Window Type="opengate/StaticImage"         Name="MarketWindow/RightFrame/BottomImage">
+          <Property Name="UnifiedPosition"         Value="{{1.0, -31},{1.0, -31}}" />
+          <Property Name="UnifiedSize"             Value="{{0.0,  31},{0.0,  31}}" />
+          <Property Name="BackgroundEnabled"       Value="False" />
+          <Property Name="FrameEnabled"            Value="False" />
+          <Property Name="Image"                   Value="set:opengate image:StaticGreenBottomRight"/>
         </Window>
-        <Window Type="opengate/StaticGreenImage" Name="MarketItemWindowLeft">
-          <Property Name="UnifiedPosition" Value="{{1.0,-31},{0.0,31}}" />
-          <Property Name="UnifiedSize" Value="{{0.0,1},{1.0,-31}}" />
-          <Property Name="BackgroundEnabled" Value="False" />
-          <Property Name="FrameEnabled" Value="False" />
-          <Property Name="Image" Value="set:opengate image:StaticGreenVertLine"/>
+        <Window Type="opengate/StaticImage"         Name="MarketWindow/RightFrame/LeftImage">
+          <Property Name="UnifiedPosition"         Value="{{1.0, -31},{0.0,  31}}" />
+          <Property Name="UnifiedSize"             Value="{{0.0,   1},{1.0, -31}}" />
+          <Property Name="BackgroundEnabled"       Value="False" />
+          <Property Name="FrameEnabled"            Value="False" />
+          <Property Name="Image"                   Value="set:opengate image:StaticGreenVertLine"/>
         </Window>
-        <Window Type="opengate/EmptyButton" Name="MarketItemWindow/UpButton">
-          <Property Name="UnifiedPosition" Value="{{1.0,-23},{0.0,32}}" />
-          <Property Name="UnifiedSize" Value="{{0.0,14},{ 0.0,56}}" /> 
-          <Property Name="NormalImage" Value="set:opengate image:ScrollThumbUpNormal" />
-          <Property Name="HoverImage"  Value="set:opengate image:ScrollThumbUpHover" />
-          <Property Name="Pushed...
 
[truncated message content]

[Opengate-svn] SF.net SVN: opengate: [689] trunk/data

[<ult...@us...>]

Revision: 689
          http://opengate.svn.sourceforge.net/opengate/?rev=689&view=rev
Author:   ultrasick
Date:     2007-08-26 07:30:25 -0700 (Sun, 26 Aug 2007)

Log Message:
-----------
moving files around, sorry for the file chaos

Added Paths:
-----------
    trunk/data/sounds/guns/
    trunk/data/sounds/guns/laser.wav

Removed Paths:
-------------
    trunk/data/guns/laser.wav

Deleted: trunk/data/guns/laser.wav
===================================================================
(Binary files differ)

Added: trunk/data/sounds/guns/laser.wav
===================================================================
(Binary files differ)


Property changes on: trunk/data/sounds/guns/laser.wav
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opengate-svn] SF.net SVN: opengate: [697] trunk/data

[<ult...@us...>]

Revision: 697
          http://opengate.svn.sourceforge.net/opengate/?rev=697&view=rev
Author:   ultrasick
Date:     2007-08-27 02:15:11 -0700 (Mon, 27 Aug 2007)

Log Message:
-----------
uploading an alternative laser shot sound, a sound file for the camera modification and some "mysterious sentinel sound files"

maybe we don't need them all right now, but we can probably use them later

+ adding the source of the sound files to the credits.txt

Modified Paths:
--------------
    trunk/data/misc/credits.txt

Added Paths:
-----------
    trunk/data/sounds/guns/laser2.wav
    trunk/data/sounds/modifications/
    trunk/data/sounds/modifications/camera.wav
    trunk/data/sounds/sectors/sentinel_1.wav
    trunk/data/sounds/sectors/sentinel_2.wav
    trunk/data/sounds/sectors/sentinel_3.wav
    trunk/data/sounds/sectors/sentinel_4.wav

Modified: trunk/data/misc/credits.txt
===================================================================
--- trunk/data/misc/credits.txt	2007-08-26 16:48:46 UTC (rev 696)
+++ trunk/data/misc/credits.txt	2007-08-27 09:15:11 UTC (rev 697)
@@ -28,7 +28,7 @@
     providing nice base textures for 
     the Lady Kickstart!
 
-... www.a1freesoundeffects.com for 
+... www.a1FreeSoundEffects.com for 
     the sonar ping sound file we used 
     in the open source splash screen!
 
@@ -37,4 +37,9 @@
     Jumpgate Mapper tool!
 
 ... George Max for helping out with some
-    commodities!
\ No newline at end of file
+    commodities!
+
+... www.WyomingWebDesign.com for
+    sentinel sound files, a cool
+    laser shot sound and a sound of a
+    camera!
\ No newline at end of file

Added: trunk/data/sounds/guns/laser2.wav
===================================================================
(Binary files differ)


Property changes on: trunk/data/sounds/guns/laser2.wav
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/sounds/modifications/camera.wav
===================================================================
(Binary files differ)


Property changes on: trunk/data/sounds/modifications/camera.wav
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/sounds/sectors/sentinel_1.wav
===================================================================
(Binary files differ)


Property changes on: trunk/data/sounds/sectors/sentinel_1.wav
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/sounds/sectors/sentinel_2.wav
===================================================================
(Binary files differ)


Property changes on: trunk/data/sounds/sectors/sentinel_2.wav
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/sounds/sectors/sentinel_3.wav
===================================================================
(Binary files differ)


Property changes on: trunk/data/sounds/sectors/sentinel_3.wav
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/sounds/sectors/sentinel_4.wav
===================================================================
(Binary files differ)


Property changes on: trunk/data/sounds/sectors/sentinel_4.wav
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opengate-svn] SF.net SVN: opengate: [707] trunk/data

[<spo...@us...>]

Revision: 707
          http://opengate.svn.sourceforge.net/opengate/?rev=707&view=rev
Author:   spom_spom
Date:     2007-08-31 13:19:41 -0700 (Fri, 31 Aug 2007)

Log Message:
-----------
Peeeep Peeeep Peeeep. Add: basic openAL-Sound support, see data/misc/sounds.xmlfor symbolic sound names and associated sound files. Atm. just 4 different sound events supported. Possible Soundformats are 8/16bit wav and oggVorbis.

Modified Paths:
--------------
    branches/ogsector/data/gui/layouts/dialogs/MarketDialog.layout
    branches/ogsector/data/gui/layouts/dialogs/MarketItemShortDialog.layout
    branches/ogsector/data/gui/layouts/dialogs/ShipConfigEquipmentButton.layout
    branches/ogsector/src/BaseDialog.cpp
    branches/ogsector/src/BaseDialog.h
    branches/ogsector/src/DockedState.cpp
    branches/ogsector/src/DockedState.h
    branches/ogsector/src/Entity.cpp
    branches/ogsector/src/GameStateManager.cpp
    branches/ogsector/src/LogManager.h
    branches/ogsector/src/Makefile.am
    branches/ogsector/src/Makefile.in
    branches/ogsector/src/MarketDialog.cpp
    branches/ogsector/src/ResourceManager.cpp
    branches/ogsector/src/ResourceManager.h
    branches/ogsector/src/SectorObjects.cpp
    branches/ogsector/src/SectorObjects.h
    branches/ogsector/src/ShipConfigDialog.cpp
    branches/ogsector/src/UnDockedState.h
    branches/ogsector/src/testopenalmanager.cpp
    trunk/data/sounds/guns/laser2.ogg

Added Paths:
-----------
    branches/ogsector/src/OpenALSoundManager.cpp
    branches/ogsector/src/OpenALSoundManager.h
    trunk/data/misc/sounds.xml
    trunk/data/sounds/sectors/tauseti/Simon_Mahler_-_HipDaHop.ogg
    trunk/data/sounds/stations/quantar/Sarin_Sunday_-_Lonely_hike.ogg

Removed Paths:
-------------
    branches/ogsector/src/openALSoundManager.cpp
    branches/ogsector/src/openALSoundManager.h
    trunk/data/capacitors/alembic_290x290.png
    trunk/data/capacitors/alembic_76x76.png

Modified: branches/ogsector/data/gui/layouts/dialogs/MarketDialog.layout
===================================================================
--- branches/ogsector/data/gui/layouts/dialogs/MarketDialog.layout	2007-08-31 13:47:36 UTC (rev 706)
+++ branches/ogsector/data/gui/layouts/dialogs/MarketDialog.layout	2007-08-31 20:19:41 UTC (rev 707)
@@ -26,11 +26,11 @@
           <Property Name="Image"                 Value="set:opengate image:StaticGreenTopLeft"/>
         </Window> 
         <Window Type="opengate/StaticGreenImage" Name="MarketItemDetailedView/Top">
-          <Property Name="UnifiedPosition" Value="{{0.0,  31},{ 0.0,  0}}" />
-          <Property Name="UnifiedSize"     Value="{{1.0, -62},{ 0.0, 31}}" />
-          <Property Name="BackgroundEnabled" Value="False" />
-          <Property Name="FrameEnabled" Value="False" />
-          <Property Name="Image" Value="set:opengate image:StaticGreenTop"/>
+          <Property Name="UnifiedPosition"      Value="{{0.0,  31},{ 0.0,  0}}" />
+          <Property Name="UnifiedSize"          Value="{{1.0, -62},{ 0.0, 31}}" />
+          <Property Name="BackgroundEnabled"    Value="False" />
+          <Property Name="FrameEnabled"         Value="False" />
+          <Property Name="Image"                Value="set:opengate image:StaticGreenTop"/>
           <Window Type="opengate/StaticLabel" Name="MarketItemDetailedView/Top/Title">
             <Property Name="UnifiedPosition"  Value="{{0.0,  10},{ 0.0, 10}}" />
             <Property Name="UnifiedSize"      Value="{{1.0,   0},{ 0.0, 20}}" />
@@ -45,12 +45,19 @@
           <Property Name="FrameEnabled" Value="False" />
           <Property Name="Image" Value="set:opengate image:StaticGreenTopRight"/>
         </Window> 
-        <Window Type="opengate/StaticGreenImage" Name="MarketItemDetailedView/Image">
+        <Window Type="opengate/StaticGreenImage" Name="MarketItemDetailedView/Image/Frame">
           <!-- Filled within game -->
           <Property Name="UnifiedPosition"   Value="{{0.0,  20},{0.5, -145}}" />
           <Property Name="UnifiedSize"       Value="{{0.0, 290},{0.0,  290}}" />
           <Property Name="BackgroundEnabled" Value="False" />
           <Property Name="FrameEnabled"      Value="False" />
+          <Window Type="opengate/StaticGreenImage" Name="MarketItemDetailedView/Image">
+            <!-- Filled within game -->
+            <Property Name="UnifiedPosition"      Value="{{0.0, 0},{0.0, 0}}" />
+            <Property Name="UnifiedSize"          Value="{{1.0, 0},{1.0, 0}}" />
+            <Property Name="BackgroundEnabled"    Value="False" />
+            <Property Name="FrameEnabled"         Value="False" />
+          </Window> 
         </Window> 
         <Window Type="opengate/StaticGreenImage" Name="MarketItemDetailedView/TextFrame">
           <Property Name="UnifiedPosition"       Value="{{0.0,  330},{0.5, -145}}" />

Modified: branches/ogsector/data/gui/layouts/dialogs/MarketItemShortDialog.layout
===================================================================
--- branches/ogsector/data/gui/layouts/dialogs/MarketItemShortDialog.layout	2007-08-31 13:47:36 UTC (rev 706)
+++ branches/ogsector/data/gui/layouts/dialogs/MarketItemShortDialog.layout	2007-08-31 20:19:41 UTC (rev 707)
@@ -1,43 +1,50 @@
 <?xml version="1.0" ?>
 <GUILayout>
   <Window Type="opengate/MarketShortInfoButton" Name="MarketShortItem">
-    <Property Name="UnifiedPosition" Value="{{0.0,10},{0.0,10}}" />
-    <Property Name="UnifiedSize" Value="{{0.0,98},{0.0,106}}" />
-    <Property Name="AlwaysOnTop" Value="true" />
-    <Property Name="Text" Value="ItemName" />
-    <Window Type="opengate/StaticGreenImage" Name="MarketShortItemImage">
-      <Property Name="UnifiedPosition" Value="{{0.0,12},{0.0,7}}" />
-      <Property Name="UnifiedSize" Value="{{0.0, 76},{0.0, 76}}" />
-      <Property Name="BackgroundEnabled" Value="False" />
-      <Property Name="FrameEnabled" Value="false" />
+    <Property Name="UnifiedPosition"           Value="{{0.0, 10},{0.0,  10}}" />
+    <Property Name="UnifiedSize"               Value="{{0.0, 98},{0.0, 106}}" />
+    <Property Name="AlwaysOnTop"               Value="true" />
+    <Property Name="Text"                      Value="ItemName" />
+    <Window Type="opengate/StaticGreenImage"    Name="MarketShortItemImageFrame">
+      <Property Name="UnifiedPosition"         Value="{{0.0, 12},{0.0,  7}}" />
+      <Property Name="UnifiedSize"             Value="{{0.0, 76},{0.0, 76}}" />
+      <Property Name="BackgroundEnabled"       Value="false" />
+      <Property Name="FrameEnabled"            Value="false" />
       <Property Name="MousePassThroughEnabled" Value="true" />
+      <Window Type="opengate/StaticGreenImage"    Name="MarketShortItemImage">
+        <Property Name="UnifiedPosition"         Value="{{0.0, 0},{0.0, 0}}" />
+        <Property Name="UnifiedSize"             Value="{{1.0, 0},{1.0, 0}}" />
+        <Property Name="BackgroundEnabled"       Value="false" />
+        <Property Name="FrameEnabled"            Value="false" />
+        <Property Name="MousePassThroughEnabled" Value="true" />
+      </Window>
     </Window>
-    <Window Type="opengate/StaticGreenImage" Name="MarketShortItemTypIcon">
-      <Property Name="UnifiedPosition" Value="{{1.0, -15},{0,3}}" />
-      <Property Name="UnifiedSize" Value="{{0.0, 12},{0.0, 12}}" />
-      <Property Name="BackgroundEnabled" Value="False" />
-      <Property Name="FrameEnabled" Value="false" />
-      <Property Name="Image" Value="set:opengate image:IconCommodity0" />
+    <Window Type="opengate/StaticGreenImage"    Name="MarketShortItemTypIcon">
+      <Property Name="UnifiedPosition"         Value="{{1.0, -15},{0.0,  3}}" />
+      <Property Name="UnifiedSize"             Value="{{0.0,  12},{0.0, 12}}" />
+      <Property Name="BackgroundEnabled"       Value="false" />
+      <Property Name="FrameEnabled"            Value="false" />
+      <Property Name="Image"                   Value="set:opengate image:IconCommodity0" />
       <Property Name="MousePassThroughEnabled" Value="true" />
     </Window>
-    <Window Type="opengate/StaticGreenImage" Name="MarketShortItemSizeIcon">
-      <Property Name="UnifiedPosition" Value="{{1.0, -15},{1, -41}}" />
-      <Property Name="UnifiedSize" Value="{{0.0, 12},{0.0, 26}}" />
-      <Property Name="BackgroundEnabled" Value="False" />
-      <Property Name="FrameEnabled" Value="false" />
-      <Property Name="Image" Value="set:opengate image:IconSize1" />
+    <Window Type="opengate/StaticGreenImage"    Name="MarketShortItemSizeIcon">
+      <Property Name="UnifiedPosition"         Value="{{1.0, -15},{1.0, -41}}" />
+      <Property Name="UnifiedSize"             Value="{{0.0,  12},{0.0,  26}}" />
+      <Property Name="BackgroundEnabled"       Value="false" />
+      <Property Name="FrameEnabled"            Value="false" />
+      <Property Name="Image"                   Value="set:opengate image:IconSize1" />
       <Property Name="MousePassThroughEnabled" Value="true" />
     </Window>
-    <Window Type="opengate/StaticLabel" Name="MarketShortItemAmount">
-      <Property Name="UnifiedPosition" Value="{{0.0,10},{0.0,2}}" />
-      <Property Name="UnifiedSize" Value="{{0.0,50},{0.0,10}}" />
-      <Property Name="Font" Value="BlueHighway-10" />
+    <Window Type="opengate/StaticLabel"         Name="MarketShortItemAmount">
+      <Property Name="UnifiedPosition"         Value="{{0.0, 10},{0.0,  2}}" />
+      <Property Name="UnifiedSize"             Value="{{0.0, 50},{0.0, 10}}" />
+      <Property Name="Font"                    Value="BlueHighway-10" />
       <Property Name="MousePassThroughEnabled" Value="true" />
     </Window>
-    <Window Type="opengate/StaticLabel" Name="MarketShortItemPrice">
-      <Property Name="UnifiedPosition" Value="{{0.0,3},{1.0,-12}}" />
-      <Property Name="UnifiedSize" Value="{{0.0,50},{0.0,10}}" />
-      <Property Name="Font" Value="BlueHighway-10" />
+    <Window Type="opengate/StaticLabel"         Name="MarketShortItemPrice">
+      <Property Name="UnifiedPosition"         Value="{{0.0,  3},{1.0, -12}}" />
+      <Property Name="UnifiedSize"             Value="{{0.0, 50},{0.0,  10}}" />
+      <Property Name="Font"                    Value="BlueHighway-10" />
       <Property Name="MousePassThroughEnabled" Value="true" />
     </Window>
   </Window>

Modified: branches/ogsector/data/gui/layouts/dialogs/ShipConfigEquipmentButton.layout
===================================================================
--- branches/ogsector/data/gui/layouts/dialogs/ShipConfigEquipmentButton.layout	2007-08-31 13:47:36 UTC (rev 706)
+++ branches/ogsector/data/gui/layouts/dialogs/ShipConfigEquipmentButton.layout	2007-08-31 20:19:41 UTC (rev 707)
@@ -14,14 +14,22 @@
       <Property Name="HoverImage"              Value="set:opengate image:ShipConfigEquipmentItemWindowHover" />
       <Property Name="PushedImage"             Value="set:opengate image:ShipConfigEquipmentItemWindowHover" />
       <Property Name="RiseOnClick"             Value="False" />
-      <Window Type="opengate/StaticGreenImage"   Name="ShipConfigEquipmentButton/Image">
+      <Window Type="opengate/StaticGreenImage"   Name="ShipConfigEquipmentButton/Image/Frame">
         <Property Name="UnifiedPosition"         Value="{{0.5, -38},{0.0,  7}}" />
         <Property Name="UnifiedSize"             Value="{{0.0,  76},{0.0, 76}}" />
         <Property Name="BackgroundEnabled"       Value="False" />
         <Property Name="FrameEnabled"            Value="False" />
         <Property Name="RiseOnClick"             Value="False" />
         <Property Name="MousePassThroughEnabled" Value="True" />
+        <Window Type="opengate/StaticGreenImage"   Name="ShipConfigEquipmentButton/Image">
+          <Property Name="UnifiedPosition"         Value="{{0.0, 0},{0.0, 0}}" />
+          <Property Name="UnifiedSize"             Value="{{1.0, 0},{1.0, 0}}" />
+          <Property Name="BackgroundEnabled"       Value="False" />
+          <Property Name="FrameEnabled"            Value="False" />
+          <Property Name="RiseOnClick"             Value="False" />
+          <Property Name="MousePassThroughEnabled" Value="True" />
       </Window>
+      </Window>
       <Window Type="opengate/StaticGreenImage"   Name="ShipConfigEquipmentButton/CategoryIcon">
         <Property Name="UnifiedPosition"         Value="{{1.0, -15},{0.0,  3}}" />
         <Property Name="UnifiedSize"             Value="{{0.0,  12},{0.0, 12}}" />

Modified: branches/ogsector/src/BaseDialog.cpp
===================================================================
--- branches/ogsector/src/BaseDialog.cpp	2007-08-31 13:47:36 UTC (rev 706)
+++ branches/ogsector/src/BaseDialog.cpp	2007-08-31 20:19:41 UTC (rev 707)
@@ -38,6 +38,27 @@
   } 
 }
 
+void fitWindowToImage( const std::string & name, CEGUI::Window * win ){
+
+  CEGUI::Size imSize( CEGUI::ImagesetManager::getSingleton().getImageset( name )->getImageSize( name ) );
+  CEGUI::Size winSize( win->getParent()->getPixelSize() );
+  
+//     std::cout << imSize.d_width << " "<< imSize.d_height << std::endl;
+//     std::cout << winSize.d_width << " "<< winSize.d_height << std::endl;
+
+  if ( imSize.d_width <= winSize.d_width && imSize.d_height <= winSize.d_height ){
+    win->setSize( CEGUI::UVector2(CEGUI::UDim( 0.0, imSize.d_width), CEGUI::UDim( 0.0, imSize.d_height) ) );
+    
+    if ( imSize.d_width < winSize.d_width || imSize.d_height < winSize.d_height ){
+      
+      win->setPosition( CEGUI::UVector2(CEGUI::UDim( 0.0, ( winSize.d_width - imSize.d_width ) / 2.0), 
+					CEGUI::UDim( 0.0, ( winSize.d_height - imSize.d_height ) / 2.0 ) ) );
+      } else {
+      win->setPosition( CEGUI::UVector2(CEGUI::UDim( 0.0, 0.0 ), CEGUI::UDim( 0.0, 0.0 ) ) );
+    }
+  }
+}
+
 float windowHeight( const CEGUI::Window * child ){
   if ( child->getParent() ) return child->getHeight().asAbsolute( windowHeight( child->getParent() ) );
   return child->getHeight().asAbsolute( ResourceManager::getSingleton().renderWindow->getHeight() );

Modified: branches/ogsector/src/BaseDialog.h
===================================================================
--- branches/ogsector/src/BaseDialog.h	2007-08-31 13:47:36 UTC (rev 706)
+++ branches/ogsector/src/BaseDialog.h	2007-08-31 20:19:41 UTC (rev 707)
@@ -33,6 +33,7 @@
 namespace OpenGate{
 
 void renameClonedWindows( const CEGUI::Window * parent, const CEGUI::String & namePrefix );
+void fitWindowToImage( const std::string & name, CEGUI::Window * win );
 float windowHeight( const CEGUI::Window * child );
 float windowWidth(  const CEGUI::Window * child );
 

Modified: branches/ogsector/src/DockedState.cpp
===================================================================
--- branches/ogsector/src/DockedState.cpp	2007-08-31 13:47:36 UTC (rev 706)
+++ branches/ogsector/src/DockedState.cpp	2007-08-31 20:19:41 UTC (rev 707)
@@ -22,6 +22,7 @@
 #include "Console.h"
 #include "Avatar.h"
 #include "Vessel.h"
+#include "OpenALSoundManager.h"
 
 #include <OgreRoot.h>
 #include <OgreRenderWindow.h>
@@ -33,9 +34,11 @@
 namespace OpenGate{
 
 DockedState::DockedState(){
-  sceneMgr_ = NULL;
+  sceneMgr_         = NULL;
   shipConfigDialog_ = NULL;
-  consoleMax_ = false;
+  consoleMax_       = false;
+  backgroundSound_  = NULL;
+  clickSound_       = NULL;
 }
 
 void DockedState::createContent(){ 
@@ -82,6 +85,11 @@
   overlayRootWindow_->addChildWindow( shipConfigDialog_->rootWindow() );
   marketDialog_     = new MarketDialog( );
   overlayRootWindow_->addChildWindow( marketDialog_->rootWindow() );
+
+  backgroundSound_  = resources_->soundManager->createSoundSourceFromRessource( "sounds/docked/defaultMusic", 
+										"stationBackground", true);
+  clickSound_       = resources_->soundManager->createSoundSourceFromRessource( "sounds/GUI/click", "GUI/click" );
+
   setupEventHandlers();
 }
 
@@ -89,6 +97,9 @@
   if ( shipConfigDialog_ ) delete shipConfigDialog_;
   if ( marketDialog_ )     delete marketDialog_;
 
+  OpenALSoundManager::getSingleton().destroySoundSource( backgroundSound_ );
+  OpenALSoundManager::getSingleton().destroySoundSource( clickSound_ );
+
   sceneMgr_->destroyManualObject( "BackgroundObject" ); 
   sceneMgr_->getRootSceneNode()->removeAndDestroyChild( "Background" ); 
   CEGUI::WindowManager::getSingleton().destroyWindow( overlayRootWindow_ );
@@ -115,9 +126,14 @@
 	      CEGUI::PushButton::EventClicked, CEGUI::Event::Subscriber( &DockedState::handleConfigBackButton, this ) ) ;
   exitToUndockedState_ = false;
   quitAllStates_ = false;
+
+  if ( resources_->soundManager->listener() ){ resources_->soundManager->listener()->reset(); }
+  if ( backgroundSound_ ) backgroundSound_->play();
 }
 
 void DockedState::exit(){
+  if ( backgroundSound_ ) backgroundSound_->stop();
+
   CEGUI::WindowManager::getSingleton().getWindow( (CEGUI::utf8*)"Config/BackButton" )->removeEvent(
 		   CEGUI::PushButton::EventClicked );
 
@@ -199,6 +215,7 @@
 
 bool DockedState::mousePressed( const OIS::MouseEvent & e, OIS::MouseButtonID id ){
   CEGUI::System::getSingleton().injectMouseButtonDown( convertOgreButtonToCegui( id ) );
+  if ( clickSound_ ) clickSound_->play();
   return true;
 }
 

Modified: branches/ogsector/src/DockedState.h
===================================================================
--- branches/ogsector/src/DockedState.h	2007-08-31 13:47:36 UTC (rev 706)
+++ branches/ogsector/src/DockedState.h	2007-08-31 20:19:41 UTC (rev 707)
@@ -30,6 +30,7 @@
 
 namespace OpenGate{
 
+class OpenALSoundSource;
 
 /*!
  * \brief This class defines the gamestate the gamestate when the user is docked
@@ -101,6 +102,9 @@
   int cursorMaxFrames_;
   int cursorFrame_;
   Ogre::Real lastCursorFrameTime_;
+
+  OpenALSoundSource * backgroundSound_;
+  OpenALSoundSource * clickSound_;
 }; 
 
 } // namespace OpenGate

Modified: branches/ogsector/src/Entity.cpp
===================================================================
--- branches/ogsector/src/Entity.cpp	2007-08-31 13:47:36 UTC (rev 706)
+++ branches/ogsector/src/Entity.cpp	2007-08-31 20:19:41 UTC (rev 707)
@@ -70,21 +70,30 @@
 
   if ( imageFileName_ == "unknown" ) imageFileName_ = name_;
 
-  haveSmall = initialiseImage( imageFileName_ + "_76x76.png", imageFileName_ + "Small" );
+  if ( !initialiseImage( imageFileName_ + "_small.png", imageFileName_ + "Small" ) ){
+    if ( !initialiseImage( imageFileName_ + "_76x76.png", imageFileName_ + "Small" ) ){
+      haveSmall = false;
+    }
+  }
+
   if ( haveSmall ){
     ceguiSmallImageName_ = ceguiImageName_;
   } 
 
-  if ( !initialiseImage( imageFileName_ + "_290x290.png", imageFileName_ ) ){
-    //**fallback
-    initialiseImage( imageFileName_ + ".png", imageFileName_, true );
+  if ( !initialiseImage( imageFileName_ + "_big.png", imageFileName_ ) ){
+    //**fallback to 290x290
+    if ( !initialiseImage( imageFileName_ + "_290x290.png", imageFileName_ ) ){
+      //**fallback
+	initialiseImage( imageFileName_ + ".png", imageFileName_, true );
+    }
   }
     
-  if ( !haveSmall ) ceguiSmallImageName_ = ceguiImageName_;
-
+  if ( !haveSmall ) {
+    initialiseImage( imageFileName_ + ".png", imageFileName_ + "Small" );
+    ceguiSmallImageName_ = ceguiImageName_;
+  }
 }
 
-
 bool Entity::initialiseImage( const std::string & imageName, const std::string & targetName, bool verbose ){
   bool fail = false;
   CEGUI::Texture * texture = NULL;

Modified: branches/ogsector/src/GameStateManager.cpp
===================================================================
--- branches/ogsector/src/GameStateManager.cpp	2007-08-31 13:47:36 UTC (rev 706)
+++ branches/ogsector/src/GameStateManager.cpp	2007-08-31 20:19:41 UTC (rev 707)
@@ -35,6 +35,7 @@
 #include "Sector.h"
 #include "InputManager.h"
 #include "VesselManager.h"
+#include "OpenALSoundManager.h"
 #include "UnDockedState.h"
 #include "ConfigDialog.h"
 #include "EntityManager.h"
@@ -141,6 +142,11 @@
     delete vesselManager_;
     vesselManager_ = NULL;
   }
+  if ( resources_.soundManager ) {
+    log_->info( "Shutdown soundmanager." );
+    delete resources_.soundManager;
+    resources_.soundManager = NULL;
+  }
   if ( resources_.inputManager ) {
     log_->info( "Shutdown inputmanager." );
     delete resources_.inputManager;
@@ -365,6 +371,8 @@
   resources_.loadGlobalIDs( "ids.xml" );
   resources_.load( "stations" );
 
+  resources_.soundManager = new OpenALSoundManager( );
+  resources_.soundManager->loadRessourceNames( resources_.findFullFileName( "sounds.xml" ) );
 
   vesselManager_ = new VesselManager( );
   vesselManager_->load( resources_.resourcePaths(), "ships" );
@@ -384,11 +392,11 @@
 
   resources_.avatar = new Avatar( resources_.network->userName(), resources_.network->userID() );
   resources_.avatar->setVessel( *VesselManager::getSingleton().vessel( "apteryx" ) );
-  resources_.avatar->vessel( )->setPowerPlant( EquipmentManager::getSingleton().powerPlant( "Spud" ) );
-  resources_.avatar->vessel( )->setEngine( EquipmentManager::getSingleton().engine( "T-E-15" ) );
-  resources_.avatar->vessel( )->setRadar( EquipmentManager::getSingleton().radar( "Outlook" ) );
-  resources_.avatar->vessel( )->setShield( EquipmentManager::getSingleton().shield( "Kydango" ) );
-  resources_.avatar->vessel( )->setCapacitor( EquipmentManager::getSingleton().capacitor( "Sponge" ) );
+  resources_.avatar->vessel( )->setPowerPlant( EquipmentManager::getSingleton().powerPlant( "Spud"    ) );
+  resources_.avatar->vessel( )->setEngine(     EquipmentManager::getSingleton().engine(     "T-E-15"  ) );
+  resources_.avatar->vessel( )->setRadar(      EquipmentManager::getSingleton().radar(      "Outlook" ) );
+  resources_.avatar->vessel( )->setShield(     EquipmentManager::getSingleton().shield(     "Kydango" ) );
+  resources_.avatar->vessel( )->setCapacitor(  EquipmentManager::getSingleton().capacitor(  "Sponge"  ) );
 
 
   return true;

Modified: branches/ogsector/src/LogManager.h
===================================================================
--- branches/ogsector/src/LogManager.h	2007-08-31 13:47:36 UTC (rev 706)
+++ branches/ogsector/src/LogManager.h	2007-08-31 20:19:41 UTC (rev 707)
@@ -63,11 +63,11 @@
  * </table>
  * \author Carsten <spo...@us... >
  */
-class LogManager : public Ogre::Singleton< LogManager > {
+class LogManager : public Ogre::Singleton< LogManager >, public std::ostream {
 public:
   LogManager( );
 
-  ~LogManager( );
+  virtual ~LogManager( );
 
   /*! Open a session log file with the given filename \param logFileName The name of the file */
   void setLogFile( const std::string & logFileName );
@@ -113,6 +113,12 @@
 //   //  LogManager & operator << ( const std::endl & endl ){}
 //   LogManager & operator << ( const Flush & flush );
 
+//  template < class T > LogManager & operator << ( LogManager & log, const T & val );
+
+//    template<typename _CharT, typename _Traits>  basic_ostream<_CharT, _Traits>& endl(basic_ostream<_CharT, _Traits>& __os)
+//     { return 
+// 	flush( __os.put(__os.widen('\n') ) ) ; }
+
 protected:
 
   /*! This method writes the given message to stdout and (if available) to a logfile */
@@ -137,6 +143,19 @@
   bool haveConsole_;
 };
 
+inline LogManager & endl( LogManager & log ){ 
+  std::cout << "LogManager & operator:: endl" << std::endl;
+  return log;
+}
+
+template < class T > LogManager & operator << ( LogManager & log, const T & val ){
+  std::cout << "LogManager & operator const val" << std::endl;
+  std::cout << val << std::endl;
+//   if ( haveLogFile_ ) logFile_ << timeStamp() << ": " << val;
+  return log;
+}
+
+
 } //namespace OpenGate
 
 #endif // _OPENGATE_LOGMANAGER__H

Modified: branches/ogsector/src/Makefile.am
===================================================================
--- branches/ogsector/src/Makefile.am	2007-08-31 13:47:36 UTC (rev 706)
+++ branches/ogsector/src/Makefile.am	2007-08-31 20:19:41 UTC (rev 707)
@@ -23,8 +23,6 @@
 	ConfigDialog.cpp \
 	Console.h \
 	Console.cpp \
-	ResourceManager.h \
-	ResourceManager.cpp \
 	DockedState.h \
 	DockedState.cpp \
 	Entity.h \
@@ -43,8 +41,12 @@
 	MarketDialog.cpp \
 	OpcodeWrapper.h \
 	OpcodeWrapper.cpp \
+	OpenALSoundManager.h \
+	OpenALSoundManager.cpp \
 	Projectile.h \
 	Projectile.cpp \
+	ResourceManager.h \
+	ResourceManager.cpp \
 	Sector.h \
 	Sector.cpp \
 	SectorObjects.h \
@@ -82,8 +84,28 @@
 
 testopenalmanager_SOURCES = \
 	testopenalmanager.cpp \
-	openALSoundManager.h \
-	openALSoundManager.cpp
+	common.h \
+	common.cpp \
+	tinyxml/tinyxml.h \
+	tinyxml/tinyxml.cpp \
+	tinyxml/tinyxmlerror.cpp \
+	tinyxml/tinyxmlparser.cpp \
+	networkProtocol.h \
+	networkProtocol.cpp \
+	networkClient.h \
+	networkClient.cpp \
+	Console.h \
+	Console.cpp \
+	Entity.h \
+	Entity.cpp \
+	LogManager.h \
+	LogManager.cpp \
+	InputManager.h \
+	InputManager.cpp \
+	OpenALSoundManager.h \
+	OpenALSoundManager.cpp \
+	ResourceManager.h \
+	ResourceManager.cpp 
 
 distclean: maintainer-clean
 	rm -rf *~ \

Modified: branches/ogsector/src/Makefile.in
===================================================================
--- branches/ogsector/src/Makefile.in	2007-08-31 13:47:36 UTC (rev 706)
+++ branches/ogsector/src/Makefile.in	2007-08-31 20:19:41 UTC (rev 707)
@@ -52,14 +52,15 @@
 	networkProtocol.$(OBJEXT) networkClient.$(OBJEXT) \
 	tinyxml.$(OBJEXT) tinyxmlerror.$(OBJEXT) \
 	tinyxmlparser.$(OBJEXT) Avatar.$(OBJEXT) BaseDialog.$(OBJEXT) \
-	ConfigDialog.$(OBJEXT) Console.$(OBJEXT) \
-	ResourceManager.$(OBJEXT) DockedState.$(OBJEXT) \
+	ConfigDialog.$(OBJEXT) Console.$(OBJEXT) DockedState.$(OBJEXT) \
 	Entity.$(OBJEXT) EntityManager.$(OBJEXT) GameState.$(OBJEXT) \
 	GameStateManager.$(OBJEXT) InputManager.$(OBJEXT) \
 	LogManager.$(OBJEXT) MarketDialog.$(OBJEXT) \
-	OpcodeWrapper.$(OBJEXT) Projectile.$(OBJEXT) Sector.$(OBJEXT) \
-	SectorObjects.$(OBJEXT) ShipConfigDialog.$(OBJEXT) \
-	Station.$(OBJEXT) UnDockedState.$(OBJEXT) Vessel.$(OBJEXT) \
+	OpcodeWrapper.$(OBJEXT) OpenALSoundManager.$(OBJEXT) \
+	Projectile.$(OBJEXT) ResourceManager.$(OBJEXT) \
+	Sector.$(OBJEXT) SectorObjects.$(OBJEXT) \
+	ShipConfigDialog.$(OBJEXT) Station.$(OBJEXT) \
+	UnDockedState.$(OBJEXT) Vessel.$(OBJEXT) \
 	VesselManager.$(OBJEXT) metaserver.$(OBJEXT)
 opengateclient_OBJECTS = $(am_opengateclient_OBJECTS)
 opengateclient_LDADD = $(LDADD)
@@ -70,7 +71,11 @@
 opengateserver_OBJECTS = $(am_opengateserver_OBJECTS)
 opengateserver_LDADD = $(LDADD)
 am_testopenalmanager_OBJECTS = testopenalmanager.$(OBJEXT) \
-	openALSoundManager.$(OBJEXT)
+	common.$(OBJEXT) tinyxml.$(OBJEXT) tinyxmlerror.$(OBJEXT) \
+	tinyxmlparser.$(OBJEXT) networkProtocol.$(OBJEXT) \
+	networkClient.$(OBJEXT) Console.$(OBJEXT) Entity.$(OBJEXT) \
+	LogManager.$(OBJEXT) InputManager.$(OBJEXT) \
+	OpenALSoundManager.$(OBJEXT) ResourceManager.$(OBJEXT)
 testopenalmanager_OBJECTS = $(am_testopenalmanager_OBJECTS)
 testopenalmanager_LDADD = $(LDADD)
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
@@ -204,8 +209,6 @@
 	ConfigDialog.cpp \
 	Console.h \
 	Console.cpp \
-	ResourceManager.h \
-	ResourceManager.cpp \
 	DockedState.h \
 	DockedState.cpp \
 	Entity.h \
@@ -224,8 +227,12 @@
 	MarketDialog.cpp \
 	OpcodeWrapper.h \
 	OpcodeWrapper.cpp \
+	OpenALSoundManager.h \
+	OpenALSoundManager.cpp \
 	Projectile.h \
 	Projectile.cpp \
+	ResourceManager.h \
+	ResourceManager.cpp \
 	Sector.h \
 	Sector.cpp \
 	SectorObjects.h \
@@ -263,8 +270,28 @@
 
 testopenalmanager_SOURCES = \
 	testopenalmanager.cpp \
-	openALSoundManager.h \
-	openALSoundManager.cpp
+	common.h \
+	common.cpp \
+	tinyxml/tinyxml.h \
+	tinyxml/tinyxml.cpp \
+	tinyxml/tinyxmlerror.cpp \
+	tinyxml/tinyxmlparser.cpp \
+	networkProtocol.h \
+	networkProtocol.cpp \
+	networkClient.h \
+	networkClient.cpp \
+	Console.h \
+	Console.cpp \
+	Entity.h \
+	Entity.cpp \
+	LogManager.h \
+	LogManager.cpp \
+	InputManager.h \
+	InputManager.cpp \
+	OpenALSoundManager.h \
+	OpenALSoundManager.cpp \
+	ResourceManager.h \
+	ResourceManager.cpp 
 
 all: all-am
 
@@ -351,6 +378,7 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LogManager.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MarketDialog.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/OpcodeWrapper.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/OpenALSoundManager.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Projectile.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ResourceManager.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Sector.Po@am__quote@
@@ -366,7 +394,6 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/networkProtocol.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/networkServer.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/networkServerUser.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openALSoundManager.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/opengateclient.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/opengateserver.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testopenalmanager.Po@am__quote@

Modified: branches/ogsector/src/MarketDialog.cpp
===================================================================
--- branches/ogsector/src/MarketDialog.cpp	2007-08-31 13:47:36 UTC (rev 706)
+++ branches/ogsector/src/MarketDialog.cpp	2007-08-31 20:19:41 UTC (rev 707)
@@ -130,7 +130,6 @@
   BIND_CEGUI_EVENT( wmgr.getWindow( (CEGUI::utf8*)"MarketItemDetailedView/Decrease100"),
 		    CEGUI::PushButton::EventClicked, MarketDialog::handleMarketItemChangeAmount );
 
-
   BIND_CEGUI_EVENT( wmgr.getWindow( (CEGUI::utf8*)"InventoryWindow/UpButton"),
 		    CEGUI::PushButton::EventClicked, MarketDialog::handleInventItemWindowUpButton );
   BIND_CEGUI_EVENT( wmgr.getWindow( (CEGUI::utf8*)"InventoryWindow/DownButton"),
@@ -222,7 +221,6 @@
   }
 }
 
-  
 void MarketDialog::updateInventView(){
   CEGUI::WindowManager::getSingleton().getWindow( "InventoryShipCargo/Text" )
     ->setProperty( "Text", CEGUI::String( toStr( ResourceManager::getSingleton().avatar->cargoHold() ) ) );
@@ -310,6 +308,12 @@
     ->setProperty( "Text", textPrice );
   CEGUI::WindowManager::getSingleton().getWindow( win->getName() + "MarketShortItemImage" )
     ->setProperty("Image", image );
+
+  if ( item ){
+    std::string imageName( item->imageName() + "Small" );
+    fitWindowToImage( imageName, CEGUI::WindowManager::getSingleton().getWindow( win->getName() + "MarketShortItemImage" ) );
+  }
+
   CEGUI::WindowManager::getSingleton().getWindow( win->getName() + "MarketShortItemSizeIcon" )
     ->setProperty("Image", icon );
   CEGUI::WindowManager::getSingleton().getWindow( win->getName() + "MarketShortItemTypIcon" )
@@ -528,11 +532,13 @@
     
     CEGUI::WindowManager::getSingleton().getWindow( "MarketItemDetailedView")->setUserData( itemWindow->getUserData() );
     
-    
     CEGUI::WindowManager::getSingleton().getWindow( "MarketItemDetailedView/Amount" )
       ->setProperty("Text", CEGUI::String( toStr( amount ) ) );
     CEGUI::WindowManager::getSingleton().getWindow( "MarketItemDetailedView/Image" )
       ->setProperty("Image", item->ceguiImageName() );
+
+    fitWindowToImage( item->imageName(), CEGUI::WindowManager::getSingleton().getWindow( "MarketItemDetailedView/Image" ) );
+
     CEGUI::WindowManager::getSingleton().getWindow( "MarketItemDetailedView/TextFrame/Name/Text" )
       ->setProperty("Text", item->name() );
     CEGUI::WindowManager::getSingleton().getWindow( "MarketItemDetailedView/TextFrame/Size/Text" )

Copied: branches/ogsector/src/OpenALSoundManager.cpp (from rev 701, branches/ogsector/src/openALSoundManager.cpp)
===================================================================
--- branches/ogsector/src/OpenALSoundManager.cpp	                        (rev 0)
+++ branches/ogsector/src/OpenALSoundManager.cpp	2007-08-31 20:19:41 UTC (rev 707)
@@ -0,0 +1,478 @@
+/***************************************************************************
+ *   Copyright (C) 2006-2007 by OpenGate development team                  *
+ *   spo...@us...                                       *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+
+#include "tinyxml/tinyxml.h"
+#include "LogManager.h"
+#include "ResourceManager.h"
+#include "OpenALSoundManager.h"
+#include <iostream>
+#include <cerrno>
+
+namespace OpenGate{
+
+bool OpenALSoundSource::play(){ 
+  int sourceAudioState = 0;
+  alGetError();
+  
+  // Are we currently playing the audio source?
+  alGetSourcei( sourceID_, AL_SOURCE_STATE, &sourceAudioState );
+  if ( soundMgr_->checkOpenALError( "OpenALSound::play::alGetSourcei" ) ) return false;
+  
+  if ( sourceAudioState == AL_PLAYING ) {
+    //    if ( forceRestart ) stopAudio( sourceId ); else return false;
+  }
+  
+  alSourcePlay( sourceID_ );
+  if ( soundMgr_->checkOpenALError( "OpenALSound::play::alSourcePlay" ) ) return false;
+  return true; 
+}
+
+bool OpenALSoundSource::stop(){ 
+  alGetError();
+  
+  alSourceStop( sourceID_ );
+  if ( soundMgr_->checkOpenALError( "OpenALSoundSource::stop::alSourceStop" ) ) return false;
+  
+  return true; 
+}
+
+bool OpenALSoundSource::setPosition( float x, float y, float z ){ return setPosition( Ogre::Vector3( x, y, z ) ); }
+bool OpenALSoundSource::setPosition( const Ogre::Vector3 & pos ){
+  position_ = pos;  
+ 
+  alGetError();
+  alSourcefv( sourceID_, AL_POSITION, position_.ptr() );
+  if ( soundMgr_->checkOpenALError( "OpenALSoundSource::setPosition::alSourcefv:AL_POSITION" ) ) return false;
+  return true;
+}
+
+bool OpenALSoundSource::setVelocity( float x, float y, float z ){ return setVelocity( Ogre::Vector3( x, y, z ) ); }
+bool OpenALSoundSource::setVelocity( const Ogre::Vector3 & vel){
+  velocity_ = vel;
+  alSourcefv( sourceID_, AL_VELOCITY, velocity_.ptr() );
+  if ( soundMgr_->checkOpenALError( "OpenALSoundSource::alSourcefv:AL_VELOCITY" ) ) return false;
+  return true;
+}
+
+bool OpenALSoundSource::setDirection( float x, float y, float z ){
+  return setDirection( Ogre::Vector3( x, y, z ) ); }
+  
+bool OpenALSoundSource::setDirection( const Ogre::Vector3 & dir ){
+  direction_ = dir;
+  alSourcefv( sourceID_, AL_DIRECTION, direction_.ptr() );
+  if ( soundMgr_->checkOpenALError( "OpenALListener::alSourcefv::AL_ORIENTATION" ) ) return false;
+  return true;
+}
+
+OpenALListener::OpenALListener( OpenALSoundManager * soundMgr ) : soundMgr_( soundMgr ){
+  reset();
+}
+OpenALListener::~OpenALListener(){}
+  
+void OpenALListener::reset( ){
+  setPosition( Ogre::Vector3::ZERO );
+  setVelocity( Ogre::Vector3::ZERO );
+  setOrientation( Ogre::Vector3( 0.0, 0.0, -1.0), Ogre::Vector3( 0.0, 1.0, 0.0) );
+}
+
+bool OpenALListener::setPosition( float x, float y, float z ){ return setPosition( Ogre::Vector3( x, y, z ) ); }
+bool OpenALListener::setPosition( const Ogre::Vector3 & pos){
+  position_ = pos;
+  alListenerfv( AL_POSITION, position_.ptr() );
+  if ( soundMgr_->checkOpenALError( "OpenALListener::alListenerfv:AL_POSITION" ) ) return false;
+  return true;
+}
+
+bool OpenALListener::setVelocity( float x, float y, float z ){ return setVelocity( Ogre::Vector3( x, y, z ) ); }
+bool OpenALListener::setVelocity( const Ogre::Vector3 & vel){
+  velocity_ = vel;
+  alListenerfv( AL_VELOCITY, position_.ptr() );
+  if ( soundMgr_->checkOpenALError( "OpenALListener::alListenerfv:AL_VELOCITY" ) ) return false;
+  return true;
+}
+
+bool OpenALListener::setOrientation( float xf, float yf, float zf, float xu, float yu, float zu ){ 
+  return setOrientation( Ogre::Vector3( xf, yf, zf ), Ogre::Vector3( xu, yu, zu ) ); }
+  
+bool OpenALListener::setOrientation( const Ogre::Vector3 & front, const Ogre::Vector3 & up){
+  directionFront_ = front; directionUp_ = up;
+  orientation_[ 0 ] = front[ 0 ]; orientation_[ 1 ] = front[ 1 ]; orientation_[ 2 ] = front[ 2 ];
+  orientation_[ 3 ] = up[ 0 ]; orientation_[ 4 ] = up[ 1 ]; orientation_[ 5 ] = up[ 2 ];
+  
+  alListenerfv( AL_ORIENTATION, orientation_ );
+  if ( soundMgr_->checkOpenALError( "OpenALListener::alListenerfv:AL_ORIENTATION" ) ) return false;
+  return true;
+}
+
+template<> OpenALSoundManager * Ogre::Singleton< OpenALSoundManager >::ms_Singleton = 0;
+
+OpenALSoundManager::OpenALSoundManager( ){
+  maxSources_ = 32;
+  listener_ = NULL;
+  oggVorbisExtension_ = false;
+  mp3Extension_ = false;
+
+  log_ = LogManager::getSingletonPtr();
+  haveSoundDevice_ = true;
+
+  init();
+}
+
+OpenALSoundManager::~OpenALSoundManager(){
+  log_->info( "Shoutdown soundmanager." );
+//   alDeleteSources( maxSources_, audioSources_ );
+//   alDeleteBuffers( maxBuffers_, audioBuffers_ ); 
+  
+  for ( std::map< std::string, OpenALSoundSource * >::iterator it = mapSoundSources_.begin(); it != mapSoundSources_.end(); ){
+    destroySoundSource( it++->second );
+  }
+
+  if ( listener_ ) delete listener_;
+
+  alutExit();
+  
+//   delete [] audioBuffers_;
+//   delete [] audioBufferInUse_;
+  
+//   delete [] audioSources_;
+//   delete [] audioSourceInUse_;
+  
+}
+
+bool OpenALSoundManager::init(){
+  alutInit( 0, NULL );
+  if ( checkOpenALError( "init::alutInit" ) ) return false;
+
+  log_->info( "Initialize Soundmanager ..." );
+
+  if ( alIsExtensionPresent( "AL_EXT_vorbis" ) == AL_TRUE ){
+    oggVorbisExtension_ = true;
+  } 
+  if ( alIsExtensionPresent( "AL_EXT_mp3" ) == AL_TRUE ){
+    mp3Extension_ = true;
+  }
+  if ( !alcIsExtensionPresent(NULL, "ALC_ENUMERATION_EXT") ){
+    std::cerr << "No ALC_ENUMERATION_EXT support." << std::endl;
+  }
+
+//   //** identify sound device, for some reason works no yet under linux
+//   const ALCchar *deviceSpecifiers = alcGetString( NULL, ALC_DEVICE_SPECIFIER );
+//   /*
+//    * The spec is a bit unclear about the case when no sound is supported at
+//    * all, so be conservative and check for both interpretations of the spec.
+//    */
+//   if ( (deviceSpecifiers == NULL) || (deviceSpecifiers[ 0 ] == '\0') ) {
+//     std::cerr << "No sound support detected" << std::endl;
+//   }
+//   do {
+//     std::cerr << deviceSpecifiers << std::endl;
+//     deviceSpecifiers += strlen (deviceSpecifiers) + 1;
+//   } while ( deviceSpecifiers[ 0 ] != '\0');
+
+
+//   char *devList;
+//   ALenum alenum = alcGetEnumValue(NULL, "ALC_CAPTURE_DEVICE_SPECIFIER");
+//   devList = (char *)alcGetString(NULL, alenum);
+        
+//   printf("ALC_ENUMERATION_EXT:\n");
+//   while (*devList) {
+//     printf("  - %s\n", devList);
+//     devList += strlen(devList) + 1;
+//   } 
+  
+//  const ALCchar *deviceSpecifiers = alcGetString( NULL, ALC_DEVICE_SPECIFIER );
+
+//   while ( deviceSpecifiers != NULL ) {
+//     ALCdevice * device = alcOpenDevice( deviceSpecifiers );
+//     if ( device ){
+//       ALCcontext * context = alcCreateContext( device, NULL);
+//       if ( context ){
+// 	alcMakeContextCurrent( context );
+// 	log_->info( "sound device found: " + *alcGetString( device, ALC_DEVICE_SPECIFIER ) );
+// 	alcDestroyContext( context );
+//       }
+//       alcCloseDevice(device);
+//     }
+//     deviceSpecifiers += strlen( deviceSpecifiers ) + 1;
+//   }
+
+//   ALCdevice *device = alcOpenDevice(NULL);
+//   if ( device ){
+//     log_->info( "Choosing: " + Ogre::String(alcGetString(device, ALC_DEVICE_SPECIFIER)));
+//     maxSources_ = getMaxSources_();
+//     //  std::cout << "maxsources: " << maxSources_ << std::endl;
+   
+//     listener_ = new OpenALListener( this );
+
+//   } else {
+//     log_->warn( "no sound device found" );
+//     haveSoundDevice_ = false;
+//   }
+
+  maxSources_ = getMaxSources_();
+  listener_ = new OpenALListener( this );
+
+
+//** end device identification;
+
+  
+  return true;
+}
+
+void OpenALSoundManager::loadRessourceNames( const std::string & fileName ){
+
+  TiXmlDocument doc( fileName );
+  bool loadOkay = doc.LoadFile();
+
+  TiXmlHandle docHandle( & doc );
+  TiXmlElement * pElem;
+  TiXmlHandle hRoot( 0 );
+  
+  pElem = docHandle.FirstChildElement().Element();
+  hRoot = TiXmlHandle( pElem );
+  
+  if ( !pElem ) { 
+    log_->fatal( fileName + " cannot read first node." );  
+    return;  
+  }
+  
+  if ( strcmp( "container", pElem->Value() ) != 0 ) { 
+    log_->fatal( fileName + " is no resource description" ); 
+    return; 
+  }
+
+  TiXmlElement * pElemName;
+  TiXmlElement * pElemFile;
+
+  for ( pElem = hRoot.FirstChild( "sound" ).Element(); pElem != 0; pElem = pElem->NextSiblingElement("sound") ) {
+    pElemName = pElem->FirstChildElement( "name" );
+    pElemFile =  pElem->FirstChildElement( "file" );
+    if ( pElemName && pElemFile )  {
+
+      mapSounds_[ pElemName->FirstChild()->Value() ] = 
+	ResourceManager::getSingleton().findFullFileName( pElemFile->FirstChild()->Value() );
+      log_->info( std::string( "sound: " ) + pElemName->FirstChild()->Value() + "->" + pElemFile->FirstChild()->Value() );
+    }
+  }
+}
+
+OpenALSoundSource * OpenALSoundManager::createSoundSource( const std::string & fileName, const std::string & name, bool loop ){
+  OpenALSoundSource * sound = NULL;
+
+  if ( haveSoundDevice_ ){
+    if ( mapSoundSources_.count( name ) ){
+      log_->warn( "Sound with name: " + name + " allready registered." );
+      return NULL;
+    } else {
+      sound = new OpenALSoundSource( this, name );
+      mapSoundSources_[ name ] = sound;
+    }
+    
+    uint * buffer = NULL;
+    if ( mapAudioBuffers_.count( name ) ){
+      buffer = mapAudioBuffers_[ name ];
+    } else {
+      buffer = new uint;
+      alGenBuffers( 1, buffer );
+      mapAudioBuffers_[ name ] = buffer;
+      if ( checkOpenALError( "OpenALSoundManager::createSound::alGenBuffers" ) ) return false;
+      if ( ! loadAndAssignAudio( fileName, *buffer ) ) return NULL; 
+    }
+    
+    alGenSources( 1, sound->refSound() ); 
+    if ( checkOpenALError( "OpenALSoundManager::createSound::alGenSources" ) ) return false; 
+    
+    alSourcei( *sound->refSound(), AL_BUFFER, *buffer );
+    if ( checkOpenALError( "OpenALSoundManager::createSound::alSourcei" ) ) return false; 
+    alSourcei( *sound->refSound(), AL_LOOPING, loop );
+  }
+
+  return sound;
+}
+
+OpenALSoundSource * OpenALSoundManager::createSoundSourceFromRessource( const std::string & ressourceName, 
+									const std::string & name, bool loop  ){
+  return createSoundSource( soundFileName( ressourceName ), name, loop );
+}
+
+void OpenALSoundManager::destroySoundSource( OpenALSoundSource * sound ){
+  if ( sound ){
+    sound->stop();
+    alSourcei(*sound->refSound(), AL_BUFFER, 0);
+    alDeleteSources(1, sound->refSound() );
+    checkOpenALError( "OpenALSoundManager::destroySoundSource::alDeleteSources" );
+
+    uint * bufferID = mapAudioBuffers_[ sound->name() ] ;
+    alDeleteBuffers( 1, bufferID );
+    checkOpenALError( "OpenALSoundManager::destroySoundSource::alDeleteBuffers" );
+
+    mapAudioBuffers_.erase( sound->name() );
+    delete bufferID;
+
+    mapSoundSources_.erase( sound->name() );
+    delete sound;
+  }
+}
+
+void OpenALSoundManager::destroySoundSource( const std::string & name ){
+  if ( mapSoundSources_.count( name ) ) {
+    destroySoundSource( mapSoundSources_[ name ] );
+  } else {
+    log_->warn( "OpenALSoundManager::destroySoundSource: ressource with name " + name + " does not exist." );
+  }
+}
+
+void OpenALSoundManager::listAvailableExtensions( std::ostream & str ){
+  log_->info( "Sound extensions available: " );
+  if ( oggVorbisExtension_ ){
+    log_->info( "\t OggVorbis extension available: TRUE" );
+  } else log_->info( "\t OggVorbis extension available: FAIL" );
+  
+  if ( mp3Extension_ == AL_TRUE ){
+    log_->info( "\t mp3 extension available: TRUE" );
+  } else  log_->info( "\t mp3 extension available: FAIL" );
+}
+  
+bool OpenALSoundManager::checkOpenAlutError( const std::string & str ){
+  ALenum error = alGetError();
+  if ( error == AL_NO_ERROR ) return false;
+  log_->warn( "Error: " + str + " " + toStr( error ) +
+	      "Al: " + alGetErrorString( error ) +
+	      "Alut: " + alutGetErrorString( error ) );
+  return true;
+}
+
+bool OpenALSoundManager::checkOpenALError( const std::string & str ){
+  ALenum error = alGetError();
+  if ( error == AL_NO_ERROR ) return false;
+  log_->warn( "Error: " + str + " " + toStr( error ) + alGetErrorString( error ) );
+  return true;
+}
+
+std::string OpenALSoundManager::alGetErrorString( int error ) const	{
+  switch( error ) {
+  case AL_INVALID_VALUE:     return "AL_INVALID_VALUE: The value pointer given is not valid";	
+  case AL_INVALID_ENUM:	     return "AL_INVALID_ENUM: The specified parameter is not valid";	
+  case AL_INVALID_NAME:	     return "AL_INVALID_NAME: The specified source name is not valid"; 
+  case AL_INVALID_OPERATION: return "AL_INVALID_OPERATION: There is no current context";
+//   case OV_EREAD:	     return "Read from media.";
+//   case OV_ENOTVORBIS:        return "Not Vorbis data.";
+//   case OV_EVERSION:          return "Vorbis version mismatch.";
+//   case OV_EBADHEADER:        return "Invalid Vorbis header.";
+//   case OV_EFAULT:            return "Internal logic fault (bug or heap/stack corruption.";
+  default: return "Unknown Error"; break;	
+  }
+}
+
+std::string OpenALSoundManager::soundFileName( const std::string & name ) { 
+  if ( mapSounds_.count( name ) ) return mapSounds_[ name ];
+  log_->warn( "Warning! there is no sound associated to the symbolic name: " + name );
+  return "unknown";
+}
+
+bool OpenALSoundManager::loadAndAssignAudio( const std::string & filename, uint buffer ){
+  alutGetError();
+  
+  ALenum	format = 0x0000; 
+  ALsizei	size = 0;
+  ALfloat	freq = 0.0; 
+  //  ALboolean	loop;
+  ALvoid*	data = NULL;
+  
+  if ( filename.rfind( ".ogg" ) != std::string::npos ){
+    //      AL_FORMAT_VORBIS_EXT = 0x10003;
+    format = 0x10003;
+
+    if ( !oggVorbisExtension_ ){
+      log_->warn( "Ogg extension in filename but no OggVorbis not supported" );
+      return false;
+    } else {
+
+      FILE *file = fopen ( filename.c_str(), "rb" );
+      if ( !file ) {
+	log_->warn( filename + ": " + strerror( errno ) );
+	return false;
+      }
+      
+      struct stat sbuf;
+      if ( stat( filename.c_str(), &sbuf) != -1 ) {
+	size = sbuf.st_size;
+	data = malloc( size );
+      }
+      
+      fread( data, 1, (size), file );
+    }
+  } else {  //** no oggVorbis using alut to determine audio type automically;
+
+    data = alutLoadMemoryFromFile(filename.c_str(), &format, &size, &freq);
+    if ( !data ){
+      log_->warn( "Audio file: " + filename + " : " + alutGetErrorString( alutGetError() ) );
+      return false;
+    } else {
+      log_->info( "Audio info: " + filename + " format: " + toStr( format ) +
+		  " size: " + toStr( size ) + " freq: " + toStr( freq ) );
+    }
+  }
+
+  // Copy the audio data into the buffer
+  alBufferData( buffer, format, data, size, (int)freq ); 
+  if ( checkOpenALError( "loadAndAssignWAV::alBufferData" ) ){
+    return false; 
+  }
+  
+  free( data );
+  
+  return true;
+}
+  
+int OpenALSoundManager::getMaxSources_(){
+  uint source;
+  std::vector< uint> sources;
+
+  uint numSources = 0;
+  while ( alGetError() == AL_NO_ERROR && numSources < maxSources_){
+    source = 0;
+    alGenSources( 1, &source );
+    if ( source != 0 ){
+      sources.push_back( source );
+      numSources++;
+    } else {
+      alGetError();
+      break;
+    }
+  }
+  for( uint i = 0; i < sources.size(); i++) alDeleteSources( 1, &sources[ i ] );
+  
+  return numSources;
+}
+
+OpenALSoundManager & OpenALSoundManager::getSingleton( ){
+  assert( ms_Singleton );
+  return ( *ms_Singleton );
+}
+
+OpenALSoundManager * OpenALSoundManager::getSingletonPtr( ){
+  if ( ms_Singleton == NULL ){
+    std::cerr << "OpenALSoundManager not initialized."  << std::endl;
+  }
+  return ms_Singleton;
+}
+
+} // namespace OpenGate

Copied: branches/ogsector/src/OpenALSoundManager.h (from rev 701, branches/ogsector/src/openALSoundManager.h)
===================================================================
--- branches/ogsector/src/OpenALSoundManager.h	                        (rev 0)
+++ branches/ogsector/src/OpenALSoundManager.h	2007-08-31 20:19:41 UTC (rev 707)
@@ -0,0 +1,171 @@
+/***************************************************************************
+ *   Copyright (C) 2006-2007 by OpenGate development team                  *
+ *   spo...@us...                                       *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+
+#ifndef _OPENGATE_OPENALSOUNDMANAGER__H
+#define _OPENGATE_OPENALSOUNDMANAGER__H
+
+#include <string>
+#include <iostream>
+#include <map>
+
+#include <OgreVector3.h>
+#include <OgreSingleton.h>
+
+#include <AL/alut.h>
+
+namespace OpenGate {
+
+class OpenALSoundManager;
+class LogManager;
+
+class OpenALSoundSource{
+public:
+  OpenALSoundSource( OpenALSoundManager * soundMgr, const std::string & name ) : soundMgr_( soundMgr ), name_( name ){
+    position_ = Ogre::Vector3::ZERO;
+  }
+  ~OpenALSoundSource(){}
+
+  bool play();
+  bool stop();
+
+  bool setPosition( float x, float y, float z );
+  bool setPosition( const Ogre::Vector3 & pos );
+
+  bool setVelocity( float x, float y, float z );
+  bool setVelocity( const Ogre::Vector3 & vel);
+
+  bool setDirection( float x, float y, float z );
+  bool setDirection( const Ogre::Vector3 & dir);
+
+  uint * refSound( ){ return &sourceID_; }
+
+  std::string name () const { return name_; }
+
+protected:
+  OpenALSoundManager * soundMgr_;
+  std::string name_;
+
+  Ogre::Vector3 position_;
+  Ogre::Vector3 velocity_;
+  Ogre::Vector3 direction_;
+  uint sourceID_;
+};
+
+
+/*! OpenALListener, there is just one. YOU! respectivly your avatar. */
+class OpenALListener{
+public:
+  OpenALListener( OpenALSoundManager * soundMgr );
+  ~OpenALListener();
+  
+  bool setPosition( float x, float y, float z );
+  bool setPosition( const Ogre::Vector3 & pos);
+
+  bool setVelocity( float x, float y, float z );
+  bool setVelocity( const Ogre::Vector3 & vel);
+
+  bool setOrientation( float xf, float yf, float zf, float xu, float yu, float zu );
+  bool setOrientation( const Ogre::Vector3 & front, const Ogre::Vector3 & up);
+  
+  void reset( );
+
+protected:
+  OpenALSoundManager * soundMgr_;
+  Ogre::Vector3 position_;
+  Ogre::Vector3 velocity_;
+  Ogre::Vector3 directionFront_;  
+  Ogre::Vector3 directionUp_;  
+  float orientation_[ 6 ];
+};
+
+
+/*!
+ * \brief The soundmanager based on OpenAL
+ *
+ * The soundmanager is used to play sounds.
+ * \author Carsten <spo...@us...>
+ */
+
+class OpenALSoundManager : public Ogre::Singleton< OpenALSoundManager >{
+
+public:
+  OpenALSoundManager( );
+
+  ~OpenALSoundManager();
+
+  bool init();
+
+  void loadRessourceNames( const std::string & fileName );
+
+
+  OpenALSoundSource * createSoundSource( const std::string & fileName, const std::string & name, bool loop = false  );
+
+  OpenALSoundSource * createSoundSourceFromRessource( const std::string & ressourceName, 
+						      const std::string & name, bool loop = false  );
+
+  void destroySoundSource( OpenALSoundSource * sound );
+    
+  void destroySoundSource( const std::string & name );
+
+  void listAvailableExtensions( std::ostream & str = std::cout );
+
+  bool checkOpenAlutError( const std::string & str );
+
+  bool checkOpenALError( const std::string & str );
+
+  std::string alGetErrorString( int error ) const;
+
+  bool loadAndAssignAudio( const std::string & filename, uint buffer );
+
+  inline OpenALListener * listener( ) { return listener_; }
+
+  inline OpenALListener listener( ) const { return *listener_; }
+
+  inline OpenALSoundSource * sound( const std::string & name ) { 
+    if ( mapSoundSources_.count( name ) ) return mapSoundSources_[ name ];
+    return NULL;
+  }
+
+  std::string soundFileName( const std::string & name );
+
+  static OpenALSoundManager & getSingleton( );
+
+  static OpenALSoundManager * getSingletonPtr( );
+
+protected:
+  int getMaxSources_();
+
+  uint maxSources_;
+
+  OpenALListener * listener_;
+  std::map < std::string, uint * > mapAudioBuffers_;
+  std::map < std::string, OpenALSoundSource * > mapSoundSources_;
+  std::map < std::string, std::string > mapSounds_;
+
+  bool mp3Extension_;
+  bool oggVorbisExtension_;
+
+  LogManager * log_;
+  bool haveSoundDevice_;
+};
+
+} // namespace Opengate
+
+#endif // _OPENGATE_OPENALSOUNDMANAGER__H

Modified: branches/ogsector/src/ResourceManager.cpp
===================================================================
--- branches/ogsector/src/ResourceManager.cpp	2007-08-31 13:47:36 UTC (rev 706)
+++ branches/ogsector/src/ResourceManager.cpp	2007-08-31 20:19:41 UTC (rev 707)
@@ -38,6 +38,7 @@
   ogreRoot      = NULL;
   renderWindow  = NULL;
   inputManager  = NULL;
+  soundManager  = NULL;
   guiRenderer   = NULL;
   guiSystem     = NULL;
   console       = NULL;

Modified: branches/ogsector/src/ResourceManager.h
===================================================================
--- branches/ogsector/src/ResourceManager.h	2007-08-31 13:47:36 UTC (rev 706)
+++ branches/ogsector/src/ResourceManager.h	2007-08-31 20:19:41 UTC (rev 707)
@@ -41,6 +41,7 @@
 class NetworkClient;
 class InputManager;
 class LogManager;
+class OpenALSoundManager;
 class GameState;
 class GameStateManager;
 class Avatar;
@@ -57,6 +58,7 @@
   CEGUI::OgreCEGUIRenderer * guiRenderer;
   CEGUI::System            * guiSystem;
   InputManager             * inputManager;
+  OpenALSoundManager       * soundManager;
   NetworkClient            * network;
   Console                  * console;
   GameStateManager         * gameStateRoot;

Modified: branches/ogsector/src/SectorObjects.cpp
===================================================================
--- branches/ogsector/src/SectorObjects.cpp	2007-08-31 13:47:36 UTC (rev 706)
+++ branches/ogsector/src/SectorObjects.cpp	2007-08-31 20:19:41 UTC (rev 707)
@@ -35,6 +35,38 @@
 
 namespace OpenGate{
 
+GunObject::GunObject( Gun * gun, SectorObject * parent, Ogre::SceneNode * mountPoint, Uint32 & capacity ) 
+  : gun_( gun ), parent_( parent ), mountPoint_( mountPoint ), capacity_( &capacity ) {
+  delayTime_ = 0;
+  gunSound_ = OpenALSoundManager::getSingleton().createSoundSourceFromRessource( "sounds/defaultLaser", 
+										 mountPoint->getName() + "/Sound" );
+}
+
+GunObject::~GunObject(){
+  OpenALSoundManager::getSingleton().destroySoundSource( gunSound_ );
+}
+
+void GunObject::update( const Ogre::Real elapsedTime ){
+  delayTime_ -= elapsedTime;
+}
+
+bool GunObject::fire(){
+  if ( delayTime_ < 0 ){
+    if ( *capacity_ > gun_->powerConsumption() ){
+      *capacity_ -= gun_->powerConsumption();
+      delayTime_ = gun_->fireDelay();
+      if (  gunSound_ ){
+	gunSound_->setPosition( mountPoint_->getWorldPosition() );
+	//gunSound_->setVelocity( parent_->velocity() );
+	//	gunSound_->setDirection( parent_->mainNode()->getOrientation().zAxis() );
+	gunSound_->play();
+      }
+      return true;
+    }
+  }
+  return false;
+}
+  
 BaseObject::BaseObject( const Ogre::String & name, Sector * sector, int userID, int childID  )
   : name_( name ), sector_( sector ), userID_( userID ), childID_( childID ), mainNode_( NULL ){
   globalID_ = createGlobalID( userID,  childID );
@@ -165,8 +197,8 @@
 
       Ogre::SceneNode * mountPoint = mainNodeEntityRot_->createChildSceneNode( name_ + "_GunMountPoint" + toStr( i ) );
 
-      GunObject *gun = new GunObject( EquipmentManager::getSingleton().gun( "Bender" ), mountPoint, capacity_ );
-
+      GunObject *gun = new GunObject( EquipmentManager::getSingleton().gun( "Bender" ), this, mountPoint, capacity_ );
+      
       mountPoint->setPosition( it->second[ i ] );
       activeGuns_.push_back( gun );
     }
@@ -765,9 +797,18 @@
   lightNode_ = mainNode_->createChildSceneNode( "AvatarLightNode" );
   lightNode_->translate(50,0,10);
   lightNode_->attachObject( l );
+
+  if ( OpenALSoundManager::getSingleton().listener() ){
+    soundListener_ = OpenALSoundManager::getSingleton().listener();
+  }
+  soundBackround_ = OpenALSoundManager::getSingleton().createSoundSourceFromRessource( "sounds/undocked/defaultMusic",
+										       name + "/Sound/Background/", true);
+  if ( soundBackround_ ) soundBackround_->play();
 }
 
 SectorObjectAvatar::~SectorObjectAvatar(){
+  OpenALSoundManager::getSingleton().destroySoundSource( soundBackround_ );
+
   if ( flightArrowNode_ ){
     sceneMgr_->destroyEntity( name_ + "_FlightArrow_entity" );
     flightArrowNode_->removeAndDestroyChild( name_ + "_FlightArrow_trans" );
@@ -798,6 +839,13 @@
 
 bool SectorObjectAvatar::update( Ogre::Real elapsedTime ){
   updatePowerGrid( elapsedTime );
+  if ( soundListener_ ){
+    soundListener_->setPosition( mainNode_->getWorldPosition() );
+    soundListener_->setVelocity( vel_ );
+    soundListener_->setOrientation( mainNode_->getWorldOrientation().zAxis(),
+				    mainNode_->getWorldOrientation().yAxis() );
+  }
+  if ( soundBackround_ ) soundBackround_->setPosition( mainNode_->getWorldPosition() );
   return SectorObjectMoveableLocal::update( elapsedTime );
 }
 

Modified: branches/ogsector/src/SectorObjects.h
===================================================================
--- branches/ogsector/src/SectorObjects.h	2007-08-31 13:47:36 UTC (rev 706)
+++ branches/ogsector/src/SectorObjects.h	2007-08-31 20:19:41 UTC (rev 707)
@@ -27,6 +27,7 @@
 #include "common.h"
 #include "networkProtocol.h"
 #include "VesselManager.h"
+#include "OpenALSoundManager.h"
 
 namespace OgreOpcode{
   class CollisionObject;
@@ -44,47 +45,39 @@
 
 class Sector;
 class Projectile;
+class SectorObject;
 class OpcodeCollisionDetection;
 
 class GunObject{
 public:
-  GunObject( Gun * gun, Ogre::SceneNode * mountPoint, Uint32 & capacity ) 
-    : gun_( gun ), mountPoint_( mountPoint ), capacity_( &capacity ) {
-    delayTime_ = 0;
-  }
-  ~GunObject( ) { }
+  GunObject( Gun * gun, SectorObject * parent, Ogre::SceneNode * mountPoint, Uint32 & capacity ); 
 
-  void update( const Ogre::Real elapsedTime ){
-    delayTime_ -= elapsedTime;
-  }
+  ~GunObject( );
 
-  bool fire(){
-    if ( delayTime_ < 0 ){
-      if ( *capacity_ > gun_->powerConsumption() ){
-	*capacity_ -= gun_->powerConsumption();
-	delayTime_ = gun_->fireDelay();
-	return true;
-      }
-    }
-    return false;
-  }
+  void update( const Ogre::Real elapsedTime );
 
-  Gu...
 
[truncated message content]

[Opengate-svn] SF.net SVN: opengate: [717] trunk/data

[<ult...@us...>]

Revision: 717
          http://opengate.svn.sourceforge.net/opengate/?rev=717&view=rev
Author:   ultrasick
Date:     2007-09-04 06:00:29 -0700 (Tue, 04 Sep 2007)

Log Message:
-----------
replacing old *76x76.png and *290x290.png-image format with the new *_small.png and *_big.png-image format

the check for *76x76.png and *290x290.png-images can be removed from the code now

Added Paths:
-----------
    trunk/data/capacitors/deepol_big.png
    trunk/data/capacitors/deepol_small.png
    trunk/data/capacitors/germ_big.png
    trunk/data/capacitors/germ_small.png
    trunk/data/capacitors/jar_big.png
    trunk/data/capacitors/jar_small.png
    trunk/data/capacitors/lifeline_big.png
    trunk/data/capacitors/lifeline_small.png
    trunk/data/capacitors/mantra_big.png
    trunk/data/capacitors/mantra_small.png
    trunk/data/capacitors/outlet_big.png
    trunk/data/capacitors/outlet_small.png
    trunk/data/capacitors/quadro_big.png
    trunk/data/capacitors/quadro_small.png
    trunk/data/capacitors/sponge_big.png
    trunk/data/capacitors/sponge_small.png
    trunk/data/capacitors/summoner_big.png
    trunk/data/capacitors/summoner_small.png
    trunk/data/capacitors/t-c-15_big.png
    trunk/data/capacitors/t-c-15_small.png
    trunk/data/capacitors/tank_big.png
    trunk/data/capacitors/tank_small.png
    trunk/data/commodities/aluminium_big.png
    trunk/data/commodities/aluminium_small.png
    trunk/data/commodities/ammunition_big.png
    trunk/data/commodities/ammunition_small.png
    trunk/data/commodities/antimony_big.png
    trunk/data/commodities/antimony_small.png
    trunk/data/commodities/armor_big.png
    trunk/data/commodities/armor_small.png
    trunk/data/commodities/cesium_big.png
    trunk/data/commodities/cesium_small.png
    trunk/data/commodities/chemicals_big.png
    trunk/data/commodities/chemicals_small.png
    trunk/data/commodities/chromium_big.png
    trunk/data/commodities/chromium_small.png
    trunk/data/commodities/copper_big.png
    trunk/data/commodities/copper_small.png
    trunk/data/commodities/cpus_big.png
    trunk/data/commodities/cpus_small.png
    trunk/data/commodities/fuel_cells_big.png
    trunk/data/commodities/fuel_cells_small.png
    trunk/data/commodities/gold_big.png
    trunk/data/commodities/gold_small.png
    trunk/data/commodities/helium_big.png
    trunk/data/commodities/helium_small.png
    trunk/data/commodities/ice_big.png
    trunk/data/commodities/ice_small.png
    trunk/data/commodities/iron_big.png
    trunk/data/commodities/iron_small.png
    trunk/data/commodities/laser_components_big.png
    trunk/data/commodities/laser_components_small.png
    trunk/data/commodities/manufactured_foods_big.png
    trunk/data/commodities/manufactured_foods_small.png
    trunk/data/commodities/medical_supplies_big.png
    trunk/data/commodities/medical_supplies_small.png
    trunk/data/commodities/nitrogen_big.png
    trunk/data/commodities/nitrogen_small.png
    trunk/data/commodities/octavia_light_big.png
    trunk/data/commodities/octavia_light_small.png
    trunk/data/commodities/organic_foods_big.png
    trunk/data/commodities/organic_foods_small.png
    trunk/data/commodities/prostheses_big.png
    trunk/data/commodities/prostheses_small.png
    trunk/data/commodities/ram_big.png
    trunk/data/commodities/ram_small.png
    trunk/data/commodities/rubber_big.png
    trunk/data/commodities/rubber_small.png
    trunk/data/commodities/squadrok_biomass_big.png
    trunk/data/commodities/squadrok_biomass_small.png
    trunk/data/commodities/tauseti_flashback_big.png
    trunk/data/commodities/tauseti_flashback_small.png
    trunk/data/commodities/unsigned_box_big.png
    trunk/data/commodities/unsigned_box_small.png
    trunk/data/commodities/water_big.png
    trunk/data/commodities/water_small.png
    trunk/data/commodities/xenon_big.png
    trunk/data/commodities/xenon_small.png
    trunk/data/commodities/zinc_big.png
    trunk/data/commodities/zinc_small.png
    trunk/data/engines/money_big.png
    trunk/data/engines/money_small.png
    trunk/data/engines/t-e-15_big.png
    trunk/data/engines/t-e-15_small.png
    trunk/data/guns/bender_big.png
    trunk/data/guns/bender_small.png
    trunk/data/guns/duster_big.png
    trunk/data/guns/duster_small.png
    trunk/data/guns/excavator_big.png
    trunk/data/guns/excavator_small.png
    trunk/data/guns/liar_big.png
    trunk/data/guns/liar_small.png
    trunk/data/guns/t-g-28_big.png
    trunk/data/guns/t-g-28_small.png
    trunk/data/power_plants/contender_big.png
    trunk/data/power_plants/contender_small.png
    trunk/data/power_plants/contender_xl_big.png
    trunk/data/power_plants/contender_xl_small.png
    trunk/data/power_plants/contender_xpr_big.png
    trunk/data/power_plants/contender_xpr_small.png
    trunk/data/power_plants/gatherer_big.png
    trunk/data/power_plants/gatherer_small.png
    trunk/data/power_plants/spud_big.png
    trunk/data/power_plants/spud_small.png
    trunk/data/power_plants/t-p-16_big.png
    trunk/data/power_plants/t-p-16_small.png
    trunk/data/radars/cyclops_big.png
    trunk/data/radars/cyclops_small.png
    trunk/data/radars/hall_monitor_big.png
    trunk/data/radars/hall_monitor_small.png
    trunk/data/radars/knocker_big.png
    trunk/data/radars/knocker_small.png
    trunk/data/radars/night_watchman_big.png
    trunk/data/radars/night_watchman_small.png
    trunk/data/radars/outlook_big.png
    trunk/data/radars/outlook_small.png
    trunk/data/radars/t-r-9_big.png
    trunk/data/radars/t-r-9_small.png
    trunk/data/shields/alpaa_big.png
    trunk/data/shields/alpaa_small.png
    trunk/data/shields/flatiron_big.png
    trunk/data/shields/flatiron_small.png
    trunk/data/shields/himelea_big.png
    trunk/data/shields/himelea_small.png
    trunk/data/shields/kydango_big.png
    trunk/data/shields/kydango_small.png
    trunk/data/shields/pod_big.png
    trunk/data/shields/pod_small.png
    trunk/data/shields/shelter_big.png
    trunk/data/shields/shelter_small.png
    trunk/data/shields/t-s-13_big.png
    trunk/data/shields/t-s-13_small.png

Removed Paths:
-------------
    trunk/data/capacitors/deepol_290x290.png
    trunk/data/capacitors/deepol_76x76.png
    trunk/data/capacitors/germ_290x290.png
    trunk/data/capacitors/germ_76x76.png
    trunk/data/capacitors/jar_290x290.png
    trunk/data/capacitors/jar_76x76.png
    trunk/data/capacitors/lifeline_290x290.png
    trunk/data/capacitors/lifeline_76x76.png
    trunk/data/capacitors/mantra_290x290.png
    trunk/data/capacitors/mantra_76x76.png
    trunk/data/capacitors/outlet_290x290.png
    trunk/data/capacitors/outlet_76x76.png
    trunk/data/capacitors/quadro_290x290.png
    trunk/data/capacitors/quadro_76x76.png
    trunk/data/capacitors/sponge_290x290.png
    trunk/data/capacitors/sponge_76x76.png
    trunk/data/capacitors/summoner_290x290.png
    trunk/data/capacitors/summoner_76x76.png
    trunk/data/capacitors/t-c-15_290x290.png
    trunk/data/capacitors/t-c-15_76x76.png
    trunk/data/capacitors/tank_290x290.png
    trunk/data/capacitors/tank_76x76.png
    trunk/data/commodities/aluminium_290x290.png
    trunk/data/commodities/aluminium_76x76.png
    trunk/data/commodities/ammunition_290x290.png
    trunk/data/commodities/ammunition_76x76.png
    trunk/data/commodities/antimony_290x290.png
    trunk/data/commodities/antimony_76x76.png
    trunk/data/commodities/armor_290x290.png
    trunk/data/commodities/armor_76x76.png
    trunk/data/commodities/cesium_290x290.png
    trunk/data/commodities/cesium_76x76.png
    trunk/data/commodities/chemicals_290x290.png
    trunk/data/commodities/chemicals_76x76.png
    trunk/data/commodities/chromium_290x290.png
    trunk/data/commodities/chromium_76x76.png
    trunk/data/commodities/copper_290x290.png
    trunk/data/commodities/copper_76x76.png
    trunk/data/commodities/cpus_290x290.png
    trunk/data/commodities/cpus_76x76.png
    trunk/data/commodities/fuel_cells_290x290.png
    trunk/data/commodities/fuel_cells_76x76.png
    trunk/data/commodities/gold_290x290.png
    trunk/data/commodities/gold_76x76.png
    trunk/data/commodities/helium_290x290.png
    trunk/data/commodities/helium_76x76.png
    trunk/data/commodities/ice_290x290.png
    trunk/data/commodities/ice_76x76.png
    trunk/data/commodities/iron_290x290.png
    trunk/data/commodities/iron_76x76.png
    trunk/data/commodities/laser_components_290x290.png
    trunk/data/commodities/laser_components_76x76.png
    trunk/data/commodities/manufactured_foods_290x290.png
    trunk/data/commodities/manufactured_foods_76x76.png
    trunk/data/commodities/medical_supplies_290x290.png
    trunk/data/commodities/medical_supplies_76x76.png
    trunk/data/commodities/nitrogen_290x290.png
    trunk/data/commodities/nitrogen_76x76.png
    trunk/data/commodities/octavia_light_290x290.png
    trunk/data/commodities/octavia_light_76x76.png
    trunk/data/commodities/organic_foods_290x290.png
    trunk/data/commodities/organic_foods_76x76.png
    trunk/data/commodities/prostheses_290x290.png
    trunk/data/commodities/prostheses_76x76.png
    trunk/data/commodities/ram_290x290.png
    trunk/data/commodities/ram_76x76.png
    trunk/data/commodities/rubber_290x290.png
    trunk/data/commodities/rubber_76x76.png
    trunk/data/commodities/squadrok_biomass_290x290.png
    trunk/data/commodities/squadrok_biomass_76x76.png
    trunk/data/commodities/tauseti_flashback_290x290.png
    trunk/data/commodities/tauseti_flashback_76x76.png
    trunk/data/commodities/unsigned_box_290x290.png
    trunk/data/commodities/unsigned_box_76x76.png
    trunk/data/commodities/water_290x290.png
    trunk/data/commodities/water_76x76.png
    trunk/data/commodities/xenon_290x290.png
    trunk/data/commodities/xenon_76x76.png
    trunk/data/commodities/zinc_290x290.png
    trunk/data/commodities/zinc_76x76.png
    trunk/data/engines/money_290x290.png
    trunk/data/engines/money_76x76.png
    trunk/data/engines/t-e-15_290x290.png
    trunk/data/engines/t-e-15_76x76.png
    trunk/data/guns/bender_290x290.png
    trunk/data/guns/bender_76x76.png
    trunk/data/guns/duster_290x290.png
    trunk/data/guns/duster_76x76.png
    trunk/data/guns/excavator_290x290.png
    trunk/data/guns/excavator_76x76.png
    trunk/data/guns/liar_290x290.png
    trunk/data/guns/liar_76x76.png
    trunk/data/guns/t-g-28_290x290.png
    trunk/data/guns/t-g-28_76x76.png
    trunk/data/power_plants/contender_290x290.png
    trunk/data/power_plants/contender_76x76.png
    trunk/data/power_plants/contender_xl_290x290.png
    trunk/data/power_plants/contender_xl_76x76.png
    trunk/data/power_plants/contender_xpr_290x290.png
    trunk/data/power_plants/contender_xpr_76x76.png
    trunk/data/power_plants/gatherer_290x290.png
    trunk/data/power_plants/gatherer_76x76.png
    trunk/data/power_plants/spud_290x290.png
    trunk/data/power_plants/spud_76x76.png
    trunk/data/power_plants/t-p-16_290x290.png
    trunk/data/power_plants/t-p-16_76x76.png
    trunk/data/radars/cyclops_290x290.png
    trunk/data/radars/cyclops_76x76.png
    trunk/data/radars/hall_monitor_290x290.png
    trunk/data/radars/hall_monitor_76x76.png
    trunk/data/radars/knocker_290x290.png
    trunk/data/radars/knocker_76x76.png
    trunk/data/radars/night_watchman_290x290.png
    trunk/data/radars/night_watchman_76x76.png
    trunk/data/radars/outlook_290x290.png
    trunk/data/radars/outlook_76x76.png
    trunk/data/radars/t-r-9_290x290.png
    trunk/data/radars/t-r-9_76x76.png
    trunk/data/shields/alpaa_290x290.png
    trunk/data/shields/alpaa_76x76.png
    trunk/data/shields/flatiron_290x290.png
    trunk/data/shields/flatiron_76x76.png
    trunk/data/shields/himelea_290x290.png
    trunk/data/shields/himelea_76x76.png
    trunk/data/shields/kydango_290x290.png
    trunk/data/shields/kydango_76x76.png
    trunk/data/shields/pod_290x290.png
    trunk/data/shields/pod_76x76.png
    trunk/data/shields/shelter_290x290.png
    trunk/data/shields/shelter_76x76.png
    trunk/data/shields/t-s-13_290x290.png
    trunk/data/shields/t-s-13_76x76.png

Deleted: trunk/data/capacitors/deepol_290x290.png
===================================================================
(Binary files differ)

Deleted: trunk/data/capacitors/deepol_76x76.png
===================================================================
(Binary files differ)

Added: trunk/data/capacitors/deepol_big.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/capacitors/deepol_big.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/capacitors/deepol_small.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/capacitors/deepol_small.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: trunk/data/capacitors/germ_290x290.png
===================================================================
(Binary files differ)

Deleted: trunk/data/capacitors/germ_76x76.png
===================================================================
(Binary files differ)

Added: trunk/data/capacitors/germ_big.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/capacitors/germ_big.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/capacitors/germ_small.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/capacitors/germ_small.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: trunk/data/capacitors/jar_290x290.png
===================================================================
(Binary files differ)

Deleted: trunk/data/capacitors/jar_76x76.png
===================================================================
(Binary files differ)

Added: trunk/data/capacitors/jar_big.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/capacitors/jar_big.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/capacitors/jar_small.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/capacitors/jar_small.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: trunk/data/capacitors/lifeline_290x290.png
===================================================================
(Binary files differ)

Deleted: trunk/data/capacitors/lifeline_76x76.png
===================================================================
(Binary files differ)

Added: trunk/data/capacitors/lifeline_big.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/capacitors/lifeline_big.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/capacitors/lifeline_small.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/capacitors/lifeline_small.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: trunk/data/capacitors/mantra_290x290.png
===================================================================
(Binary files differ)

Deleted: trunk/data/capacitors/mantra_76x76.png
===================================================================
(Binary files differ)

Added: trunk/data/capacitors/mantra_big.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/capacitors/mantra_big.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/capacitors/mantra_small.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/capacitors/mantra_small.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: trunk/data/capacitors/outlet_290x290.png
===================================================================
(Binary files differ)

Deleted: trunk/data/capacitors/outlet_76x76.png
===================================================================
(Binary files differ)

Added: trunk/data/capacitors/outlet_big.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/capacitors/outlet_big.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/capacitors/outlet_small.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/capacitors/outlet_small.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: trunk/data/capacitors/quadro_290x290.png
===================================================================
(Binary files differ)

Deleted: trunk/data/capacitors/quadro_76x76.png
===================================================================
(Binary files differ)

Added: trunk/data/capacitors/quadro_big.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/capacitors/quadro_big.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/capacitors/quadro_small.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/capacitors/quadro_small.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: trunk/data/capacitors/sponge_290x290.png
===================================================================
(Binary files differ)

Deleted: trunk/data/capacitors/sponge_76x76.png
===================================================================
(Binary files differ)

Added: trunk/data/capacitors/sponge_big.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/capacitors/sponge_big.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/capacitors/sponge_small.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/capacitors/sponge_small.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: trunk/data/capacitors/summoner_290x290.png
===================================================================
(Binary files differ)

Deleted: trunk/data/capacitors/summoner_76x76.png
===================================================================
(Binary files differ)

Added: trunk/data/capacitors/summoner_big.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/capacitors/summoner_big.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/capacitors/summoner_small.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/capacitors/summoner_small.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: trunk/data/capacitors/t-c-15_290x290.png
===================================================================
(Binary files differ)

Deleted: trunk/data/capacitors/t-c-15_76x76.png
===================================================================
(Binary files differ)

Added: trunk/data/capacitors/t-c-15_big.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/capacitors/t-c-15_big.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/capacitors/t-c-15_small.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/capacitors/t-c-15_small.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: trunk/data/capacitors/tank_290x290.png
===================================================================
(Binary files differ)

Deleted: trunk/data/capacitors/tank_76x76.png
===================================================================
(Binary files differ)

Added: trunk/data/capacitors/tank_big.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/capacitors/tank_big.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/capacitors/tank_small.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/capacitors/tank_small.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: trunk/data/commodities/aluminium_290x290.png
===================================================================
(Binary files differ)

Deleted: trunk/data/commodities/aluminium_76x76.png
===================================================================
(Binary files differ)

Added: trunk/data/commodities/aluminium_big.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/commodities/aluminium_big.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/commodities/aluminium_small.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/commodities/aluminium_small.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: trunk/data/commodities/ammunition_290x290.png
===================================================================
(Binary files differ)

Deleted: trunk/data/commodities/ammunition_76x76.png
===================================================================
(Binary files differ)

Added: trunk/data/commodities/ammunition_big.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/commodities/ammunition_big.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/commodities/ammunition_small.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/commodities/ammunition_small.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: trunk/data/commodities/antimony_290x290.png
===================================================================
(Binary files differ)

Deleted: trunk/data/commodities/antimony_76x76.png
===================================================================
(Binary files differ)

Added: trunk/data/commodities/antimony_big.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/commodities/antimony_big.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/commodities/antimony_small.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/commodities/antimony_small.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: trunk/data/commodities/armor_290x290.png
===================================================================
(Binary files differ)

Deleted: trunk/data/commodities/armor_76x76.png
===================================================================
(Binary files differ)

Added: trunk/data/commodities/armor_big.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/commodities/armor_big.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/commodities/armor_small.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/commodities/armor_small.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: trunk/data/commodities/cesium_290x290.png
===================================================================
(Binary files differ)

Deleted: trunk/data/commodities/cesium_76x76.png
===================================================================
(Binary files differ)

Added: trunk/data/commodities/cesium_big.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/commodities/cesium_big.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/commodities/cesium_small.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/commodities/cesium_small.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: trunk/data/commodities/chemicals_290x290.png
===================================================================
(Binary files differ)

Deleted: trunk/data/commodities/chemicals_76x76.png
===================================================================
(Binary files differ)

Added: trunk/data/commodities/chemicals_big.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/commodities/chemicals_big.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/commodities/chemicals_small.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/commodities/chemicals_small.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: trunk/data/commodities/chromium_290x290.png
===================================================================
(Binary files differ)

Deleted: trunk/data/commodities/chromium_76x76.png
===================================================================
(Binary files differ)

Added: trunk/data/commodities/chromium_big.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/commodities/chromium_big.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/commodities/chromium_small.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/commodities/chromium_small.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: trunk/data/commodities/copper_290x290.png
===================================================================
(Binary files differ)

Deleted: trunk/data/commodities/copper_76x76.png
===================================================================
(Binary files differ)

Added: trunk/data/commodities/copper_big.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/commodities/copper_big.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/commodities/copper_small.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/commodities/copper_small.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: trunk/data/commodities/cpus_290x290.png
===================================================================
(Binary files differ)

Deleted: trunk/data/commodities/cpus_76x76.png
===================================================================
(Binary files differ)

Added: trunk/data/commodities/cpus_big.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/commodities/cpus_big.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/commodities/cpus_small.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/commodities/cpus_small.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: trunk/data/commodities/fuel_cells_290x290.png
===================================================================
(Binary files differ)

Deleted: trunk/data/commodities/fuel_cells_76x76.png
===================================================================
(Binary files differ)

Added: trunk/data/commodities/fuel_cells_big.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/commodities/fuel_cells_big.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/commodities/fuel_cells_small.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/commodities/fuel_cells_small.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: trunk/data/commodities/gold_290x290.png
===================================================================
(Binary files differ)

Deleted: trunk/data/commodities/gold_76x76.png
===================================================================
(Binary files differ)

Added: trunk/data/commodities/gold_big.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/commodities/gold_big.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/commodities/gold_small.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/commodities/gold_small.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: trunk/data/commodities/helium_290x290.png
===================================================================
(Binary files differ)

Deleted: trunk/data/commodities/helium_76x76.png
===================================================================
(Binary files differ)

Added: trunk/data/commodities/helium_big.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/commodities/helium_big.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/commodities/helium_small.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/commodities/helium_small.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: trunk/data/commodities/ice_290x290.png
===================================================================
(Binary files differ)

Deleted: trunk/data/commodities/ice_76x76.png
===================================================================
(Binary files differ)

Added: trunk/data/commodities/ice_big.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/commodities/ice_big.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/commodities/ice_small.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/commodities/ice_small.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: trunk/data/commodities/iron_290x290.png
===================================================================
(Binary files differ)

Deleted: trunk/data/commodities/iron_76x76.png
===================================================================
(Binary files differ)

Added: trunk/data/commodities/iron_big.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/commodities/iron_big.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/commodities/iron_small.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/commodities/iron_small.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: trunk/data/commodities/laser_components_290x290.png
===================================================================
(Binary files differ)

Deleted: trunk/data/commodities/laser_components_76x76.png
===================================================================
(Binary files differ)

Added: trunk/data/commodities/laser_components_big.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/commodities/laser_components_big.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/commodities/laser_components_small.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/commodities/laser_components_small.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: trunk/data/commodities/manufactured_foods_290x290.png
===================================================================
(Binary files differ)

Deleted: trunk/data/commodities/manufactured_foods_76x76.png
===================================================================
(Binary files differ)

Added: trunk/data/commodities/manufactured_foods_big.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/commodities/manufactured_foods_big.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/commodities/manufactured_foods_small.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/commodities/manufactured_foods_small.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: trunk/data/commodities/medical_supplies_290x290.png
===================================================================
(Binary files differ)

Deleted: trunk/data/commodities/medical_supplies_76x76.png
===================================================================
(Binary files differ)

Added: trunk/data/commodities/medical_supplies_big.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/commodities/medical_supplies_big.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/commodities/medical_supplies_small.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/commodities/medical_supplies_small.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: trunk/data/commodities/nitrogen_290x290.png
===================================================================
(Binary files differ)

Deleted: trunk/data/commodities/nitrogen_76x76.png
===================================================================
(Binary files differ)

Added: trunk/data/commodities/nitrogen_big.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/commodities/nitrogen_big.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/commodities/nitrogen_small.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/commodities/nitrogen_small.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: trunk/data/commodities/octavia_light_290x290.png
===================================================================
(Binary files differ)

Deleted: trunk/data/commodities/octavia_light_76x76.png
===================================================================
(Binary files differ)

Added: trunk/data/commodities/octavia_light_big.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/commodities/octavia_light_big.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/commodities/octavia_light_small.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/commodities/octavia_light_small.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: trunk/data/commodities/organic_foods_290x290.png
===================================================================
(Binary files differ)

Deleted: trunk/data/commodities/organic_foods_76x76.png
===================================================================
(Binary files differ)

Added: trunk/data/commodities/organic_foods_big.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/commodities/organic_foods_big.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/commodities/organic_foods_small.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/commodities/organic_foods_small.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: trunk/data/commodities/prostheses_290x290.png
===================================================================
(Binary files differ)

Deleted: trunk/data/commodities/prostheses_76x76.png
===================================================================
(Binary files differ)

Added: trunk/data/commodities/prostheses_big.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/commodities/prostheses_big.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/commodities/prostheses_small.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/commodities/prostheses_small.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: trunk/data/commodities/ram_290x290.png
===================================================================
(Binary files differ)

Deleted: trunk/data/commodities/ram_76x76.png
===================================================================
(Binary files differ)

Added: trunk/data/commodities/ram_big.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/commodities/ram_big.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/commodities/ram_small.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/commodities/ram_small.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: trunk/data/commodities/rubber_290x290.png
===================================================================
(Binary files differ)

Deleted: trunk/data/commodities/rubber_76x76.png
===================================================================
(Binary files differ)

Added: trunk/data/commodities/rubber_big.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/commodities/rubber_big.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/commodities/rubber_small.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/commodities/rubber_small.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: trunk/data/commodities/squadrok_biomass_290x290.png
===================================================================
(Binary files differ)

Deleted: trunk/data/commodities/squadrok_biomass_76x76.png
===================================================================
(Binary files differ)

Added: trunk/data/commodities/squadrok_biomass_big.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/commodities/squadrok_biomass_big.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/commodities/squadrok_biomass_small.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/commodities/squadrok_biomass_small.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: trunk/data/commodities/tauseti_flashback_290x290.png
===================================================================
(Binary files differ)

Deleted: trunk/data/commodities/tauseti_flashback_76x76.png
===================================================================
(Binary files differ)

Added: trunk/data/commodities/tauseti_flashback_big.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/commodities/tauseti_flashback_big.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/commodities/tauseti_flashback_small.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/commodities/tauseti_flashback_small.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: trunk/data/commodities/unsigned_box_290x290.png
===================================================================
(Binary files differ)

Deleted: trunk/data/commodities/unsigned_box_76x76.png
===================================================================
(Binary files differ)

Added: trunk/data/commodities/unsigned_box_big.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/commodities/unsigned_box_big.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/commodities/unsigned_box_small.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/commodities/unsigned_box_small.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: trunk/data/commodities/water_290x290.png
===================================================================
(Binary files differ)

Deleted: trunk/data/commodities/water_76x76.png
===================================================================
(Binary files differ)

Added: trunk/data/commodities/water_big.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/commodities/water_big.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/commodities/water_small.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/commodities/water_small.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: trunk/data/commodities/xenon_290x290.png
===================================================================
(Binary files differ)

Deleted: trunk/data/commodities/xenon_76x76.png
===================================================================
(Binary files differ)

Added: trunk/data/commodities/xenon_big.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/commodities/xenon_big.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/commodities/xenon_small.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/commodities/xenon_small.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: trunk/data/commodities/zinc_290x290.png
===================================================================
(Binary files differ)

Deleted: trunk/data/commodities/zinc_76x76.png
===================================================================
(Binary files differ)

Added: trunk/data/commodities/zinc_big.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/commodities/zinc_big.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/commodities/zinc_small.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/commodities/zinc_small.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: trunk/data/engines/money_290x290.png
===================================================================
(Binary files differ)

Deleted: trunk/data/engines/money_76x76.png
===================================================================
(Binary files differ)

Added: trunk/data/engines/money_big.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/engines/money_big.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/engines/money_small.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/engines/money_small.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: trunk/data/engines/t-e-15_290x290.png
===================================================================
(Binary files differ)

Deleted: trunk/data/engines/t-e-15_76x76.png
===================================================================
(Binary files differ)

Added: trunk/data/engines/t-e-15_big.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/engines/t-e-15_big.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/engines/t-e-15_small.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/engines/t-e-15_small.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: trunk/data/guns/bender_290x290.png
===================================================================
(Binary files differ)

Deleted: trunk/data/guns/bender_76x76.png
===================================================================
(Binary files differ)

Added: trunk/data/guns/bender_big.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/guns/bender_big.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/guns/bender_small.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/guns/bender_small.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: trunk/data/guns/duster_290x290.png
===================================================================
(Binary files differ)

Deleted: trunk/data/guns/duster_76x76.png
===================================================================
(Binary files differ)

Added: trunk/data/guns/duster_big.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/guns/duster_big.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/guns/duster_small.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/guns/duster_small.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: trunk/data/guns/excavator_290x290.png
===================================================================
(Binary files differ)

Deleted: trunk/data/guns/excavator_76x76.png
===================================================================
(Binary files differ)

Added: trunk/data/guns/excavator_big.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/guns/excavator_big.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/guns/excavator_small.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/guns/excavator_small.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: trunk/data/guns/liar_290x290.png
===================================================================
(Binary files differ)

Deleted: trunk/data/guns/liar_76x76.png
===================================================================
(Binary files differ)

Added: trunk/data/guns/liar_big.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/guns/liar_big.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/guns/liar_small.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/guns/liar_small.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: trunk/data/guns/t-g-28_290x290.png
===================================================================
(Binary files differ)

Deleted: trunk/data/guns/t-g-28_76x76.png
===================================================================
(Binary files differ)

Added: trunk/data/guns/t-g-28_big.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/guns/t-g-28_big.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/guns/t-g-28_small.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/guns/t-g-28_small.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: trunk/data/power_plants/contender_290x290.png
===================================================================
(Binary files differ)

Deleted: trunk/data/power_plants/contender_76x76.png
===================================================================
(Binary files differ)

Added: trunk/data/power_plants/contender_big.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/power_plants/contender_big.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/power_plants/contender_small.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/power_plants/contender_small.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: trunk/data/power_plants/contender_xl_290x290.png
===================================================================
(Binary files differ)

Deleted: trunk/data/power_plants/contender_xl_76x76.png
===================================================================
(Binary files differ)

Added: trunk/data/power_plants/contender_xl_big.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/power_plants/contender_xl_big.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/power_plants/contender_xl_small.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/power_plants/contender_xl_small.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: trunk/data/power_plants/contender_xpr_290x290.png
===================================================================
(Binary files differ)

Deleted: trunk/data/power_plants/contender_xpr_76x76.png
===================================================================
(Binary files differ)

Added: trunk/data/power_plants/contender_xpr_big.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/power_plants/contender_xpr_big.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/power_plants/contender_xpr_small.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/power_plants/contender_xpr_small.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: trunk/data/power_plants/gatherer_290x290.png
===================================================================
(Binary files differ)

Deleted: trunk/data/power_plants/gatherer_76x76.png
===================================================================
(Binary files differ)

Added: trunk/data/power_plants/gatherer_big.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/power_plants/gatherer_big.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/power_plants/gatherer_small.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/power_plants/gatherer_small.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: trunk/data/power_plants/spud_290x290.png
===================================================================
(Binary files differ)

Deleted: trunk/data/power_plants/spud_76x76.png
===================================================================
(Binary files differ)

Added: trunk/data/power_plants/spud_big.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/power_plants/spud_big.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/power_plants/spud_small.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/power_plants/spud_small.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: trunk/data/power_plants/t-p-16_290x290.png
===================================================================
(Binary files differ)

Deleted: trunk/data/power_plants/t-p-16_76x76.png
===================================================================
(Binary files differ)

Added: trunk/data/power_plants/t-p-16_big.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/power_plants/t-p-16_big.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/power_plants/t-p-16_small.png
===================================================================
(Binary files differ)


Property changes...
 
[truncated message content]

[Opengate-svn] SF.net SVN: opengate: [761] trunk/data

[<eg...@us...>]

Revision: 761
          http://opengate.svn.sourceforge.net/opengate/?rev=761&view=rev
Author:   egore
Date:     2007-09-22 14:00:12 -0700 (Sat, 22 Sep 2007)

Log Message:
-----------
Finish move

Added Paths:
-----------
    trunk/data/Bullet.png
    trunk/data/MediaFromOgre/
    trunk/data/arrow.mesh
    trunk/data/asteroids/
    trunk/data/explosion.particle
    trunk/data/fonts.zip
    trunk/data/gui/
    trunk/data/materials/
    trunk/data/mousePointer.overlay
    trunk/data/povray/
    trunk/data/simpleHUD.fontdef
    trunk/data/simpleHUD.overlay
    trunk/data/simpleSkybox.zip
    trunk/data/sounds/KAPOW2.WAV
    trunk/data/sounds/noo.wav
    trunk/data/sounds/readme
    trunk/data/sounds/test.wav
    trunk/data/sounds/test2.wav
    trunk/data/textures/
    trunk/data/wings/
    trunk/src/

Removed Paths:
-------------
    branches/ogsector/data/Bullet.png
    branches/ogsector/data/MediaFromOgre/
    branches/ogsector/data/arrow.mesh
    branches/ogsector/data/asteroids/
    branches/ogsector/data/explosion.particle
    branches/ogsector/data/fonts.zip
    branches/ogsector/data/gui/
    branches/ogsector/data/materials/
    branches/ogsector/data/mousePointer.overlay
    branches/ogsector/data/povray/
    branches/ogsector/data/simpleHUD.fontdef
    branches/ogsector/data/simpleHUD.overlay
    branches/ogsector/data/simpleSkybox.zip
    branches/ogsector/data/sounds/KAPOW2.WAV
    branches/ogsector/data/sounds/noo.wav
    branches/ogsector/data/sounds/readme
    branches/ogsector/data/sounds/test.wav
    branches/ogsector/data/sounds/test2.wav
    branches/ogsector/data/textures/
    branches/ogsector/data/wings/
    branches/ogsector/src/

Deleted: branches/ogsector/data/Bullet.png
===================================================================
(Binary files differ)

Deleted: branches/ogsector/data/arrow.mesh
===================================================================
(Binary files differ)

Deleted: branches/ogsector/data/explosion.particle
===================================================================
--- branches/ogsector/data/explosion.particle	2007-09-22 18:14:53 UTC (rev 760)
+++ branches/ogsector/data/explosion.particle	2007-09-22 21:00:12 UTC (rev 761)
@@ -1,84 +0,0 @@
-OpenGate/Explosion
-{
-   material        OpenGate/Explosion/Flare
-   particle_width  20
-   particle_height 20
-   cull_each       false
-   quota           1000
-   billboard_type  point
-   sorted          true
-   iteration_interval 0.02
-   nonvisible_update_timeout 0.1
-
-   // Area emitter
-   emitter Ellipsoid
-   {
-	angle           360
-	colour_range_start 1 1.0 0
-	colour_range_end 1 1.0 0.0	
-	emission_rate   100000
-	duration 0.3
-	time_to_live_min 0.3
-	time_to_live_max 2
-	direction       1 0 0
-	velocity       500.1
-	width           0.0
-        height          0.0
-        depth           0.0
-   }
-
-// Fader
-	affector ColourFader
-	{
-	      alpha -1.0
-	      green -0.8
-	}
-
-	affector Scaler
-	{
-	      rate -6.5
-	}
-}
-
-OpenGate/ExplosionStart
-{
-   material        OpenGate/Explosion/Base
-   particle_width  10
-   particle_height 10
-   cull_each       false
-   quota           500
-   billboard_type  point
-   sorted          true
-   iteration_interval 0.02
-   nonvisible_update_timeout 0.1
-
-   // Area emitter
-   emitter Ellipsoid
-   {
-	angle           360
-	colour_range_start 1 1.0 0
-	colour_range_end 1 1.0 0.0	
-	emission_rate   5000
-	duration 0.3
-	time_to_live_min 0.5
-	time_to_live_max 1.0
-	direction       1 0 0
-	velocity       100.0
-	width           0.0
-        height          0.0
-        depth           0.0
-   }
-
-// Fader
-	affector ColourFader
-	{
-	      alpha -100.0
-	      green -1.8
-	}
-
-	affector Scaler
-	{
-	      rate -9
-	}
-}
-

Deleted: branches/ogsector/data/fonts.zip
===================================================================
(Binary files differ)

Deleted: branches/ogsector/data/mousePointer.overlay
===================================================================
--- branches/ogsector/data/mousePointer.overlay	2007-09-22 18:14:53 UTC (rev 760)
+++ branches/ogsector/data/mousePointer.overlay	2007-09-22 21:00:12 UTC (rev 761)
@@ -1,13 +0,0 @@
-//OpenGate/MousePointer
-//{
-//    zorder 502
-//    container Panel(OpenGate/MousePointer/Pointer)
-//    {
-//        metrics_mode pixels
-//        top 0
-//        left 0
-//        width 32
-//        height 32
-//        material OpenGate/MousePointer
-//    }
-//}
\ No newline at end of file

Deleted: branches/ogsector/data/simpleHUD.fontdef
===================================================================
--- branches/ogsector/data/simpleHUD.fontdef	2007-09-22 18:14:53 UTC (rev 760)
+++ branches/ogsector/data/simpleHUD.fontdef	2007-09-22 21:00:12 UTC (rev 761)
@@ -1,21 +0,0 @@
-Console
-{
-	type 		truetype
-	source 		bluehigh.ttf
-	size 		32
-	resolution 	55
-	antialias_colour false
-	code_points 	33-255
-}
-
-
-BlueHighway
-{
-	type 		truetype
-	source 		bluehigh.ttf
-	size 		32
-	resolution 	55
-	antialias_colour false
-	code_points 	33-255
-}
-

Deleted: branches/ogsector/data/simpleHUD.overlay
===================================================================
--- branches/ogsector/data/simpleHUD.overlay	2007-09-22 18:14:53 UTC (rev 760)
+++ branches/ogsector/data/simpleHUD.overlay	2007-09-22 21:00:12 UTC (rev 761)
@@ -1,295 +0,0 @@
-Radar
-{
-	zorder 501
-	container Panel(Radar/Map)
-	{
-		left 0.4
-		top 0.84
-		width 0.2
-		height 0.15
-		material OpenGate/Radar/Background
-	}	
-//	container Panel(Radar/Dot)
-//	{
-//		material Radar/Dot
-//	}	
-}
-
-SimpleHUD
-{
-	zorder 500
-//	container Panel(SimpleHUD/Console)
-//	{
-//		left 0.01
-//		top 0.01
-//		width 0.98
-//		height 0.5
-////		material OpenGate/Console/Background
-//
-//		element TextArea(SimpleHUD/Console/TextArea)
-//		{
-//			left 0.01
-//			top 0.01
-//			width 0.98
-//			height 0.5
-//			font_name Console
-//			char_height 0.02
-//			colour_top 1 1 1
-//			colour_bottom 1 1 1
-//		}
-//	}	
-//
-//	container Panel(SimpleHUD/ConsoleShort)
-//	{
-//		left 0.01
-//		top 0.01
-//		width 0.98
-//		height 0.075
-////		material OpenGate/Console/Background
-//
-//		element TextArea(SimpleHUD/ConsoleShort/TextArea)
-//		{
-//			left 0.01
-//			top 0.01
-//			width 0.98
-//			height 0.075
-//			font_name Console
-//			char_height 0.02
-//			colour_top 1.0 1.0 1.0
-//			colour_bottom 1.0 1.0 1.0
-//		}
-//	}	
-//
-//	container Panel(SimpleHUD/ChatIn)
-//	{
-//		left 0.01
-//		top 0.52
-//		width 0.98
-//		height 0.025
-//		material OpenGate/Console/Background
-//
-//		element TextArea(SimpleHUD/ChatIn/TextArea)
-//		{
-//			left 0.01
-//			top 0.005
-//			width 0.9
-//			height 0.025
-//			font_name Console
-//			char_height 0.02
-//			colour_top 1.0 1.0 1.0
-//			colour_bottom 1.0 1.0 1.0
-//		}
-//	}	
-//
-//	container Panel(SimpleHUD/CenterPointer)
-//	{	
-//        	metrics_mode pixels
-//	        top 0	
-//        	left 0
-//	        width 48
-//        	height 48
-//	        material SimpleHUD/CenterPointer
-//    	}	
-//
-	container Panel(SimpleHUD/FlightCursor)
-	{	
-        	metrics_mode pixels
-	        top 0	
-        	left 0
-	        width 32
-        	height 32
-//	        material SimpleHUD/FlightCursor
-    	}	
-//
-//	container Panel(SimpleHUD/TargetPointer)
-//	{	
-//        	metrics_mode pixels
-//	        top 0	
-//        	left 0
-//	        width 32
-//        	height 32
-//	        material SimpleHUD/TargetPointer
-//    	}	
-//
-//	container Panel(SimpleHUD/DuelistPilotPointer)
-//	{	
-//        	metrics_mode pixels
-//	        top 0	
-//        	left 0
-//	        width 32
-//        	height 32
-//	        material SimpleHUD/DuelistPilotPointer
-//    	}	
-//
-//	container Panel(SimpleHUD/DuelistTargetPointer)
-//	{	
-//        	metrics_mode pixels
-//	        top 0	
-//        	left 0
-//	        width 32
-//        	height 32
-//	        material SimpleHUD/DuelistTargetPointer
-//    	}	
-
-	container Panel(SimpleHUD/MainPanel)
-	{
-		left 0 
-		top 0
-		width 1.0
-		height 1.0
-
-		element TextArea(SimpleHUD/MainPanel/StatsTextArea)
-		{
-			left 0.8
-			top 0.01
-			width 0.2
-			height 0.03
-			caption FPS:
-			font_name BlueHighway
-			char_height 0.02
-			colour_top 1 1 0.7
-			colour_bottom 1 1 0.7
-		}
-//
-//		element TextArea(SimpleHUD/MainPanel/TextVelocity)
-//		{
-//			left 0.25
-//			top 0.3
-//			width 0.1
-//			height 0.03
-//			caption Vel:
-//			font_name BlueHighway
-//			char_height 0.02
-//			colour_top 0.5 0.7 0.5
-//			colour_bottom 0.3 0.5 0.3
-//		}
-//		element TextArea(SimpleHUD/MainPanel/TextVelocityMax)
-//		{
-//			left 0.31
-//			top 0.3
-//			width 0.1
-//			height 0.03
-//			caption /
-//			font_name BlueHighway
-//			char_height 0.02
-//			colour_top 0.5 0.7 0.5
-//			colour_bottom 0.3 0.5 0.3
-//		}
-//		element TextArea(SimpleHUD/MainPanel/TextThr)
-//		{
-//			left 0.25
-//			top 0.33
-//			width 0.1
-//			height 0.03
-//			caption Thr:
-//			font_name BlueHighway
-//			char_height 0.02
-//			colour_top 0.5 0.7 0.5
-//			colour_bottom 0.3 0.5 0.3
-//		}
-//		element TextArea(SimpleHUD/MainPanel/TextAcc)
-//		{
-//			left 0.25
-//			top 0.36
-//			width 0.03
-//			height 0.1
-//			caption Current Acc:
-//			font_name BlueHighway
-//			char_height 0.022
-//			colour_top 0.5 0.7 0.5
-//			colour_bottom 0.3 0.5 0.3
-//		}
-//		element TextArea(SimpleHUD/MainPanel/TextShield)
-//		{
-//			left 0.25
-//			top 0.39
-//			width 0.1
-//			height 0.03
-//			font_name BlueHighway
-//			char_height 0.02
-//			colour_top 0.5 0.7 0.5
-//			colour_bottom 0.3 0.5 0.3
-//		}
-//		element TextArea(SimpleHUD/MainPanel/TextArmor)
-//		{
-//			left 0.25
-//			top 0.42
-//			width 0.1
-//			height 0.03
-//			font_name BlueHighway
-//			char_height 0.02
-//			colour_top 0.5 0.7 0.5
-//			colour_bottom 0.3 0.5 0.3
-//		}
-//		element TextArea(SimpleHUD/MainPanel/TextPosition)
-//		{
-//			left 0.25
-//			top 0.45
-//			width 0.1
-//			height 0.1
-//			caption Current Pos:
-//			font_name BlueHighway
-//			char_height 0.02
-//			colour_top 0.5 0.7 0.5
-//			colour_bottom 0.3 0.5 0.3
-//		}
-//
-		element TextArea(SimpleHUD/MainPanel/TextTargetName)
-		{
-			left 0.015
-			top 0.80
-			width 0.1
-			height 0.02
-			font_name BlueHighway
-			char_height 0.02
-			colour_top 0.5 0.7 0.5
-			colour_bottom 0.3 0.5 0.3
-		}
-		element TextArea(SimpleHUD/MainPanel/TextTargetDistance)
-		{
-			left 0.015
-			top 0.82
-			width 0.1
-			height 0.02
-			font_name BlueHighway
-			char_height 0.02
-			colour_top 0.5 0.7 0.5
-			colour_bottom 0.3 0.5 0.3
-		}
-		element TextArea(SimpleHUD/MainPanel/TextTargetVelocity)
-		{
-			left 0.17
-			top 0.84
-			width 0.1
-			height 0.02
-			font_name BlueHighway
-			char_height 0.02
-			colour_top 0.5 0.7 0.5
-			colour_bottom 0.3 0.5 0.3
-		}
-
-		element TextArea(SimpleHUD/MainPanel/TextTargetShield)
-		{
-			left 0.17
-			top 0.86
-			width 0.1
-			height 0.02
-			font_name BlueHighway
-			char_height 0.02
-			colour_top 0.5 0.7 0.5
-			colour_bottom 0.3 0.5 0.3
-		}
-		element TextArea(SimpleHUD/MainPanel/TextTargetArmor)
-		{
-			left 0.17
-			top 0.88
-			width 0.1
-			height 0.02
-			font_name BlueHighway
-			char_height 0.02
-			colour_top 0.5 0.7 0.5
-			colour_bottom 0.3 0.5 0.3
-		}
-	}
-}
-

Deleted: branches/ogsector/data/simpleSkybox.zip
===================================================================
(Binary files differ)

Deleted: branches/ogsector/data/sounds/KAPOW2.WAV
===================================================================
(Binary files differ)

Deleted: branches/ogsector/data/sounds/noo.wav
===================================================================
(Binary files differ)

Deleted: branches/ogsector/data/sounds/readme
===================================================================
--- branches/ogsector/data/sounds/readme	2007-09-22 18:14:53 UTC (rev 760)
+++ branches/ogsector/data/sounds/readme	2007-09-22 21:00:12 UTC (rev 761)
@@ -1,8 +0,0 @@
-http://www.findsounds.com/
-
-http://www.pic00.com/sound/pao/KAPOW2.WAV
-7k, mono, 8-bit, 11025 Hz, 0.6 seconds
-
-http://user.mc.net/~spreston/noo.wav
-Monty Python: "Noo"
-8k, mono, 8-bit, 11025 Hz, 0.7 seconds

Deleted: branches/ogsector/data/sounds/test.wav
===================================================================
(Binary files differ)

Deleted: branches/ogsector/data/sounds/test2.wav
===================================================================
(Binary files differ)

Copied: trunk/data/Bullet.png (from rev 759, branches/ogsector/data/Bullet.png)
===================================================================
(Binary files differ)

Copied: trunk/data/MediaFromOgre (from rev 759, branches/ogsector/data/MediaFromOgre)

Copied: trunk/data/arrow.mesh (from rev 759, branches/ogsector/data/arrow.mesh)
===================================================================
(Binary files differ)

Copied: trunk/data/asteroids (from rev 759, branches/ogsector/data/asteroids)

Copied: trunk/data/explosion.particle (from rev 759, branches/ogsector/data/explosion.particle)
===================================================================
--- trunk/data/explosion.particle	                        (rev 0)
+++ trunk/data/explosion.particle	2007-09-22 21:00:12 UTC (rev 761)
@@ -0,0 +1,84 @@
+OpenGate/Explosion
+{
+   material        OpenGate/Explosion/Flare
+   particle_width  20
+   particle_height 20
+   cull_each       false
+   quota           1000
+   billboard_type  point
+   sorted          true
+   iteration_interval 0.02
+   nonvisible_update_timeout 0.1
+
+   // Area emitter
+   emitter Ellipsoid
+   {
+	angle           360
+	colour_range_start 1 1.0 0
+	colour_range_end 1 1.0 0.0	
+	emission_rate   100000
+	duration 0.3
+	time_to_live_min 0.3
+	time_to_live_max 2
+	direction       1 0 0
+	velocity       500.1
+	width           0.0
+        height          0.0
+        depth           0.0
+   }
+
+// Fader
+	affector ColourFader
+	{
+	      alpha -1.0
+	      green -0.8
+	}
+
+	affector Scaler
+	{
+	      rate -6.5
+	}
+}
+
+OpenGate/ExplosionStart
+{
+   material        OpenGate/Explosion/Base
+   particle_width  10
+   particle_height 10
+   cull_each       false
+   quota           500
+   billboard_type  point
+   sorted          true
+   iteration_interval 0.02
+   nonvisible_update_timeout 0.1
+
+   // Area emitter
+   emitter Ellipsoid
+   {
+	angle           360
+	colour_range_start 1 1.0 0
+	colour_range_end 1 1.0 0.0	
+	emission_rate   5000
+	duration 0.3
+	time_to_live_min 0.5
+	time_to_live_max 1.0
+	direction       1 0 0
+	velocity       100.0
+	width           0.0
+        height          0.0
+        depth           0.0
+   }
+
+// Fader
+	affector ColourFader
+	{
+	      alpha -100.0
+	      green -1.8
+	}
+
+	affector Scaler
+	{
+	      rate -9
+	}
+}
+

Copied: trunk/data/fonts.zip (from rev 759, branches/ogsector/data/fonts.zip)
===================================================================
(Binary files differ)

Copied: trunk/data/gui (from rev 759, branches/ogsector/data/gui)

Copied: trunk/data/materials (from rev 759, branches/ogsector/data/materials)

Copied: trunk/data/mousePointer.overlay (from rev 759, branches/ogsector/data/mousePointer.overlay)
===================================================================
--- trunk/data/mousePointer.overlay	                        (rev 0)
+++ trunk/data/mousePointer.overlay	2007-09-22 21:00:12 UTC (rev 761)
@@ -0,0 +1,13 @@
+//OpenGate/MousePointer
+//{
+//    zorder 502
+//    container Panel(OpenGate/MousePointer/Pointer)
+//    {
+//        metrics_mode pixels
+//        top 0
+//        left 0
+//        width 32
+//        height 32
+//        material OpenGate/MousePointer
+//    }
+//}
\ No newline at end of file

Copied: trunk/data/povray (from rev 759, branches/ogsector/data/povray)

Copied: trunk/data/simpleHUD.fontdef (from rev 759, branches/ogsector/data/simpleHUD.fontdef)
===================================================================
--- trunk/data/simpleHUD.fontdef	                        (rev 0)
+++ trunk/data/simpleHUD.fontdef	2007-09-22 21:00:12 UTC (rev 761)
@@ -0,0 +1,21 @@
+Console
+{
+	type 		truetype
+	source 		bluehigh.ttf
+	size 		32
+	resolution 	55
+	antialias_colour false
+	code_points 	33-255
+}
+
+
+BlueHighway
+{
+	type 		truetype
+	source 		bluehigh.ttf
+	size 		32
+	resolution 	55
+	antialias_colour false
+	code_points 	33-255
+}
+

Copied: trunk/data/simpleHUD.overlay (from rev 759, branches/ogsector/data/simpleHUD.overlay)
===================================================================
--- trunk/data/simpleHUD.overlay	                        (rev 0)
+++ trunk/data/simpleHUD.overlay	2007-09-22 21:00:12 UTC (rev 761)
@@ -0,0 +1,295 @@
+Radar
+{
+	zorder 501
+	container Panel(Radar/Map)
+	{
+		left 0.4
+		top 0.84
+		width 0.2
+		height 0.15
+		material OpenGate/Radar/Background
+	}	
+//	container Panel(Radar/Dot)
+//	{
+//		material Radar/Dot
+//	}	
+}
+
+SimpleHUD
+{
+	zorder 500
+//	container Panel(SimpleHUD/Console)
+//	{
+//		left 0.01
+//		top 0.01
+//		width 0.98
+//		height 0.5
+////		material OpenGate/Console/Background
+//
+//		element TextArea(SimpleHUD/Console/TextArea)
+//		{
+//			left 0.01
+//			top 0.01
+//			width 0.98
+//			height 0.5
+//			font_name Console
+//			char_height 0.02
+//			colour_top 1 1 1
+//			colour_bottom 1 1 1
+//		}
+//	}	
+//
+//	container Panel(SimpleHUD/ConsoleShort)
+//	{
+//		left 0.01
+//		top 0.01
+//		width 0.98
+//		height 0.075
+////		material OpenGate/Console/Background
+//
+//		element TextArea(SimpleHUD/ConsoleShort/TextArea)
+//		{
+//			left 0.01
+//			top 0.01
+//			width 0.98
+//			height 0.075
+//			font_name Console
+//			char_height 0.02
+//			colour_top 1.0 1.0 1.0
+//			colour_bottom 1.0 1.0 1.0
+//		}
+//	}	
+//
+//	container Panel(SimpleHUD/ChatIn)
+//	{
+//		left 0.01
+//		top 0.52
+//		width 0.98
+//		height 0.025
+//		material OpenGate/Console/Background
+//
+//		element TextArea(SimpleHUD/ChatIn/TextArea)
+//		{
+//			left 0.01
+//			top 0.005
+//			width 0.9
+//			height 0.025
+//			font_name Console
+//			char_height 0.02
+//			colour_top 1.0 1.0 1.0
+//			colour_bottom 1.0 1.0 1.0
+//		}
+//	}	
+//
+//	container Panel(SimpleHUD/CenterPointer)
+//	{	
+//        	metrics_mode pixels
+//	        top 0	
+//        	left 0
+//	        width 48
+//        	height 48
+//	        material SimpleHUD/CenterPointer
+//    	}	
+//
+	container Panel(SimpleHUD/FlightCursor)
+	{	
+        	metrics_mode pixels
+	        top 0	
+        	left 0
+	        width 32
+        	height 32
+//	        material SimpleHUD/FlightCursor
+    	}	
+//
+//	container Panel(SimpleHUD/TargetPointer)
+//	{	
+//        	metrics_mode pixels
+//	        top 0	
+//        	left 0
+//	        width 32
+//        	height 32
+//	        material SimpleHUD/TargetPointer
+//    	}	
+//
+//	container Panel(SimpleHUD/DuelistPilotPointer)
+//	{	
+//        	metrics_mode pixels
+//	        top 0	
+//        	left 0
+//	        width 32
+//        	height 32
+//	        material SimpleHUD/DuelistPilotPointer
+//    	}	
+//
+//	container Panel(SimpleHUD/DuelistTargetPointer)
+//	{	
+//        	metrics_mode pixels
+//	        top 0	
+//        	left 0
+//	        width 32
+//        	height 32
+//	        material SimpleHUD/DuelistTargetPointer
+//    	}	
+
+	container Panel(SimpleHUD/MainPanel)
+	{
+		left 0 
+		top 0
+		width 1.0
+		height 1.0
+
+		element TextArea(SimpleHUD/MainPanel/StatsTextArea)
+		{
+			left 0.8
+			top 0.01
+			width 0.2
+			height 0.03
+			caption FPS:
+			font_name BlueHighway
+			char_height 0.02
+			colour_top 1 1 0.7
+			colour_bottom 1 1 0.7
+		}
+//
+//		element TextArea(SimpleHUD/MainPanel/TextVelocity)
+//		{
+//			left 0.25
+//			top 0.3
+//			width 0.1
+//			height 0.03
+//			caption Vel:
+//			font_name BlueHighway
+//			char_height 0.02
+//			colour_top 0.5 0.7 0.5
+//			colour_bottom 0.3 0.5 0.3
+//		}
+//		element TextArea(SimpleHUD/MainPanel/TextVelocityMax)
+//		{
+//			left 0.31
+//			top 0.3
+//			width 0.1
+//			height 0.03
+//			caption /
+//			font_name BlueHighway
+//			char_height 0.02
+//			colour_top 0.5 0.7 0.5
+//			colour_bottom 0.3 0.5 0.3
+//		}
+//		element TextArea(SimpleHUD/MainPanel/TextThr)
+//		{
+//			left 0.25
+//			top 0.33
+//			width 0.1
+//			height 0.03
+//			caption Thr:
+//			font_name BlueHighway
+//			char_height 0.02
+//			colour_top 0.5 0.7 0.5
+//			colour_bottom 0.3 0.5 0.3
+//		}
+//		element TextArea(SimpleHUD/MainPanel/TextAcc)
+//		{
+//			left 0.25
+//			top 0.36
+//			width 0.03
+//			height 0.1
+//			caption Current Acc:
+//			font_name BlueHighway
+//			char_height 0.022
+//			colour_top 0.5 0.7 0.5
+//			colour_bottom 0.3 0.5 0.3
+//		}
+//		element TextArea(SimpleHUD/MainPanel/TextShield)
+//		{
+//			left 0.25
+//			top 0.39
+//			width 0.1
+//			height 0.03
+//			font_name BlueHighway
+//			char_height 0.02
+//			colour_top 0.5 0.7 0.5
+//			colour_bottom 0.3 0.5 0.3
+//		}
+//		element TextArea(SimpleHUD/MainPanel/TextArmor)
+//		{
+//			left 0.25
+//			top 0.42
+//			width 0.1
+//			height 0.03
+//			font_name BlueHighway
+//			char_height 0.02
+//			colour_top 0.5 0.7 0.5
+//			colour_bottom 0.3 0.5 0.3
+//		}
+//		element TextArea(SimpleHUD/MainPanel/TextPosition)
+//		{
+//			left 0.25
+//			top 0.45
+//			width 0.1
+//			height 0.1
+//			caption Current Pos:
+//			font_name BlueHighway
+//			char_height 0.02
+//			colour_top 0.5 0.7 0.5
+//			colour_bottom 0.3 0.5 0.3
+//		}
+//
+		element TextArea(SimpleHUD/MainPanel/TextTargetName)
+		{
+			left 0.015
+			top 0.80
+			width 0.1
+			height 0.02
+			font_name BlueHighway
+			char_height 0.02
+			colour_top 0.5 0.7 0.5
+			colour_bottom 0.3 0.5 0.3
+		}
+		element TextArea(SimpleHUD/MainPanel/TextTargetDistance)
+		{
+			left 0.015
+			top 0.82
+			width 0.1
+			height 0.02
+			font_name BlueHighway
+			char_height 0.02
+			colour_top 0.5 0.7 0.5
+			colour_bottom 0.3 0.5 0.3
+		}
+		element TextArea(SimpleHUD/MainPanel/TextTargetVelocity)
+		{
+			left 0.17
+			top 0.84
+			width 0.1
+			height 0.02
+			font_name BlueHighway
+			char_height 0.02
+			colour_top 0.5 0.7 0.5
+			colour_bottom 0.3 0.5 0.3
+		}
+
+		element TextArea(SimpleHUD/MainPanel/TextTargetShield)
+		{
+			left 0.17
+			top 0.86
+			width 0.1
+			height 0.02
+			font_name BlueHighway
+			char_height 0.02
+			colour_top 0.5 0.7 0.5
+			colour_bottom 0.3 0.5 0.3
+		}
+		element TextArea(SimpleHUD/MainPanel/TextTargetArmor)
+		{
+			left 0.17
+			top 0.88
+			width 0.1
+			height 0.02
+			font_name BlueHighway
+			char_height 0.02
+			colour_top 0.5 0.7 0.5
+			colour_bottom 0.3 0.5 0.3
+		}
+	}
+}
+

Copied: trunk/data/simpleSkybox.zip (from rev 759, branches/ogsector/data/simpleSkybox.zip)
===================================================================
(Binary files differ)

Copied: trunk/data/sounds/KAPOW2.WAV (from rev 759, branches/ogsector/data/sounds/KAPOW2.WAV)
===================================================================
(Binary files differ)

Copied: trunk/data/sounds/noo.wav (from rev 759, branches/ogsector/data/sounds/noo.wav)
===================================================================
(Binary files differ)

Copied: trunk/data/sounds/readme (from rev 759, branches/ogsector/data/sounds/readme)
===================================================================
--- trunk/data/sounds/readme	                        (rev 0)
+++ trunk/data/sounds/readme	2007-09-22 21:00:12 UTC (rev 761)
@@ -0,0 +1,8 @@
+http://www.findsounds.com/
+
+http://www.pic00.com/sound/pao/KAPOW2.WAV
+7k, mono, 8-bit, 11025 Hz, 0.6 seconds
+
+http://user.mc.net/~spreston/noo.wav
+Monty Python: "Noo"
+8k, mono, 8-bit, 11025 Hz, 0.7 seconds

Copied: trunk/data/sounds/test.wav (from rev 759, branches/ogsector/data/sounds/test.wav)
===================================================================
(Binary files differ)

Copied: trunk/data/sounds/test2.wav (from rev 759, branches/ogsector/data/sounds/test2.wav)
===================================================================
(Binary files differ)

Copied: trunk/data/textures (from rev 759, branches/ogsector/data/textures)

Copied: trunk/data/wings (from rev 759, branches/ogsector/data/wings)

Copied: trunk/src (from rev 759, branches/ogsector/src)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opengate-svn] SF.net SVN: opengate: [766] trunk/data

[<eg...@us...>]

Revision: 766
          http://opengate.svn.sourceforge.net/opengate/?rev=766&view=rev
Author:   egore
Date:     2007-09-22 14:28:32 -0700 (Sat, 22 Sep 2007)

Log Message:
-----------
Start moving GUI to gui so win32 users can check out again

Added Paths:
-----------
    trunk/data/gui/ActionMapping.layout
    trunk/data/gui/Font.xsd
    trunk/data/gui/ForceFeedback.layout
    trunk/data/gui/WindowsLook.imageset
    trunk/data/gui/WindowsLook.looknfeel
    trunk/data/gui/WindowsLook.scheme
    trunk/data/gui/WindowsLook.tga
    trunk/data/gui/WindowsLookSkin.scheme
    trunk/data/gui/WindowsLookWidgets.scheme
    trunk/data/gui/docked/
    trunk/data/gui/tahoma-12.font
    trunk/data/gui/tahoma.ttf
    trunk/data/gui/undocked/

Removed Paths:
-------------
    trunk/data/GUI/ActionMapping.layout
    trunk/data/GUI/Font.xsd
    trunk/data/GUI/ForceFeedback.layout
    trunk/data/GUI/WindowsLook.imageset
    trunk/data/GUI/WindowsLook.looknfeel
    trunk/data/GUI/WindowsLook.scheme
    trunk/data/GUI/WindowsLook.tga
    trunk/data/GUI/WindowsLookSkin.scheme
    trunk/data/GUI/WindowsLookWidgets.scheme
    trunk/data/GUI/docked/
    trunk/data/GUI/tahoma-12.font
    trunk/data/GUI/tahoma.ttf
    trunk/data/GUI/undocked/

Deleted: trunk/data/GUI/ActionMapping.layout
===================================================================
--- trunk/data/GUI/ActionMapping.layout	2007-09-22 21:23:57 UTC (rev 765)
+++ trunk/data/GUI/ActionMapping.layout	2007-09-22 21:28:32 UTC (rev 766)
@@ -1,77 +0,0 @@
-<?xml version="1.0" ?>
-<GUILayout>
-<Window Type="DefaultWindow" Name="Root" >
-	<Property Name="Size" Value="w:1 h:1" />
-	<Window Type="WindowsLook/FrameWindow" Name="Main" >
-		<Property Name="Position" Value="x:0.0 y:0.0" />
-		<Property Name="Size" Value="w:0.3 h:1" />
-		<Property Name="Text" Value="Action Mapping Demo" />
-		<Property Name="SizingEnabled" Value="false" />
-		<Property Name="DragMovingEnabled" Value="False" />
-		<Property Name="CloseButtonEnabled" Value="False" />
-
-		<Window Type="WindowsLook/StaticText" Name="KeyboardLable" >
-			<Property Name="Position" Value="x:0.02 y:0.06" />
-			<Property Name="Size" Value="w:0.94 h:0.038" />
-			<Property Name="Text" Value="Keyboard Actions" />
-		</Window>
-		<Window Type="WindowsLook/MultiColumnList" Name="Keyboard" >
-			<Property Name="Position" Value="x:0.02 y:0.1" />
-			<Property Name="Size" Value="w:0.94 h:0.25" />
-		</Window>
-
-		<Window Type="WindowsLook/StaticText" Name="MouseLable" >
-			<Property Name="Position" Value="x:0.02 y:0.35" />
-			<Property Name="Size" Value="w:0.94 h:0.04" />
-			<Property Name="Text" Value="Mouse Actions" />
-		</Window>
-		<Window Type="WindowsLook/MultiColumnList" Name="Mouse" >
-			<Property Name="Position" Value="x:0.02 y:0.39" />
-			<Property Name="Size" Value="w:0.94 h:0.25" />
-		</Window>
-
-		<Window Type="WindowsLook/StaticText" Name="JoyStickLable" >
-			<Property Name="Position" Value="x:0.02 y:0.645" />
-			<Property Name="Size" Value="w:0.94 h:0.04" />
-			<Property Name="Text" Value="JoyStick Actions" />
-		</Window>
-		<Window Type="WindowsLook/MultiColumnList" Name="Joystick" >
-			<Property Name="Position" Value="x:0.02 y:0.69" />
-			<Property Name="Size" Value="w:0.94 h:0.25" />
-		</Window>
-
-		<Window Type="WindowsLook/Button" Name="Test" >
-			<Property Name="Position" Value="x:0.02 y:0.94" />
-			<Property Name="Size" Value="w:0.3 h:0.042" />
-			<Property Name="Text" Value="Test" />
-		</Window>
-		<Window Type="WindowsLook/Button" Name="Reset" >
-			<Property Name="Position" Value="x:0.34 y:0.94" />
-			<Property Name="Size" Value="w:0.3 h:0.042" />
-			<Property Name="Text" Value="Reset" />
-		</Window>
-		<Window Type="WindowsLook/Button" Name="Quit" >
-			<Property Name="Position" Value="x:0.66 y:0.94" />
-			<Property Name="Size" Value="w:0.3 h:0.042" />
-			<Property Name="Text" Value="Quit" />
-		</Window>
-	</Window>
-
-	<Window Type="WindowsLook/FrameWindow" Name="ActionPrompt" >
-		<Property Name="Position" Value="x:0.25 y:0.33" />
-		<Property Name="Size" Value="w:0.5 h:0.33" />
-		<Property Name="Text" Value="Action Configure Prompt" />
-		<Property Name="SizingEnabled" Value="false" />
-		<Property Name="CloseButtonEnabled" Value="False" />
-		<Property Name="Visible" Value="False" />
-		<Property Name="AlwaysOnTop" Value="True" />
-
-		<Window Type="WindowsLook/StaticText" Name="ActionPromptLable" >
-			<Property Name="Position" Value="x:0.02 y:0.18" />
-			<Property Name="Size" Value="w:0.96 h:0.7" />
-			<Property Name="Text" Value="Push any key" />
-			<Property Name="HorzFormatting" Value="WordWrapCentred" />
-		</Window>
-	</Window>
-</Window>
-</GUILayout>

Deleted: trunk/data/GUI/Font.xsd
===================================================================
--- trunk/data/GUI/Font.xsd	2007-09-22 21:23:57 UTC (rev 765)
+++ trunk/data/GUI/Font.xsd	2007-09-22 21:28:32 UTC (rev 766)
@@ -1,34 +0,0 @@
-<?xml version="1.0" ?>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
-	<xsd:element name="Font" type="FontType" />
-
-	<xsd:complexType name="FontType">
-		<xsd:sequence>
-			<xsd:element name="Mapping" type="MapType" maxOccurs="unbounded" minOccurs="0" />
-		</xsd:sequence>
-		<xsd:attributeGroup ref="FontAttrs" />
-	</xsd:complexType>
-	<xsd:complexType name="MapType">
-		<xsd:attribute name="Codepoint" type="xsd:nonNegativeInteger" use="required" />
-		<xsd:attribute name="Image" type="xsd:string" use="required" />
-		<xsd:attribute name="HorzAdvance" type="xsd:integer" use="optional" default="-1" />
-	</xsd:complexType>
-	<xsd:attributeGroup name="FontAttrs">
-		<xsd:attribute name="Name" type="xsd:string" use="required" />
-		<xsd:attribute name="Filename" type="xsd:string" use="required" />
-		<xsd:attribute name="ResourceGroup" type="xsd:string" use="optional"  default="" />
-		<xsd:attribute name="Type" use="required">
-			<xsd:simpleType>
-				<xsd:restriction base="xsd:string">
-					<xsd:enumeration value="FreeType" />
-					<xsd:enumeration value="Pixmap" />
-				</xsd:restriction>
-			</xsd:simpleType>
-		</xsd:attribute>
-		<xsd:attribute name="Size" type="xsd:nonNegativeInteger" use="optional" default="12" />
-		<xsd:attribute name="NativeHorzRes" type="xsd:nonNegativeInteger" use="optional" default="640" />
-		<xsd:attribute name="NativeVertRes" type="xsd:nonNegativeInteger" use="optional" default="480" />
-		<xsd:attribute name="AutoScaled" type="xsd:boolean" use="optional" default="false" />
-		<xsd:attribute name="AntiAlias" type="xsd:boolean" use="optional" default="true" />
-	</xsd:attributeGroup>
-</xsd:schema>

Deleted: trunk/data/GUI/ForceFeedback.layout
===================================================================
--- trunk/data/GUI/ForceFeedback.layout	2007-09-22 21:23:57 UTC (rev 765)
+++ trunk/data/GUI/ForceFeedback.layout	2007-09-22 21:28:32 UTC (rev 766)
@@ -1,234 +0,0 @@
-<?xml version="1.0" ?>
-<GUILayout>
-<Window Type="DefaultWindow" Name="Root" >
-	<Property Name="Size" Value="w:1 h:1" />
-
-	<Window Type="WindowsLook/FrameWindow" Name="Main" >
-		<Property Name="Position" Value="x:0.0 y:0.0" />
-		<Property Name="Size" Value="w:0.5 h:0.3" />
-		<Property Name="Text" Value="Force Feedback Demo" />
-		<Property Name="SizingEnabled" Value="false" />
-		<Property Name="DragMovingEnabled" Value="False" />
-		<Property Name="CloseButtonEnabled" Value="False" />
-
-		<Window Type="WindowsLook/Button" Name="Quit" >
-			<Property Name="Position" Value="x:0.0 y:0.18" />
-			<Property Name="Size" Value="w:0.15 h:0.15" />
-			<Property Name="Text" Value="Quit" />
-		</Window>
-		<Window Type="WindowsLook/Button" Name="Create" >
-			<Property Name="Position" Value="x:0.17 y:0.18" />
-			<Property Name="Size" Value="w:0.15 h:0.15" />
-			<Property Name="Text" Value="Create" />
-		</Window>
-		<Window Type="WindowsLook/StaticText" Name="SupportedEffects" >
-			<Property Name="Position" Value="x:0.01 y:0.35" />
-			<Property Name="Size" Value="w:0.49 h:0.15" />
-			<Property Name="Text" Value="Supported Effects" />
-		</Window>
-		<Window Type="WindowsLook/Listbox" Name="SupportedEffectsList" >
-			<Property Name="Position" Value="x:0.01 y:0.49" />
-			<Property Name="Size" Value="w:0.49 h:0.45" />
-		</Window>
-
-		<Window Type="WindowsLook/Button" Name="Remove" >
-			<Property Name="Position" Value="x:0.51 y:0.18" />
-			<Property Name="Size" Value="w:0.15 h:0.15" />
-			<Property Name="Text" Value="Remove" />
-		</Window>
-		<Window Type="WindowsLook/StaticText" Name="EffectsLabel" >
-			<Property Name="Position" Value="x:0.51 y:0.35" />
-			<Property Name="Size" Value="w:0.3 h:0.15" />
-			<Property Name="Text" Value="Loaded Effects" />
-		</Window>
-		<Window Type="WindowsLook/Listbox" Name="EffectsList" >
-			<Property Name="Position" Value="x:0.51 y:0.49" />
-			<Property Name="Size" Value="w:0.3 h:0.45" />
-		</Window>
-
-		<Window Type="WindowsLook/StaticText" Name="Gain" >
-			<Property Name="Position" Value="x:0.85 y:0.35" />
-			<Property Name="Size" Value="w:0.13 h:0.15" />
-			<Property Name="Text" Value="Gain" />
-		</Window>
-		<Window Type="WindowsLook/Spinner" Name="GainLevel" >
-			<Property Name="Position" Value="x:0.85 y:0.51" />
-			<Property Name="Size" Value="w:0.12 h:0.2" />
-			<Property Name="CurrentValue" Value="1.0" />
-			<Property Name="StepSize" Value="0.1" />
-			<Property Name="MinimumValue" Value="0.0" />
-			<Property Name="MaximumValue" Value="1.0" />
-			<Property Name="TextInputMode" Value="FloatingPoint" />
-		</Window>
-	</Window>
-	<Window Type="WindowsLook/FrameWindow" Name="General" >
-		<Property Name="Position" Value="x:0.5 y:0.0" />
-		<Property Name="Size" Value="w:0.25 h:0.3" />
-		<Property Name="Text" Value="General Properties" />
-		<Property Name="Visible" Value="false" />
-		<Property Name="SizingEnabled" Value="false" />
-		<Property Name="DragMovingEnabled" Value="False" />
-		<Property Name="CloseButtonEnabled" Value="False" />
-
-		<Window Type="WindowsLook/StaticText" Name="TriggerButtonLable" >
-			<Property Name="Position" Value="x:0.01 y:0.18" />
-			<Property Name="Size" Value="w:0.49 h:0.13" />
-			<Property Name="Text" Value="T.B. N/I" />
-		</Window>
-		<Window Type="WindowsLook/Spinner" Name="TriggerButton" >
-			<Property Name="Position" Value="x:0.01 y:0.31" />
-			<Property Name="Size" Value="w:0.4 h:0.2" />
-			<Property Name="CurrentValue" Value="-1" />
-			<Property Name="StepSize" Value="1" />
-			<Property Name="MinimumValue" Value="-1" />
-			<Property Name="MaximumValue" Value="100" />
-		</Window>
-		<Window Type="WindowsLook/StaticText" Name="TriggerIntervalLable" >
-			<Property Name="Position" Value="x:0.5 y:0.18" />
-			<Property Name="Size" Value="w:0.49 h:0.13" />
-			<Property Name="Text" Value="T.I. N/I" />
-		</Window>
-		<Window Type="WindowsLook/Spinner" Name="TriggerInterval" >
-			<Property Name="Position" Value="x:0.5 y:0.31" />
-			<Property Name="Size" Value="w:0.4 h:0.2" />
-			<Property Name="CurrentValue" Value="500" />
-			<Property Name="StepSize" Value="500" />
-			<Property Name="MinimumValue" Value="0" />
-			<Property Name="MaximumValue" Value="10000" />
-		</Window>
-
-		<Window Type="WindowsLook/StaticText" Name="ReplayLengthLable" >
-			<Property Name="Position" Value="x:0.01 y:0.53" />
-			<Property Name="Size" Value="w:0.49 h:0.13" />
-			<Property Name="Text" Value="Length (sec)" />
-		</Window>
-		<Window Type="WindowsLook/Spinner" Name="ReplayLength" >
-			<Property Name="Position" Value="x:0.01 y:0.66" />
-			<Property Name="Size" Value="w:0.4 h:0.2" />
-			<Property Name="CurrentValue" Value="0" />
-			<Property Name="StepSize" Value="1" />
-			<Property Name="MinimumValue" Value="0" />
-			<Property Name="MaximumValue" Value="20" />
-		</Window>
-		<Window Type="WindowsLook/StaticText" Name="ReplayDelayLable" >
-			<Property Name="Position" Value="x:0.5 y:0.53" />
-			<Property Name="Size" Value="w:0.49 h:0.13" />
-			<Property Name="Text" Value="Delay (sec)" />
-		</Window>
-		<Window Type="WindowsLook/Spinner" Name="ReplayDelay" >
-			<Property Name="Position" Value="x:0.5 y:0.66" />
-			<Property Name="Size" Value="w:0.4 h:0.2" />
-			<Property Name="CurrentValue" Value="0" />
-			<Property Name="StepSize" Value="1" />
-			<Property Name="MinimumValue" Value="0" />
-			<Property Name="MaximumValue" Value="20" />
-		</Window>
-
-	</Window>
-	<Window Type="WindowsLook/FrameWindow" Name="Direction" >
-		<Property Name="Position" Value="x:0.75 y:0.0" />
-		<Property Name="Size" Value="w:0.25 h:0.3" />
-		<Property Name="Text" Value="Direction N/I" />
-		<Property Name="Visible" Value="false" />
-		<Property Name="SizingEnabled" Value="false" />
-		<Property Name="DragMovingEnabled" Value="False" />
-		<Property Name="CloseButtonEnabled" Value="False" />
-
-		<Window Type="WindowsLook/RadioButton" Name="North" >
-			<Property Name="Position" Value="x:.47 y:0.14" />
-			<Property Name="Size" Value="w:.2 h:0.2" />
-			<Property Name="Selected" Value="true" />
-		</Window>
-		<Window Type="WindowsLook/RadioButton" Name="South" >
-			<Property Name="Position" Value="x:.47 y:0.8" />
-			<Property Name="Size" Value="w:.2 h:0.2" />
-		</Window>
-		<Window Type="WindowsLook/RadioButton" Name="West" >
-			<Property Name="Position" Value="x:.17 y:0.5" />
-			<Property Name="Size" Value="w:.2 h:0.2" />
-		</Window>
-		<Window Type="WindowsLook/RadioButton" Name="East" >
-			<Property Name="Position" Value="x:.79 y:0.5" />
-			<Property Name="Size" Value="w:.2 h:0.2" />
-		</Window>
-		<Window Type="WindowsLook/RadioButton" Name="NorthWest" >
-			<Property Name="Position" Value="x:.26 y:0.27" />
-			<Property Name="Size" Value="w:.2 h:0.2" />
-		</Window>
-		<Window Type="WindowsLook/RadioButton" Name="NorthEast" >
-			<Property Name="Position" Value="x:.7 y:0.27" />
-			<Property Name="Size" Value="w:.2 h:0.2" />
-		</Window>
-		<Window Type="WindowsLook/RadioButton" Name="SouthWest" >
-			<Property Name="Position" Value="x:.26 y:0.72" />
-			<Property Name="Size" Value="w:.2 h:0.2" />
-		</Window>
-		<Window Type="WindowsLook/RadioButton" Name="SouthEast" >
-			<Property Name="Position" Value="x:.7 y:0.72" />
-			<Property Name="Size" Value="w:.2 h:0.2" />
-		</Window>
-	</Window>
-
-	<Window Type="WindowsLook/FrameWindow" Name="ConstantForm" >
-		<Property Name="Position" Value="x:0.0 y:0.35" />
-		<Property Name="Size" Value="w:0.5 h:0.6" />
-		<Property Name="Text" Value="Constant Settings" />
-		<Property Name="Visible" Value="false" />
-		<Property Name="SizingEnabled" Value="false" />
-		<Property Name="DragMovingEnabled" Value="False" />
-		<Property Name="CloseButtonEnabled" Value="False" />
-
-		<Window Type="WindowsLook/StaticText" Name="ConstantLevelLable" >
-			<Property Name="Position" Value="x:0.1 y:0.2" />
-			<Property Name="Size" Value="w:0.8 h:0.2" />
-			<Property Name="Text" Value="Constant Force (besides envelope) has only one setting for a magnitude level (-10k to +10k)." />
-			<Property Name="HorzFormatting" Value="WordWrapCentred" />
-		</Window>
-		<Window Type="WindowsLook/Spinner" Name="ConstantLevel" >
-			<Property Name="Position" Value="x:0.1 y:0.45" />
-			<Property Name="Size" Value="w:0.2 h:0.2" />
-			<Property Name="CurrentValue" Value="5000" />
-			<Property Name="StepSize" Value="500" />
-			<Property Name="MinimumValue" Value="-10000" />
-			<Property Name="MaximumValue" Value="10000" />
-		</Window>
-	</Window>
-	<Window Type="WindowsLook/FrameWindow" Name="RampForm" >
-		<Property Name="Position" Value="x:0.0 y:0.35" />
-		<Property Name="Size" Value="w:0.5 h:0.6" />
-		<Property Name="Text" Value="Ramp Settings" />
-		<Property Name="Visible" Value="false" />
-		<Property Name="SizingEnabled" Value="false" />
-		<Property Name="DragMovingEnabled" Value="False" />
-		<Property Name="CloseButtonEnabled" Value="False" />
-	</Window>
-	<Window Type="WindowsLook/FrameWindow" Name="PeriodicForm" >
-		<Property Name="Position" Value="x:0.0 y:0.35" />
-		<Property Name="Size" Value="w:0.5 h:0.6" />
-		<Property Name="Text" Value="Periodic Settings" />
-		<Property Name="Visible" Value="false" />
-		<Property Name="SizingEnabled" Value="false" />
-		<Property Name="DragMovingEnabled" Value="False" />
-		<Property Name="CloseButtonEnabled" Value="False" />
-	</Window>
-	<Window Type="WindowsLook/FrameWindow" Name="ConditionalForm" >
-		<Property Name="Position" Value="x:0.0 y:0.35" />
-		<Property Name="Size" Value="w:0.5 h:0.6" />
-		<Property Name="Text" Value="Conditional Settings" />
-		<Property Name="Visible" Value="false" />
-		<Property Name="SizingEnabled" Value="false" />
-		<Property Name="DragMovingEnabled" Value="False" />
-		<Property Name="CloseButtonEnabled" Value="False" />
-	</Window>
-
-	<Window Type="WindowsLook/FrameWindow" Name="EnvelopeForm" >
-		<Property Name="Position" Value="x:0.7 y:0.35" />
-		<Property Name="Size" Value="w:0.3 h:0.6" />
-		<Property Name="Text" Value="Envelope Settings" />
-		<Property Name="Visible" Value="false" />
-		<Property Name="SizingEnabled" Value="false" />
-		<Property Name="DragMovingEnabled" Value="False" />
-		<Property Name="CloseButtonEnabled" Value="False" />
-	</Window>
-</Window>
-</GUILayout>

Deleted: trunk/data/GUI/WindowsLook.imageset
===================================================================
--- trunk/data/GUI/WindowsLook.imageset	2007-09-22 21:23:57 UTC (rev 765)
+++ trunk/data/GUI/WindowsLook.imageset	2007-09-22 21:28:32 UTC (rev 766)
@@ -1,152 +0,0 @@
-<?xml version="1.0" ?>
-<Imageset Name="WindowsLook" Imagefile="WindowsLook.tga" NativeHorzRes="800" NativeVertRes="600" AutoScaled="true">
-	<Image Name="Background" XPos="9" YPos="9" Width="2" Height="2" />
-	<Image Name="WindowFrameLeft" XPos="2" YPos="9" Width="4" Height="2" />
-	<Image Name="WindowFrameRight" XPos="14" YPos="9" Width="4" Height="2" />
-	<Image Name="WindowFrameTop" XPos="9" YPos="2" Width="2" Height="4" />
-	<Image Name="WindowFrameBottom" XPos="9" YPos="14" Width="2" Height="4" />
-	<Image Name="WindowFrameTopLeft" XPos="2" YPos="2" Width="4" Height="4" />
-	<Image Name="WindowFrameTopRight" XPos="14" YPos="2" Width="4" Height="4" />
-	<Image Name="WindowFrameBottomLeft" XPos="2" YPos="14" Width="4" Height="4" />
-	<Image Name="WindowFrameBottomRight" XPos="14" YPos="14" Width="4" Height="4" />
-	<Image Name="ButtonNormalLeft" XPos="20" YPos="9" Width="2" Height="2" />
-	<Image Name="ButtonNormalRight" XPos="34" YPos="9" Width="2" Height="2" />
-	<Image Name="ButtonNormalTop" XPos="27" YPos="2" Width="2" Height="2" />
-	<Image Name="ButtonNormalBottom" XPos="27" YPos="16" Width="2" Height="2" />
-	<Image Name="ButtonNormalTopLeft" XPos="20" YPos="2" Width="3" Height="3" />
-	<Image Name="ButtonNormalTopRight" XPos="33" YPos="2" Width="3" Height="3" />
-	<Image Name="ButtonNormalBottomLeft" XPos="20" YPos="15" Width="3" Height="3" />
-	<Image Name="ButtonNormalBottomRight" XPos="33" YPos="15" Width="3" Height="3" />
-	<Image Name="ButtonPushedLeft" XPos="38" YPos="9" Width="2" Height="2" />
-	<Image Name="ButtonPushedRight" XPos="52" YPos="9" Width="2" Height="2" />
-	<Image Name="ButtonPushedTop" XPos="45" YPos="2" Width="2" Height="2" />
-	<Image Name="ButtonPushedBottom" XPos="45" YPos="16" Width="2" Height="2" />
-	<Image Name="ButtonPushedTopLeft" XPos="38" YPos="2" Width="3" Height="3" />
-	<Image Name="ButtonPushedTopRight" XPos="51" YPos="2" Width="3" Height="3" />
-	<Image Name="ButtonPushedBottomLeft" XPos="38" YPos="15" Width="3" Height="3" />
-	<Image Name="ButtonPushedBottomRight" XPos="51" YPos="15" Width="3" Height="3" />
-	<Image Name="ButtonHoverLeft" XPos="56" YPos="9" Width="2" Height="2" />
-	<Image Name="ButtonHoverRight" XPos="70" YPos="9" Width="2" Height="2" />
-	<Image Name="ButtonHoverTop" XPos="63" YPos="2" Width="2" Height="2" />
-	<Image Name="ButtonHoverBottom" XPos="63" YPos="16" Width="2" Height="2" />
-	<Image Name="ButtonHoverTopLeft" XPos="56" YPos="2" Width="3" Height="3" />
-	<Image Name="ButtonHoverTopRight" XPos="69" YPos="2" Width="3" Height="3" />
-	<Image Name="ButtonHoverBottomLeft" XPos="56" YPos="15" Width="3" Height="3" />
-	<Image Name="ButtonHoverBottomRight" XPos="69" YPos="15" Width="3" Height="3" />
-	<Image Name="EditFrameLeft" XPos="74" YPos="9" Width="4" Height="2" />
-	<Image Name="EditFrameRight" XPos="86" YPos="9" Width="4" Height="2" />
-	<Image Name="EditFrameTop" XPos="81" YPos="2" Width="2" Height="4" />
-	<Image Name="EditFrameBottom" XPos="81" YPos="14" Width="2" Height="4" />
-	<Image Name="EditFrameTopLeft" XPos="74" YPos="2" Width="3" Height="3" />
-	<Image Name="EditFrameTopRight" XPos="87" YPos="2" Width="3" Height="3" />
-	<Image Name="EditFrameBottomLeft" XPos="74" YPos="15" Width="3" Height="3" />
-	<Image Name="EditFrameBottomRight" XPos="87" YPos="15" Width="3" Height="3" />
-	<Image Name="StaticFrameLeft" XPos="92" YPos="9" Width="2" Height="2" />
-	<Image Name="StaticFrameRight" XPos="106" YPos="9" Width="2" Height="2" />
-	<Image Name="StaticFrameTop" XPos="99" YPos="2" Width="2" Height="2" />
-	<Image Name="StaticFrameBottom" XPos="99" YPos="16" Width="2" Height="2" />
-	<Image Name="StaticFrameTopLeft" XPos="92" YPos="2" Width="3" Height="3" />
-	<Image Name="StaticFrameTopRight" XPos="105" YPos="2" Width="3" Height="3" />
-	<Image Name="StaticFrameBottomLeft" XPos="92" YPos="15" Width="3" Height="3" />
-	<Image Name="StaticFrameBottomRight" XPos="105" YPos="15" Width="3" Height="3" />
-	<Image Name="CloseButtonNormal" XPos="2" YPos="20" Width="13" Height="13" />
-	<Image Name="CloseButtonHover" XPos="2" YPos="35" Width="13" Height="13" />
-	<Image Name="CloseButtonPushed" XPos="2" YPos="50" Width="13" Height="13" />
-	<Image Name="TitlebarTopLeft" XPos="87" YPos="103" Width="8" Height="4" />
-	<Image Name="TitlebarTopRight" XPos="109" YPos="103" Width="8" Height="4" />
-	<Image Name="TitlebarBottomLeft" XPos="87" YPos="123" Width="8" Height="2" />
-	<Image Name="TitlebarBottomRight" XPos="109" YPos="123" Width="8" Height="2" />
-	<Image Name="TitlebarLeft" XPos="87" YPos="110" Width="8" Height="10" />
-	<Image Name="TitlebarRight" XPos="109" YPos="110" Width="8" Height="10" />
-	<Image Name="TitlebarTop" XPos="98" YPos="103" Width="8" Height="4" />
-	<Image Name="TitlebarBottom" XPos="98" YPos="123" Width="8" Height="2" />
-	<Image Name="TitlebarFill" XPos="98" YPos="110" Width="8" Height="10" />
-	<Image Name="CheckboxNormal" XPos="17" YPos="37" Width="10" Height="10" />
-	<Image Name="CheckboxHover" XPos="17" YPos="49" Width="10" Height="10" />
-	<Image Name="CheckboxMark" XPos="17" YPos="61" Width="10" Height="10" />
-	<Image Name="RadioButtonNormal" XPos="29" YPos="37" Width="10" Height="10" />
-	<Image Name="RadioButtonHover" XPos="29" YPos="49" Width="10" Height="10" />
-	<Image Name="RadioButtonMark" XPos="29" YPos="61" Width="10" Height="10" />
-	<Image Name="SliderThumbNormal" XPos="47" YPos="20" Width="7" Height="10" />
-	<Image Name="SliderThumbHover" XPos="47" YPos="32" Width="7" Height="10" />
-	<Image Name="SliderTrackLeft" XPos="56" YPos="20" Width="3" Height="4" />
-	<Image Name="SlidertrackMiddle" XPos="63" YPos="20" Width="2" Height="4" />
-	<Image Name="SliderTrackRight" XPos="69" YPos="20" Width="3" Height="4" />
-	<Image Name="SliderTick" XPos="56" YPos="26" Width="1" Height="4" />
-	<Image Name="HeaderMainBrush" XPos="53" YPos="45" Width="2" Height="2" />
-	<Image Name="HeaderBottomEdge" XPos="53" YPos="50" Width="2" Height="4" />
-	<Image Name="HeaderSplitter" XPos="47" YPos="44" Width="3" Height="15" />
-	<Image Name="VertScrollbarGrip" XPos="41" YPos="68" Width="5" Height="8" />
-	<Image Name="HorzScrollbarGrip" XPos="41" YPos="61" Width="8" Height="5" />
-	<Image Name="LargeLeftArrow" XPos="2" YPos="65" Width="5" Height="9" />
-	<Image Name="LargeRightArrow" XPos="9" YPos="65" Width="5" Height="9" />
-	<Image Name="LargeUpArrow" XPos="2" YPos="76" Width="9" Height="5" />
-	<Image Name="LargeDownArrow" XPos="2" YPos="83" Width="9" Height="5" />
-	<Image Name="SmallLeftArrow" XPos="17" YPos="73" Width="5" Height="5" />
-	<Image Name="SmallRightArrow" XPos="24" YPos="73" Width="5" Height="5" />
-	<Image Name="SmallUpArrow" XPos="17" YPos="80" Width="5" Height="5" />
-	<Image Name="SmallDownArrow" XPos="24" YPos="80" Width="5" Height="5" />
-	<Image Name="EditBoxCarat" XPos="29" YPos="118" Width="2" Height="8" />
-	<Image Name="MouseArrow" XPos="2" YPos="90" Width="10" Height="19" XOffset="0" YOffset="0" />
-	<Image Name="MouseMoveCursor" XPos="14" YPos="90" Width="22" Height="22" XOffset="-10" YOffset="-10" />
-	<Image Name="MouseNoSoCursor" XPos="38" YPos="89" Width="11" Height="19" XOffset="-4" YOffset="-9" />
-	<Image Name="MouseEsWeCursor" XPos="2" YPos="116" Width="19" Height="8" XOffset="-9" YOffset="-4" />
-	<Image Name="MouseNeSwCursor" XPos="51" YPos="90" Width="15" Height="15" XOffset="-7" YOffset="-6" />
-	<Image Name="MouseNwSeCursor" XPos="68" YPos="90" Width="15" Height="15" XOffset="-6" YOffset="-7" />
-	<Image Name="MouseTextBar" XPos="73" YPos="107" Width="11" Height="20" XOffset="-5" YOffset="-10" />
-	
-	<Image Name="TabControlButtonPaneFiller" XPos="81" YPos="34" Width="2" Height="2" />
-	<Image Name="TabPaneLeft" XPos="92" YPos="9" Width="2" Height="2" />
-	<Image Name="TabPaneRight" XPos="106" YPos="9" Width="2" Height="2" />
-	<Image Name="TabPaneLower" XPos="99" YPos="16" Width="2" Height="2" />
-	<Image Name="TabPaneLowerLeft" XPos="92" YPos="15" Width="3" Height="3" />
-	<Image Name="TabPaneLowerRight" XPos="105" YPos="15" Width="3" Height="3" />
-	<Image Name="TabPaneMiddle" XPos="9" YPos="9" Width="2" Height="2" />
-	<Image Name="TabButtonLeftNormal" XPos="74" YPos="27" Width="2" Height="2" />
-	<Image Name="TabButtonRightNormal" XPos="88" YPos="27" Width="2" Height="2" />
-	<Image Name="TabButtonUpperNormal" XPos="81" YPos="20" Width="2" Height="2" />
-	<Image Name="TabButtonLowerNormal" XPos="81" YPos="34" Width="2" Height="2" />
-	<Image Name="TabButtonUpperLeftNormal" XPos="74" YPos="20" Width="3" Height="3" />
-	<Image Name="TabButtonUpperRightNormal" XPos="87" YPos="20" Width="3" Height="3" />
-	<Image Name="TabButtonLowerLeftNormal" XPos="74" YPos="33" Width="3" Height="3" />
-	<Image Name="TabButtonLowerRightNormal" XPos="87" YPos="33" Width="3" Height="3" />
-	<Image Name="TabButtonMiddleNormal" XPos="9" YPos="9" Width="2" Height="2" />
-
-	<Image Name="TabButtonLeftSelected" XPos="92" YPos="27" Width="2" Height="2" />
-	<Image Name="TabButtonRightSelected" XPos="106" YPos="27" Width="2" Height="2" />
-	<Image Name="TabButtonUpperSelected" XPos="99" YPos="20" Width="2" Height="2" />
-	<Image Name="TabButtonUpperLeftSelected" XPos="92" YPos="20" Width="3" Height="3" />
-	<Image Name="TabButtonUpperRightSelected" XPos="105" YPos="20" Width="3" Height="3" />
-	<Image Name="TabButtonMiddleSelected" XPos="9" YPos="9" Width="2" Height="2" />
-
-	<Image Name="TooltipTopLeft" XPos="74" YPos="38" Width="3" Height="3" />
-	<Image Name="TooltipTopRight" XPos="87" YPos="38" Width="4" Height="3" />
-	<Image Name="TooltipBottomLeft" XPos="74" YPos="51" Width="3" Height="4" />
-	<Image Name="TooltipBottomRight" XPos="87" YPos="51" Width="4" Height="4" />
-	<Image Name="TooltipLeftEdge" XPos="74" YPos="45" Width="3" Height="2" />
-	<Image Name="TooltipRightEdge" XPos="87" YPos="45" Width="4" Height="2" />
-	<Image Name="TooltipTopEdge" XPos="81" YPos="38" Width="2" Height="3" />
-	<Image Name="TooltipBottomEdge" XPos="81" YPos="51" Width="2" Height="4" />
-	<Image Name="TooltipMiddle" XPos="81" YPos="45" Width="2" Height="2" />
-
-	<Image Name="MenuTopLeft" XPos="61" YPos="57" Width="2" Height="2" />
-	<Image Name="MenuTopRight" XPos="70" YPos="57" Width="2" Height="2" />
-	<Image Name="MenuBottomLeft" XPos="61" YPos="66" Width="2" Height="2" />
-	<Image Name="MenuBottomRight" XPos="70" YPos="66" Width="2" Height="2" />
-	<Image Name="MenuLeft" XPos="61" YPos="62" Width="2" Height="1" />
-	<Image Name="MenuRight" XPos="70" YPos="62" Width="2" Height="1" />
-	<Image Name="MenuTop" XPos="66" YPos="57" Width="1" Height="2" />
-	<Image Name="MenuBottom" XPos="66" YPos="66" Width="1" Height="2" />
-	
-	<Image Name="PopupMenuFrameTopLeft" XPos="74" YPos="57" Width="3" Height="3" />
-	<Image Name="PopupMenuFrameTopRight" XPos="87" YPos="57" Width="3" Height="3" />
-	<Image Name="PopupMenuFrameBottomLeft" XPos="74" YPos="70" Width="3" Height="3" />
-	<Image Name="PopupMenuFrameBottomRight" XPos="87" YPos="70" Width="3" Height="3" />
-	<Image Name="PopupMenuFrameLeft" XPos="74" YPos="64" Width="3" Height="2" />
-	<Image Name="PopupMenuFrameRight" XPos="87" YPos="64" Width="3" Height="2" />
-	<Image Name="PopupMenuFrameTop" XPos="81" YPos="57" Width="2" Height="3" />
-	<Image Name="PopupMenuFrameBottom" XPos="81" YPos="70" Width="2" Height="3" />
-	<Image Name="PopupMenuArrowRight" XPos="61" YPos="75" Width="5" Height="9" />
-	<Image Name="PopupMenuArrowLeft" XPos="68" YPos="75" Width="5" Height="9" />
-
-</Imageset>

Deleted: trunk/data/GUI/WindowsLook.looknfeel
===================================================================
--- trunk/data/GUI/WindowsLook.looknfeel	2007-09-22 21:23:57 UTC (rev 765)
+++ trunk/data/GUI/WindowsLook.looknfeel	2007-09-22 21:28:32 UTC (rev 766)
@@ -1,3707 +0,0 @@
-<?xml version="1.0" ?>
-<Falagard>
-	<!--
-	***************************************************
-		WindowsLook/Button
-	***************************************************
-	-->
-	<WidgetLook name="WindowsLook/Button">
-		<Property name="NormalTextColour" value="FF000000" />
-		<Property name="HoverTextColour" value="FF000000" />
-		<Property name="PushedTextColour" value="FF000000" />
-		<Property name="DisabledTextColour" value="FF888888" />
-		<ImagerySection name="label">
-			<TextComponent>
-				<Area>
-					<Dim type="LeftEdge">
-						<AbsoluteDim value="0" />
-					</Dim>
-					<Dim type="TopEdge">
-						<AbsoluteDim value="0" />
-					</Dim>
-					<Dim type="RightEdge">
-						<UnifiedDim scale="1" type="RightEdge" />
-					</Dim>
-					<Dim type="BottomEdge">
-						<UnifiedDim scale="1" type="BottomEdge" />
-					</Dim>
-				</Area>
-				<VertFormat type="CentreAligned" />
-				<HorzFormat type="WordWrapCentreAligned" />
-			</TextComponent>
-		</ImagerySection>
-		<ImagerySection name="normal">
-			<FrameComponent>
-				<Area>
-					<Dim type="LeftEdge">
-						<AbsoluteDim value="0" />
-					</Dim>
-					<Dim type="TopEdge">
-						<AbsoluteDim value="0" />
-					</Dim>
-					<Dim type="RightEdge">
-						<UnifiedDim scale="1" type="RightEdge" />
-					</Dim>
-					<Dim type="BottomEdge">
-						<UnifiedDim scale="1" type="BottomEdge" />
-					</Dim>
-				</Area>
-				<Image type="TopLeftCorner" imageset="WindowsLook" image="ButtonNormalTopLeft" />
-				<Image type="TopRightCorner" imageset="WindowsLook" image="ButtonNormalTopRight" />
-				<Image type="BottomLeftCorner" imageset="WindowsLook" image="ButtonNormalBottomLeft" />
-				<Image type="BottomRightCorner" imageset="WindowsLook" image="ButtonNormalBottomRight" />
-				<Image type="LeftEdge" imageset="WindowsLook" image="ButtonNormalLeft" />
-				<Image type="TopEdge" imageset="WindowsLook" image="ButtonNormalTop" />
-				<Image type="RightEdge" imageset="WindowsLook" image="ButtonNormalRight" />
-				<Image type="BottomEdge" imageset="WindowsLook" image="ButtonNormalBottom" />
-			</FrameComponent>
-			<ImageryComponent>
-				<Area>
-					<Dim type="LeftEdge">
-						<ImageDim imageset="WindowsLook" image="ButtonNormalLeft" dimension="Width" />
-					</Dim>
-					<Dim type="TopEdge">
-						<ImageDim imageset="WindowsLook" image="ButtonNormalTop" dimension="Height" />
-					</Dim>
-					<Dim type="RightEdge">
-						<UnifiedDim scale="1" type="RightEdge">
-							<DimOperator op="Subtract">
-								<ImageDim imageset="WindowsLook" image="ButtonNormalRight" dimension="Width" />
-							</DimOperator>
-						</UnifiedDim>
-					</Dim>
-					<Dim type="BottomEdge">
-						<UnifiedDim scale="1" type="BottomEdge">
-							<DimOperator op="Subtract">
-								<ImageDim imageset="WindowsLook" image="ButtonNormalBottom" dimension="Height" />
-							</DimOperator>
-						</UnifiedDim>
-					</Dim>
-				</Area>
-				<Image imageset="WindowsLook" image="Background" />
-				<Colours topLeft="FFAFAFAF" topRight="FFFFFFFF" bottomLeft="FFFFFFFF" bottomRight="FFAFAFAF" />
-				<VertFormat type="Stretched" />
-				<HorzFormat type="Stretched" />
-			</ImageryComponent>
-		</ImagerySection>
-		<ImagerySection name="hover">
-			<FrameComponent>
-				<Area>
-					<Dim type="LeftEdge">
-						<AbsoluteDim value="0" />
-					</Dim>
-					<Dim type="TopEdge">
-						<AbsoluteDim value="0" />
-					</Dim>
-					<Dim type="RightEdge">
-						<UnifiedDim scale="1" type="RightEdge" />
-					</Dim>
-					<Dim type="BottomEdge">
-						<UnifiedDim scale="1" type="BottomEdge" />
-					</Dim>
-				</Area>
-				<Image type="TopLeftCorner" imageset="WindowsLook" image="ButtonHoverTopLeft" />
-				<Image type="TopRightCorner" imageset="WindowsLook" image="ButtonHoverTopRight" />
-				<Image type="BottomLeftCorner" imageset="WindowsLook" image="ButtonHoverBottomLeft" />
-				<Image type="BottomRightCorner" imageset="WindowsLook" image="ButtonHoverBottomRight" />
-				<Image type="LeftEdge" imageset="WindowsLook" image="ButtonHoverLeft" />
-				<Image type="TopEdge" imageset="WindowsLook" image="ButtonHoverTop" />
-				<Image type="RightEdge" imageset="WindowsLook" image="ButtonHoverRight" />
-				<Image type="BottomEdge" imageset="WindowsLook" image="ButtonHoverBottom" />
-			</FrameComponent>
-			<ImageryComponent>
-				<Area>
-					<Dim type="LeftEdge">
-						<ImageDim imageset="WindowsLook" image="ButtonHoverLeft" dimension="Width" />
-					</Dim>
-					<Dim type="TopEdge">
-						<ImageDim imageset="WindowsLook" image="ButtonHoverTop" dimension="Height" />
-					</Dim>
-					<Dim type="RightEdge">
-						<UnifiedDim scale="1" type="RightEdge">
-							<DimOperator op="Subtract">
-								<ImageDim imageset="WindowsLook" image="ButtonHoverRight" dimension="Width" />
-							</DimOperator>
-						</UnifiedDim>
-					</Dim>
-					<Dim type="BottomEdge">
-						<UnifiedDim scale="1" type="BottomEdge">
-							<DimOperator op="Subtract">
-								<ImageDim imageset="WindowsLook" image="ButtonHoverBottom" dimension="Height" />
-							</DimOperator>
-						</UnifiedDim>
-					</Dim>
-				</Area>
-				<Image imageset="WindowsLook" image="Background" />
-				<Colours topLeft="FFCFD9CF" topRight="FFF2FFF2" bottomLeft="FFF2FFF2" bottomRight="FFCFD9CF" />
-				<VertFormat type="Stretched" />
-				<HorzFormat type="Stretched" />
-			</ImageryComponent>
-		</ImagerySection>
-		<ImagerySection name="pushed">
-			<FrameComponent>
-				<Area>
-					<Dim type="LeftEdge">
-						<AbsoluteDim value="0" />
-					</Dim>
-					<Dim type="TopEdge">
-						<AbsoluteDim value="0" />
-					</Dim>
-					<Dim type="RightEdge">
-						<UnifiedDim scale="1" type="RightEdge" />
-					</Dim>
-					<Dim type="BottomEdge">
-						<UnifiedDim scale="1" type="BottomEdge" />
-					</Dim>
-				</Area>
-				<Image type="TopLeftCorner" imageset="WindowsLook" image="ButtonPushedTopLeft" />
-				<Image type="TopRightCorner" imageset="WindowsLook" image="ButtonPushedTopRight" />
-				<Image type="BottomLeftCorner" imageset="WindowsLook" image="ButtonPushedBottomLeft" />
-				<Image type="BottomRightCorner" imageset="WindowsLook" image="ButtonPushedBottomRight" />
-				<Image type="LeftEdge" imageset="WindowsLook" image="ButtonPushedLeft" />
-				<Image type="TopEdge" imageset="WindowsLook" image="ButtonPushedTop" />
-				<Image type="RightEdge" imageset="WindowsLook" image="ButtonPushedRight" />
-				<Image type="BottomEdge" imageset="WindowsLook" image="ButtonPushedBottom" />
-			</FrameComponent>
-			<ImageryComponent>
-				<Area>
-					<Dim type="LeftEdge">
-						<ImageDim imageset="WindowsLook" image="ButtonPushedLeft" dimension="Width" />
-					</Dim>
-					<Dim type="TopEdge">
-						<ImageDim imageset="WindowsLook" image="ButtonPushedTop" dimension="Height" />
-					</Dim>
-					<Dim type="RightEdge">
-						<UnifiedDim scale="1" type="RightEdge">
-							<DimOperator op="Subtract">
-								<ImageDim imageset="WindowsLook" image="ButtonPushedRight" dimension="Width" />
-							</DimOperator>
-						</UnifiedDim>
-					</Dim>
-					<Dim type="BottomEdge">
-						<UnifiedDim scale="1" type="BottomEdge">
-							<DimOperator op="Subtract">
-								<ImageDim imageset="WindowsLook" image="ButtonPushedBottom" dimension="Height" />
-							</DimOperator>
-						</UnifiedDim>
-					</Dim>
-				</Area>
-				<Image imageset="WindowsLook" image="Background" />
-				<Colours topLeft="FFAFAFAF" topRight="FFFFFFFF" bottomLeft="FFFFFFFF" bottomRight="FFAFAFAF" />
-				<VertFormat type="Stretched" />
-				<HorzFormat type="Stretched" />
-			</ImageryComponent>
-		</ImagerySection>
-		<ImagerySection name="disabled">
-			<FrameComponent>
-				<Area>
-					<Dim type="LeftEdge">
-						<AbsoluteDim value="0" />
-					</Dim>
-					<Dim type="TopEdge">
-						<AbsoluteDim value="0" />
-					</Dim>
-					<Dim type="RightEdge">
-						<UnifiedDim scale="1" type="RightEdge" />
-					</Dim>
-					<Dim type="BottomEdge">
-						<UnifiedDim scale="1" type="BottomEdge" />
-					</Dim>
-				</Area>
-				<Image type="TopLeftCorner" imageset="WindowsLook" image="ButtonNormalTopLeft" />
-				<Image type="TopRightCorner" imageset="WindowsLook" image="ButtonNormalTopRight" />
-				<Image type="BottomLeftCorner" imageset="WindowsLook" image="ButtonNormalBottomLeft" />
-				<Image type="BottomRightCorner" imageset="WindowsLook" image="ButtonNormalBottomRight" />
-				<Image type="LeftEdge" imageset="WindowsLook" image="ButtonNormalLeft" />
-				<Image type="TopEdge" imageset="WindowsLook" image="ButtonNormalTop" />
-				<Image type="RightEdge" imageset="WindowsLook" image="ButtonNormalRight" />
-				<Image type="BottomEdge" imageset="WindowsLook" image="ButtonNormalBottom" />
-			</FrameComponent>
-			<ImageryComponent>
-				<Area>
-					<Dim type="LeftEdge">
-						<ImageDim imageset="WindowsLook" image="ButtonNormalLeft" dimension="Width" />
-					</Dim>
-					<Dim type="TopEdge">
-						<ImageDim imageset="WindowsLook" image="ButtonNormalTop" dimension="Height" />
-					</Dim>
-					<Dim type="RightEdge">
-						<UnifiedDim scale="1" type="RightEdge">
-							<DimOperator op="Subtract">
-								<ImageDim imageset="WindowsLook" image="ButtonNormalRight" dimension="Width" />
-							</DimOperator>
-						</UnifiedDim>
-					</Dim>
-					<Dim type="BottomEdge">
-						<UnifiedDim scale="1" type="BottomEdge">
-							<DimOperator op="Subtract">
-								<ImageDim imageset="WindowsLook" image="ButtonNormalBottom" dimension="Height" />
-							</DimOperator>
-						</UnifiedDim>
-					</Dim>
-				</Area>
-				<Image imageset="WindowsLook" image="Background" />
-				<VertFormat type="Stretched" />
-				<HorzFormat type="Stretched" />
-			</ImageryComponent>
-		</ImagerySection>
-		<StateImagery name="Normal">
-			<Layer>
-				<Section section="normal" />
-				<Section section="label">
-					<ColourProperty name="NormalTextColour" />
-				</Section>
-			</Layer>
-		</StateImagery>
-		<StateImagery name="Hover">
-			<Layer>
-				<Section section="hover" />
-				<Section section="label">
-					<ColourProperty name="HoverTextColour" />
-				</Section>
-			</Layer>
-		</StateImagery>
-		<StateImagery name="Pushed">
-			<Layer>
-				<Section section="pushed" />
-				<Section section="label">
-					<ColourProperty name="PushedTextColour" />
-				</Section>
-			</Layer>
-		</StateImagery>
-		<StateImagery name="Disabled">
-			<Layer>
-				<Section section="disabled">
-					<Colours topLeft="FFDFDFDF" topRight="FFDFDFDF" bottomLeft="FFDFDFDF" bottomRight="FFDFDFDF" />
-				</Section>
-				<Section section="label">
-					<ColourProperty name="DisabledTextColour" />
-				</Section>
-			</Layer>
-		</StateImagery>
-	</WidgetLook>
-
-
-	<!--
-	***************************************************
-		WindowsLook/Checkbox
-	***************************************************
-	-->
-	<WidgetLook name="WindowsLook/Checkbox">
-		<Property name="NormalTextColour" value="FF000000" />
-		<Property name="HoverTextColour" value="FF000000" />
-		<Property name="PushedTextColour" value="FF000000" />
-		<Property name="DisabledTextColour" value="FF888888" />
-		<ImagerySection name="label">
-			<TextComponent>
-				<Area>
-					<Dim type="LeftEdge" >
-						<ImageDim imageset="WindowsLook" image="CheckboxNormal" dimension="Width">
-							<DimOperator op="Add">
-								<AbsoluteDim value="4" />
-							</DimOperator>
-						</ImageDim>
-					</Dim>
-					<Dim type="TopEdge" ><AbsoluteDim value="0" /></Dim>
-					<Dim type="RightEdge" ><UnifiedDim scale="1" type="Width" /></Dim>
-					<Dim type="Height" ><UnifiedDim scale="1" type="Height" /></Dim>
-				</Area>
-				<VertFormat type="CentreAligned" />
-				<HorzFormat type="LeftAligned" />
-			</TextComponent>
-		</ImagerySection>
-		<ImagerySection name="normal">
-			<ImageryComponent>
-				<Area>
-					<Dim type="LeftEdge" ><AbsoluteDim value="0" /></Dim>
-					<Dim type="TopEdge" ><AbsoluteDim value="0" /></Dim>
-					<Dim type="Width" ><UnifiedDim scale="1" type="Width" /></Dim>
-					<Dim type="Height" ><UnifiedDim scale="1" type="Height" /></Dim>
-				</Area>
-				<Image imageset="WindowsLook" image="CheckboxNormal" />
-				<VertFormat type="CentreAligned" />
-				<HorzFormat type="LeftAligned" />
-			</ImageryComponent>
-		</ImagerySection>
-		<ImagerySection name="hover">
-			<ImageryComponent>
-				<Area>
-					<Dim type="LeftEdge" ><AbsoluteDim value="0" /></Dim>
-					<Dim type="TopEdge" ><AbsoluteDim value="0" /></Dim>
-					<Dim type="Width" ><UnifiedDim scale="1" type="Width" /></Dim>
-					<Dim type="Height" ><UnifiedDim scale="1" type="Height" /></Dim>
-				</Area>
-				<Image imageset="WindowsLook" image="CheckboxHover" />
-				<VertFormat type="CentreAligned" />
-				<HorzFormat type="LeftAligned" />
-			</ImageryComponent>
-		</ImagerySection>
-		<ImagerySection name="select_mark">
-			<ImageryComponent>
-				<Area>
-					<Dim type="LeftEdge" ><AbsoluteDim value="0" /></Dim>
-					<Dim type="TopEdge" ><AbsoluteDim value="0" /></Dim>
-					<Dim type="Width" ><UnifiedDim scale="1" type="Width" /></Dim>
-					<Dim type="Height" ><UnifiedDim scale="1" type="Height" /></Dim>
-				</Area>
-				<Image imageset="WindowsLook" image="CheckboxMark" />
-				<VertFormat type="CentreAligned" />
-				<HorzFormat type="LeftAligned" />
-			</ImageryComponent>
-		</ImagerySection>
-		<StateImagery name="Normal">
-			<Layer>
-				<Section section="normal" />
-				<Section section="label">
-					<ColourProperty name="NormalTextColour" />
-				</Section>
-			</Layer>
-		</StateImagery>
-		<StateImagery name="Hover">
-			<Layer>
-				<Section section="hover" />
-				<Section section="label">
-					<ColourProperty name="HoverTextColour" />
-				</Section>
-			</Layer>
-		</StateImagery>
-		<StateImagery name="SelectedNormal">
-			<Layer>
-				<Section section="normal" />
-				<Section section="select_mark" />
-				<Section section="label">
-					<ColourProperty name="NormalTextColour" />
-				</Section>
-			</Layer>
-		</StateImagery>
-		<StateImagery name="SelectedHover">
-			<Layer>
-				<Section section="hover" />
-				<Section section="select_mark" />
-				<Section section="label">
-					<ColourProperty name="HoverTextColour" />
-				</Section>
-			</Layer>
-		</StateImagery>
-	</WidgetLook>
-
-
-	<!--
-	***************************************************
-		WindowsLook/CloseButton
-	***************************************************
-	-->
-	<WidgetLook name="WindowsLook/CloseButton">
-		<ImagerySection name="normal">
-			<ImageryComponent>
-				<Area>
-					<Dim type="LeftEdge">
-						<AbsoluteDim value="0" />
-					</Dim>
-					<Dim type="TopEdge">
-						<AbsoluteDim value="0" />
-					</Dim>
-					<Dim type="RightEdge">
-						<UnifiedDim scale="1" type="RightEdge" />
-					</Dim>
-					<Dim type="BottomEdge">
-						<UnifiedDim scale="1" type="BottomEdge" />
-					</Dim>
-				</Area>
-				<Image imageset="WindowsLook" image="CloseButtonNormal" />
-				<VertFormat type="Stretched" />
-				<HorzFormat type="Stretched" />
-			</ImageryComponent>
-		</ImagerySection>
-		<ImagerySection name="hover">
-			<ImageryComponent>
-				<Area>
-					<Dim type="LeftEdge">
-						<AbsoluteDim value="0" />
-					</Dim>
-					<Dim type="TopEdge">
-						<AbsoluteDim value="0" />
-					</Dim>
-					<Dim type="RightEdge">
-						<UnifiedDim scale="1" type="RightEdge" />
-					</Dim>
-					<Dim type="BottomEdge">
-						<UnifiedDim scale="1" type="BottomEdge" />
-					</Dim>
-				</Area>
-				<Image imageset="WindowsLook" image="CloseButtonHover" />
-				<VertFormat type="Stretched" />
-				<HorzFormat type="Stretched" />
-			</ImageryComponent>
-		</ImagerySection>
-		<ImagerySection name="pushed">
-			<ImageryComponent>
-				<Area>
-					<Dim type="LeftEdge">
-						<AbsoluteDim value="0" />
-					</Dim>
-					<Dim type="TopEdge">
-						<AbsoluteDim value="0" />
-					</Dim>
-					<Dim type="RightEdge">
-						<UnifiedDim scale="1" type="RightEdge" />
-					</Dim>
-					<Dim type="BottomEdge">
-						<UnifiedDim scale="1" type="BottomEdge" />
-					</Dim>
-				</Area>
-				<Image imageset="WindowsLook" image="CloseButtonPushed" />
-				<VertFormat type="Stretched" />
-				<HorzFormat type="Stretched" />
-			</ImageryComponent>
-		</ImagerySection>
-		<StateImagery name="Normal">
-			<Layer>
-				<Section section="normal" />
-			</Layer>
-		</StateImagery>
-		<StateImagery name="Hover">
-			<Layer>
-				<Section section="hover" />
-			</Layer>
-		</StateImagery>
-		<StateImagery name="Pushed">
-			<Layer>
-				<Section section="pushed" />
-			</Layer>
-		</StateImagery>
-		<StateImagery name="Disabled">
-			<Layer>
-				<Section section="normal">
-					<Colours topLeft="FFDFDFDF" topRight="FFDFDFDF" bottomLeft="FFDFDFDF" bottomRight="FFDFDFDF" />
-				</Section>
-			</Layer>
-		</StateImagery>
-	</WidgetLook>
-
-
-	<!--
-	***************************************************
-		WindowsLook/ComboDropList
-	***************************************************
-	-->
-	<WidgetLook name="WindowsLook/ComboDropList">
-		<NamedArea name="ItemRenderingArea">
-			<Area>
-				<Dim type="LeftEdge" ><ImageDim imageset="WindowsLook" image="StaticFrameLeft" dimension="Width" /></Dim>
-				<Dim type="TopEdge" ><ImageDim imageset="WindowsLook" image="StaticFrameTop" dimension="Height" /></Dim>
-				<Dim type="RightEdge" >
-					<UnifiedDim scale="1" type="RightEdge">
-						<DimOperator op="Subtract">
-							<ImageDim imageset="WindowsLook" image="StaticFrameRight" dimension="Width" />
-						</DimOperator>
-					</UnifiedDim>
-				</Dim>
-				<Dim type="BottomEdge" >
-					<UnifiedDim scale="1" type="BottomEdge">
-						<DimOperator op="Subtract">
-							<ImageDim imageset="WindowsLook" image="StaticFrameBottom" dimension="Height" />
-						</DimOperator>
-					</UnifiedDim>
-				</Dim>
-			</Area>
-		</NamedArea>
-		<NamedArea name="ItemRenderingAreaHScroll">
-			<Area>
-				<Dim type="LeftEdge" ><ImageDim imageset="WindowsLook" image="StaticFrameLeft" dimension="Width" /></Dim>
-				<Dim type="TopEdge" ><ImageDim imageset="WindowsLook" image="StaticFrameTop" dimension="Height" /></Dim>
-				<Dim type="RightEdge" >
-					<UnifiedDim scale="1" type="RightEdge">
-						<DimOperator op="Subtract">
-							<ImageDim imageset="WindowsLook" image="StaticFrameRight" dimension="Width" />
-						</DimOperator>
-					</UnifiedDim>
-				</Dim>
-				<Dim type="BottomEdge" >
-					<UnifiedDim scale="1" offset="-16" type="BottomEdge" />
-				</Dim>
-			</Area>
-		</NamedArea>
-		<NamedArea name="ItemRenderingAreaVScroll">
-			<Area>
-				<Dim type="LeftEdge" ><ImageDim imageset="WindowsLook" image="StaticFrameLeft" dimension="Width" /></Dim>
-				<Dim type="TopEdge" ><ImageDim imageset="WindowsLook" image="StaticFrameTop" dimension="Height" /></Dim>
-				<Dim type="RightEdge" >
-					<UnifiedDim scale="1" offset="-16" type="RightEdge" />
-				</Dim>
-				<Dim type="BottomEdge" >
-					<UnifiedDim scale="1" type="BottomEdge">
-						<DimOperator op="Subtract">
-							<ImageDim imageset="WindowsLook" image="StaticFrameBottom" dimension="Height" />
-						</DimOperator>
-					</UnifiedDim>
-				</Dim>
-			</Area>
-		</NamedArea>
-		<NamedArea name="ItemRenderingAreaHVScroll">
-			<Area>
-				<Dim type="LeftEdge" ><ImageDim imageset="WindowsLook" image="StaticFrameLeft" dimension="Width" /></Dim>
-				<Dim type="TopEdge" ><ImageDim imageset="WindowsLook" image="StaticFrameTop" dimension="Height" /></Dim>
-				<Dim type="RightEdge" >
-					<UnifiedDim scale="1" offset="-16" type="RightEdge" />
-				</Dim>
-				<Dim type="BottomEdge" >
-					<UnifiedDim scale="1" offset="-16" type="BottomEdge" />
-				</Dim>
-			</Area>
-		</NamedArea>
-		<Child  type="WindowsLook/HorizontalScrollbar" nameSuffix="__auto_hscrollbar__">
-			<Area>
-				<Dim type="LeftEdge" ><AbsoluteDim value="0" /></Dim>
-				<Dim type="TopEdge" ><AbsoluteDim value="0" /></Dim>
-				<Dim type="Width" ><UnifiedDim scale="1" offset="-16" type="Width" /></Dim>
-				<Dim type="Height" ><AbsoluteDim value="16" /></Dim>
-			</Area>
-			<VertAlignment type="BottomAligned" />
-		</Child>
-		<Child  type="WindowsLook/VerticalScrollbar" nameSuffix="__auto_vscrollbar__">
-			<Area>
-				<Dim type="LeftEdge" ><AbsoluteDim value="0" /></Dim>
-				<Dim type="TopEdge" ><AbsoluteDim value="0" /></Dim>
-				<Dim type="Width" ><AbsoluteDim value="16" /></Dim>
-				<Dim type="Height" ><UnifiedDim scale="1" offset="-16" type="Height" /></Dim>
-			</Area>
-			<HorzAlignment type="RightAligned" />
-		</Child>
-		<ImagerySection name="main">
-			<FrameComponent>
-				<Area>
-					<Dim type="LeftEdge" ><AbsoluteDim value="0" /></Dim>
-					<Dim type="TopEdge" ><AbsoluteDim value="0" /></Dim>
-					<Dim type="Width" ><UnifiedDim scale="1" type="Width" /></Dim>
-					<Dim type="Height" ><UnifiedDim scale="1" type="Height" /></Dim>
-				</Area>
-				<Image type="TopLeftCorner" imageset="WindowsLook" image="StaticFrameTopLeft" />
-				<Image type="TopRightCorner" imageset="WindowsLook" image="StaticFrameTopRight" />
-				<Image type="BottomLeftCorner" imageset="WindowsLook" image="StaticFrameBottomLeft" />
-				<Image type="BottomRightCorner" imageset="WindowsLook" image="StaticFrameBottomRight" />
-				<Image type="LeftEdge" imageset="WindowsLook" image="StaticFrameLeft" />
-				<Image type="RightEdge" imageset="WindowsLook" image="StaticFrameRight" />
-				<Image type="TopEdge" imageset="WindowsLook" image="StaticFrameTop" />
-				<Image type="BottomEdge" imageset="WindowsLook" image="StaticFrameBottom" />
-				<Image type="Background" imageset="WindowsLook" image="Background" />
-			</FrameComponent>
-		</ImagerySection>
-		<StateImagery name="Enabled">
-			<Layer>
-				<Section section="main" />
-			</Layer>
-		</StateImagery>
-		<StateImagery name="Disabled">
-			<Layer>
-				<Section section="main" />
-			</Layer>
-		</StateImagery>
-	</WidgetLook>
-
-
-	<!--
-	***************************************************
-		WindowsLook/Combobox
-	***************************************************
-	-->
-	<WidgetLook name="WindowsLook/Combobox">
-		<Child  type="WindowsLook/Editbox" nameSuffix="__auto_editbox__">
-			<Area>
-				<Dim type="LeftEdge" ><AbsoluteDim value="0" /></Dim>
-				<Dim type="TopEdge" ><AbsoluteDim value="0" /></Dim>
-				<Dim type="RightEdge" >
-					<UnifiedDim scale="1" type="RightEdge">
-						<DimOperator op="Subtract">
-							<ImageDim imageset="WindowsLook" image="EditFrameTop" dimension="Height">
-								<DimOperator op="Add">
-									<ImageDim imageset="WindowsLook" image="EditFrameBottom" dimension="Height">
-										<DimOperator op="Add">
-											<FontDim type="LineSpacing">
-												<DimOperator op="Multiply">
-													<AbsoluteDim value="1.5" />
-												</DimOperator>
-											</FontDim>
-										</DimOperator>
-									</ImageDim>
-								</DimOperator>
-							</ImageDim>
-						</DimOperator>
-					</UnifiedDim>
-				</Dim>
-				<Dim type="Height" >
-					<ImageDim imageset="WindowsLook" image="EditFrameTop" dimension="Height">
-						<DimOperator op="Add">
-							<ImageDim imageset="WindowsLook" image="EditFrameBottom" dimension="Height">
-								<DimOperator op="Add">
-									<FontDim type="LineSpacing">
-										<DimOperator op="Multiply">
-											<AbsoluteDim value="1.5" />
-										</DimOperator>
-									</FontDim>
-								</DimOperator>
-							</ImageDim>
-						</DimOperator>
-					</ImageDim>
-				</Dim>
-			</Area>
-		</Child>
-		<Child  type="WindowsLook/ComboDropList" nameSuffix="__auto_droplist__">
-			<Area>
-				<Dim type="LeftEdge" ><AbsoluteDim value="0" /></Dim>
-				<Dim type="TopEdge" ><WidgetDim widget="__auto_editbox__" dimension="BottomEdge" /></Dim>
-				<Dim type="Width" ><UnifiedDim scale="1" type="Width" /></Dim>
-				<Dim type="BottomEdge" ><UnifiedDim scale="1" type="BottomEdge" /></Dim>
-			</Area>
-		</Child>
-		<Child  type="WindowsLook/IconButton" nameSuffix="__auto_button__">
-			<Area>
-				<Dim type="LeftEdge" ><AbsoluteDim value="0" /></Dim>
-				<Dim type="TopEdge" ><AbsoluteDim value="0" /></Dim>
-				<Dim type="Width" ><WidgetDim widget="__auto_editbox__" dimension="Height" /></Dim>
-				<Dim type="Height" ><WidgetDim widget="__auto_editbox__" dimension="Height" /></Dim>
-			</Area>
-			<HorzAlignment type="RightAligned" />
-			<Property name="IconImage" value="set:WindowsLook image:LargeDownArrow" />
-		</Child>
-		<StateImagery name="Enabled" />
-		<StateImagery name="Disabled" />
-	</WidgetLook>
-
-
-	<!--
-	***************************************************
-		WindowsLook/Editbox
-	***************************************************
-	-->
-	<WidgetLook name="WindowsLook/Editbox">
-		<PropertyDefinition name="ReadOnlyBGColour" initialValue="FFDFDFDF" />
-		<Property name="MouseCursorImage" value="set:WindowsLook image:MouseTextBar" />
-		<Property name="NormalTextColour" value="FF000000" />
-		<Property name="SelectedTextColour" value="FFFFFFFF" />
-		<Property name="ActiveSelectionColour" value="FF607FFF" />
-		<Property name="InactiveSelectionColour" value="FF808080" />
-		<NamedArea name="TextArea">
-			<Area>
-				<Dim type="LeftEdge" ><AbsoluteDim value="5" /></Dim>
-				<Dim type="TopEdge" ><AbsoluteDim value="5" /></Dim>
-				<Dim type="RightEdge" ><UnifiedDim scale="1.0" offset="-5" type="RightEdge" /></Dim>
-				<Dim type="BottomEdge" ><UnifiedDim scale="1.0" offset="-5" type="BottomEdge" /></Dim>
-			</Area>
-		</NamedArea>
-		<ImagerySection name="container_normal">
-			<FrameComponent>
-				<Area>
-					<Dim type="LeftEdge" ><AbsoluteDim value="0" /></Dim>
-					<Dim type="TopEdge" ><AbsoluteDim value="0" /></Dim>
-					<Dim type="Width" ><UnifiedDim scale="1" type="Width" /></Dim>
-					<Dim type="Height" ><UnifiedDim scale="1" type="Height" /></Dim>
-				</Area>
-				<Image type="TopLeftCorner" imageset="WindowsLook" image="EditFrameTopLeft" />
-				<Image type="TopRightCorner" imageset="WindowsLook" image="EditFrameTopRight" />
-				<Image type="BottomLeftCorner" imageset="WindowsLook" image="EditFrameBottomLeft" />
-				<Image type="BottomRightCorner" imageset="WindowsLook" image="EditFrameBottomRight" />
-				<Image type="LeftEdge" imageset="WindowsLook" image="EditFrameLeft" />
-				<Image type="TopEdge" imageset="WindowsLook" image="EditFrameTop" />
-				<Image type="RightEdge" imageset="WindowsLook" image="EditFrameRight" />
-				<Image type="BottomEdge" imageset="WindowsLook" image="EditFrameBottom" />
-				<Image type="Background" imageset="WindowsLook" image="Background" />
-			</FrameComponent>
-		</ImagerySection>
-		<ImagerySection name="selection">
-			<ImageryComponent>
-				<Area>
-					<Dim type="LeftEdge" ><AbsoluteDim value="0" /></Dim>
-					<Dim type="TopEdge" ><AbsoluteDim value="0" /></Dim>
-					<Dim type="RightEdge" ><UnifiedDim scale="1.0" type="RightEdge" /></Dim>
-					<Dim type="BottomEdge" ><UnifiedDim scale="1.0" type="BottomEdge" /></Dim>
-				</Area>
-				<Image imageset="WindowsLook" image="Background" />
-				<VertFormat type="Stretched" />
-				<HorzFormat type="Stretched" />
-			</ImageryComponent>
-		</ImagerySection>
-		<ImagerySection name="Carat">
-			<ImageryComponent>
-				<Area>
-					<Dim type="LeftEdge" ><AbsoluteDim value="0" /></Dim>
-					<Dim type="TopEdge" ><AbsoluteDim value="0" /></Dim>
-					<Dim type="Width" ><ImageDim imageset="WindowsLook" image="EditBoxCarat" dimension="Width" /></Dim>
-					<Dim type="BottomEdge" ><UnifiedDim scale="1.0" type="BottomEdge" /></Dim>
-				</Area>
-				<Image imageset="WindowsLook" image="EditBoxCarat" />
-				<VertFormat type="Stretched" />
-				<HorzFormat type="Stretched" />
-			</ImageryComponent>
-		</ImagerySection>
-		<StateImagery name="Enabled">
-			<Layer>
-				<Section section="container_normal" />
-			</Layer>
-		</StateImagery>
-		<StateImagery name="ReadOnly">
-			<Layer>
-				<Section section="container_normal">
-					<ColourProperty name="ReadOnlyBGColour" />
-				</Section>
-			</Layer>
-		</StateImagery>
-		<StateImagery name="Disabled">
-			<Layer>
-				<Section section="container_normal">
-					<ColourProperty name="ReadOnlyBGColour" />
-				</Section>
-			</Layer>
-		</StateImagery>
-		<StateImagery name="ActiveSelection">
-			<Layer>
-				<Section section="selection">
-					<ColourProperty name="ActiveSelectionColour" />
-				</Section>
-			</Layer>
-		</StateImagery>
-		<StateImagery name="InactiveSelection">
-			<Layer>
-				<Section section="selection">
-					<ColourProperty name="InactiveSelectionColour" />
-				</Section>
-			</Layer>
-		</StateImagery>
-	</WidgetLook>
-
-
-	<!--
-	***************************************************
-		WindowsLook/FrameWindow
-	***************************************************
-	-->
-	<WidgetLook name="WindowsLook/FrameWindow">
-		<Property name="NSSizingCursorImage" value="set:WindowsLook image:MouseNoSoCursor" />
-		<Property name="EWSizingCursorImage" value="set:WindowsLook image:MouseEsWeCursor" />
-		<Property name="NWSESizingCursorImage" value="set:WindowsLook image:MouseNwSeCursor" />
-		<Property name="NESWSizingCursorImage" value="set:WindowsLook image:MouseNeSwCursor" />
-		<NamedArea name="ClientWithTitleWithFrame">
-			<Area>
-				<Dim type="LeftEdge">
-					<ImageDim imageset="WindowsLook" image="WindowFrameLeft" dimension="Width" />
-				</Dim>
-				<Dim type="TopEdge">
-					<WidgetDim widget="__auto_titlebar__" dimension="BottomEdge" />
-				</Dim>
-				<Dim type="RightEdge">
-					<UnifiedDim scale="1" type="RightEdge">
-						<DimOperator op="Subtract">
-							<ImageDim imageset="WindowsLook" image="WindowFrameRight" dimension="Width" />
-						</DimOperator>
-					</UnifiedDim>
-				</Dim>
-				<Dim type="BottomEdge">
-					<UnifiedDim scale="1" type="BottomEdge">
-						<DimOperator op="Subtract">
-							<ImageDim imageset="WindowsLook" image="WindowFrameBottom" dimension="Height" />
-						</DimOperator>
-					</UnifiedDim>
-				</Dim>
-			</Area>
-		</NamedArea>
-		<NamedArea name="ClientWithTitleNoFrame">
-			<Area>
-				<Dim type="LeftEdge">
-					<AbsoluteDim value="0" />
-				</Dim>
-				<Dim type="TopEdge">
-					<WidgetDim widget="__auto_titlebar__" dimension="BottomEdge" />
-				</Dim>
-				<Dim type="RightEdge">
-					<UnifiedDim scale="1" type="RightEdge" />
-				</Dim>
-				<Dim type="BottomEdge">
-					<UnifiedDim scale="1" type="BottomEdge" />
-				</Dim>
-			</Area>
-		</NamedArea>
-		<NamedArea name="ClientNoTitleWithFrame">
-			<Area>
-				<Dim type="LeftEdge">
-					<ImageDim imageset="WindowsLook" image="WindowFrameLeft" dimension="Width" />
-				</Dim>
-				<Dim type="TopEdge">
-					<ImageDim imageset="WindowsLook" image="WindowFrameTop" dimension="Height" />
-				</Dim>
-				<Dim type="RightEdge">
-					<UnifiedDim scale="1" type="RightEdge">
-						<DimOperator op="Subtract">
-							<ImageDim imageset="WindowsLook" image="WindowFrameRight" dimension="Width" />
-						</DimOperator>
-					</UnifiedDim>
-				</Dim>
-				<Dim type="BottomEdge">
-					<UnifiedDim scale="1" type="BottomEdge">
-						<DimOperator op="Subtract">
-							<ImageDim imageset="WindowsLook" image="WindowFrameBottom" dimension="Height" />
-						</DimOperator>
-					</UnifiedDim>
-				</Dim>
-			</Area>
-		</NamedArea>
-		<NamedArea name="ClientNoTitleNoFrame">
-			<Area>
-				<Dim type="LeftEdge">
-					<AbsoluteDim value="0" />
-				</Dim>
-				<Dim type="TopEdge">
-					<AbsoluteDim value="0" />
-				</Dim>
-				<Dim type="RightEdge">
-					<UnifiedDim scal...
 
[truncated message content]

[Opengate-svn] SF.net SVN: opengate: [767] trunk/data

[<eg...@us...>]

Revision: 767
          http://opengate.svn.sourceforge.net/opengate/?rev=767&view=rev
Author:   egore
Date:     2007-09-22 14:31:03 -0700 (Sat, 22 Sep 2007)

Log Message:
-----------
complete GUI->gui move

Modified Paths:
--------------
    trunk/data/gui/GUIScheme.xsd

Removed Paths:
-------------
    trunk/data/GUI/

Modified: trunk/data/gui/GUIScheme.xsd
===================================================================
--- trunk/data/gui/GUIScheme.xsd	2007-09-22 21:28:32 UTC (rev 766)
+++ trunk/data/gui/GUIScheme.xsd	2007-09-22 21:31:03 UTC (rev 767)
@@ -3,14 +3,14 @@
 	<xsd:element name="GUIScheme" type="SchemeType" />
 	<xsd:complexType name="SchemeType">
         <xsd:choice minOccurs="0" maxOccurs="unbounded">
-	<xsd:element name="Imageset" type="NamedDataType" />
-        <xsd:element name="ImagesetFromImage" type="NamedDataType" />
-	<xsd:element name="Font" type="NamedDataType" />
-        <xsd:element name="LookNFeel" type="FileDataType" />
-	<xsd:element name="WindowSet" type="WindowSetType" />
-	<xsd:element name="WindowRendererSet" type="WindowRendererSetType" />
-	<xsd:element name="WindowAlias" type="WindowAliasType" />
-        <xsd:element name="FalagardMapping" type="FalagardMapType" />
+			<xsd:element name="Imageset" type="NamedDataType" />
+			<xsd:element name="ImagesetFromImage" type="NamedDataType" />
+			<xsd:element name="Font" type="NamedDataType" />
+			<xsd:element name="LookNFeel" type="FileDataType" />
+			<xsd:element name="WindowSet" type="WindowSetType" />
+			<xsd:element name="WindowRendererSet" type="WindowRendererSetType" />
+			<xsd:element name="WindowAlias" type="WindowAliasType" />
+			<xsd:element name="FalagardMapping" type="FalagardMapType" />
 		</xsd:choice>
 		<xsd:attribute name="Name" type="xsd:string" use="required" />
 	</xsd:complexType>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opengate-svn] SF.net SVN: opengate: [777] trunk/data

[<eg...@us...>]

Revision: 777
          http://opengate.svn.sourceforge.net/opengate/?rev=777&view=rev
Author:   egore
Date:     2007-09-23 06:09:20 -0700 (Sun, 23 Sep 2007)

Log Message:
-----------
lowercase

Added Paths:
-----------
    trunk/data/ecms/

Removed Paths:
-------------
    trunk/data/ECMs/

Copied: trunk/data/ecms (from rev 766, trunk/data/ECMs)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opengate-svn] SF.net SVN: opengate: [778] trunk/data

[<eg...@us...>]

Revision: 778
          http://opengate.svn.sourceforge.net/opengate/?rev=778&view=rev
Author:   egore
Date:     2007-09-23 06:13:44 -0700 (Sun, 23 Sep 2007)

Log Message:
-----------
merge asteroids directories

Added Paths:
-----------
    trunk/data/asteroids/ice_oval.material
    trunk/data/asteroids/ice_oval.png
    trunk/data/asteroids/ice_oval_10.mesh
    trunk/data/asteroids/ice_oval_6.mesh
    trunk/data/asteroids/ice_oval_7.mesh
    trunk/data/asteroids/ice_oval_8.mesh
    trunk/data/asteroids/ice_oval_9.mesh
    trunk/data/asteroids/normal_oval.material
    trunk/data/asteroids/normal_oval.png
    trunk/data/asteroids/normal_oval_1.mesh
    trunk/data/asteroids/normal_oval_2.mesh
    trunk/data/asteroids/normal_oval_3.mesh
    trunk/data/asteroids/normal_oval_4.mesh
    trunk/data/asteroids/normal_oval_5.mesh

Removed Paths:
-------------
    trunk/data/misc/asteroids/ice_oval.material
    trunk/data/misc/asteroids/ice_oval.png
    trunk/data/misc/asteroids/ice_oval_10.mesh
    trunk/data/misc/asteroids/ice_oval_6.mesh
    trunk/data/misc/asteroids/ice_oval_7.mesh
    trunk/data/misc/asteroids/ice_oval_8.mesh
    trunk/data/misc/asteroids/ice_oval_9.mesh
    trunk/data/misc/asteroids/normal_oval.material
    trunk/data/misc/asteroids/normal_oval.png
    trunk/data/misc/asteroids/normal_oval_1.mesh
    trunk/data/misc/asteroids/normal_oval_2.mesh
    trunk/data/misc/asteroids/normal_oval_3.mesh
    trunk/data/misc/asteroids/normal_oval_4.mesh
    trunk/data/misc/asteroids/normal_oval_5.mesh

Copied: trunk/data/asteroids/ice_oval.material (from rev 766, trunk/data/misc/asteroids/ice_oval.material)
===================================================================
--- trunk/data/asteroids/ice_oval.material	                        (rev 0)
+++ trunk/data/asteroids/ice_oval.material	2007-09-23 13:13:44 UTC (rev 778)
@@ -0,0 +1,25 @@
+material asteroid/TEXFACE/ice_oval.png
+{
+	receive_shadows on
+	technique
+	{
+		pass
+		{
+			ambient 0.500000 0.500000 0.500000 1.000000
+			diffuse 0.800000 0.800000 0.800000 1.000000
+			emissive 0.000000 0.000000 0.000000 1.000000
+			texture_unit
+			{
+				texture ice_oval.png
+				colour_op modulate
+			}
+		}
+		pass
+		{
+			ambient 0.0 0.0 0.0
+			diffuse 0.0 0.0 0.0
+			specular 0.500000 0.500000 0.500000 1.000000 12.500000
+			scene_blend add
+		}
+	}
+}

Copied: trunk/data/asteroids/ice_oval.png (from rev 766, trunk/data/misc/asteroids/ice_oval.png)
===================================================================
(Binary files differ)

Copied: trunk/data/asteroids/ice_oval_10.mesh (from rev 766, trunk/data/misc/asteroids/ice_oval_10.mesh)
===================================================================
(Binary files differ)

Copied: trunk/data/asteroids/ice_oval_6.mesh (from rev 766, trunk/data/misc/asteroids/ice_oval_6.mesh)
===================================================================
(Binary files differ)

Copied: trunk/data/asteroids/ice_oval_7.mesh (from rev 766, trunk/data/misc/asteroids/ice_oval_7.mesh)
===================================================================
(Binary files differ)

Copied: trunk/data/asteroids/ice_oval_8.mesh (from rev 766, trunk/data/misc/asteroids/ice_oval_8.mesh)
===================================================================
(Binary files differ)

Copied: trunk/data/asteroids/ice_oval_9.mesh (from rev 766, trunk/data/misc/asteroids/ice_oval_9.mesh)
===================================================================
(Binary files differ)

Copied: trunk/data/asteroids/normal_oval.material (from rev 766, trunk/data/misc/asteroids/normal_oval.material)
===================================================================
--- trunk/data/asteroids/normal_oval.material	                        (rev 0)
+++ trunk/data/asteroids/normal_oval.material	2007-09-23 13:13:44 UTC (rev 778)
@@ -0,0 +1,25 @@
+material asteroid/TEXFACE/normal_oval.png
+{
+	receive_shadows on
+	technique
+	{
+		pass
+		{
+			ambient 0.500000 0.500000 0.500000 1.000000
+			diffuse 0.800000 0.800000 0.800000 1.000000
+			emissive 0.000000 0.000000 0.000000 1.000000
+			texture_unit
+			{
+				texture normal_oval.png
+				colour_op modulate
+			}
+		}
+		pass
+		{
+			ambient 0.0 0.0 0.0
+			diffuse 0.0 0.0 0.0
+			specular 0.500000 0.500000 0.500000 1.000000 12.500000
+			scene_blend add
+		}
+	}
+}

Copied: trunk/data/asteroids/normal_oval.png (from rev 766, trunk/data/misc/asteroids/normal_oval.png)
===================================================================
(Binary files differ)

Copied: trunk/data/asteroids/normal_oval_1.mesh (from rev 766, trunk/data/misc/asteroids/normal_oval_1.mesh)
===================================================================
(Binary files differ)

Copied: trunk/data/asteroids/normal_oval_2.mesh (from rev 766, trunk/data/misc/asteroids/normal_oval_2.mesh)
===================================================================
(Binary files differ)

Copied: trunk/data/asteroids/normal_oval_3.mesh (from rev 766, trunk/data/misc/asteroids/normal_oval_3.mesh)
===================================================================
(Binary files differ)

Copied: trunk/data/asteroids/normal_oval_4.mesh (from rev 766, trunk/data/misc/asteroids/normal_oval_4.mesh)
===================================================================
(Binary files differ)

Copied: trunk/data/asteroids/normal_oval_5.mesh (from rev 766, trunk/data/misc/asteroids/normal_oval_5.mesh)
===================================================================
(Binary files differ)

Deleted: trunk/data/misc/asteroids/ice_oval.material
===================================================================
--- trunk/data/misc/asteroids/ice_oval.material	2007-09-23 13:09:20 UTC (rev 777)
+++ trunk/data/misc/asteroids/ice_oval.material	2007-09-23 13:13:44 UTC (rev 778)
@@ -1,25 +0,0 @@
-material asteroid/TEXFACE/ice_oval.png
-{
-	receive_shadows on
-	technique
-	{
-		pass
-		{
-			ambient 0.500000 0.500000 0.500000 1.000000
-			diffuse 0.800000 0.800000 0.800000 1.000000
-			emissive 0.000000 0.000000 0.000000 1.000000
-			texture_unit
-			{
-				texture ice_oval.png
-				colour_op modulate
-			}
-		}
-		pass
-		{
-			ambient 0.0 0.0 0.0
-			diffuse 0.0 0.0 0.0
-			specular 0.500000 0.500000 0.500000 1.000000 12.500000
-			scene_blend add
-		}
-	}
-}

Deleted: trunk/data/misc/asteroids/ice_oval.png
===================================================================
(Binary files differ)

Deleted: trunk/data/misc/asteroids/ice_oval_10.mesh
===================================================================
(Binary files differ)

Deleted: trunk/data/misc/asteroids/ice_oval_6.mesh
===================================================================
(Binary files differ)

Deleted: trunk/data/misc/asteroids/ice_oval_7.mesh
===================================================================
(Binary files differ)

Deleted: trunk/data/misc/asteroids/ice_oval_8.mesh
===================================================================
(Binary files differ)

Deleted: trunk/data/misc/asteroids/ice_oval_9.mesh
===================================================================
(Binary files differ)

Deleted: trunk/data/misc/asteroids/normal_oval.material
===================================================================
--- trunk/data/misc/asteroids/normal_oval.material	2007-09-23 13:09:20 UTC (rev 777)
+++ trunk/data/misc/asteroids/normal_oval.material	2007-09-23 13:13:44 UTC (rev 778)
@@ -1,25 +0,0 @@
-material asteroid/TEXFACE/normal_oval.png
-{
-	receive_shadows on
-	technique
-	{
-		pass
-		{
-			ambient 0.500000 0.500000 0.500000 1.000000
-			diffuse 0.800000 0.800000 0.800000 1.000000
-			emissive 0.000000 0.000000 0.000000 1.000000
-			texture_unit
-			{
-				texture normal_oval.png
-				colour_op modulate
-			}
-		}
-		pass
-		{
-			ambient 0.0 0.0 0.0
-			diffuse 0.0 0.0 0.0
-			specular 0.500000 0.500000 0.500000 1.000000 12.500000
-			scene_blend add
-		}
-	}
-}

Deleted: trunk/data/misc/asteroids/normal_oval.png
===================================================================
(Binary files differ)

Deleted: trunk/data/misc/asteroids/normal_oval_1.mesh
===================================================================
(Binary files differ)

Deleted: trunk/data/misc/asteroids/normal_oval_2.mesh
===================================================================
(Binary files differ)

Deleted: trunk/data/misc/asteroids/normal_oval_3.mesh
===================================================================
(Binary files differ)

Deleted: trunk/data/misc/asteroids/normal_oval_4.mesh
===================================================================
(Binary files differ)

Deleted: trunk/data/misc/asteroids/normal_oval_5.mesh
===================================================================
(Binary files differ)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.