Merge remote-tracking branch 'origin/data' into mono

MASGAU · Apr 28, 2012 · d176447 · d176447
2 parents 413b5df + 017d334
commit d176447
Show file tree

Hide file tree

Showing 611 changed files with 6,339 additions and 1,309,172 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,6 +8,7 @@ obj/
 # Mac files 
 ._*
 .DS_Store
+._*
 
 # Installer output #
 Installer/Output

diff --git a/Data/Data.csproj b/Data/Data.csproj
@@ -54,6 +54,7 @@
     <Content Include="Data\dos.xml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="Data\expansions.xml" />
     <Content Include="Data\flash.xml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -71,6 +72,7 @@
     </Content>
     <Content Include="Data\ps3.xml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <SubType>Designer</SubType>
     </Content>
     <Content Include="Data\psp.xml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

diff --git a/Data/Data/windows.xml b/Data/Data/windows.xml
diff --git a/Data/Data/!test.xml → Data/data/!test.xml b/Data/Data/!test.xml → Data/data/!test.xml
@@ -151,7 +151,7 @@
 
   <game name="A013ShortcutTest" platform="Windows">
     <title>13 - Shortcut Test</title>
-    <location_shortcut shortcut="Programs\Accessories\Notepad.lnk" />
+    <location_shortcut environment_variable="startmenu" path="Programs\Accessories\Notepad.lnk" />
     <save filename="notepad.exe" />
   </game>
 

diff --git a/Data/Data/!uploadtest.xml → Data/data/!uploadtest.xml b/Data/Data/!uploadtest.xml → Data/data/!uploadtest.xml
@@ -8,7 +8,7 @@
   <game name="TestGame" platform="Windows" region="EUR" deprecated="true">
     <title>Test Game 4</title>
     <location_registry root="local_machine" key="SOFTWARE\Activision\Activenet\Applications\1060.2.1" value="Cwd" append="BLAH"/>
-    <location_shortcut shortcut="Programs\Titanium\Mercenaries\Play Mercenaries.lnk" detract="splash" deprecated="true"/>
+    <location_shortcut environment_variable="startmenu" path="Programs\Titanium\Mercenaries\Play Mercenaries.lnk" detract="splash" deprecated="true"/>
     <location_path environment_variable="installlocation" path="Activision\Titanium\Mercenaries" platform_version="Vista" />
     <location_path environment_variable="installlocation" path="MechVM\games\mw2-mercs-tt" platform_version="XP"/>
     <location_game name="TesPSGame" platform="PS2"/>

diff --git a/Data/Data/deprecated.xml → Data/data/deprecated.xml b/Data/Data/deprecated.xml → Data/data/deprecated.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<games xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="games.xsd" majorVersion="1" minorVersion="2" date="2011-12-25T00:00:00">
+<?xml version="1.0" encoding="UTF-8"?>
+<games xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="games.xsd" majorVersion="1" minorVersion="2" date="2012-01-14T08:40:15">
   <!--This file contains game data that was originally mislabeled, or for some other reason incorrect to the point that backup support had to be removed. The main purpose of these is to allow deprecated games to be able to still restore.-->
 </games>
diff --git a/Data/Data/dos.xml → Data/data/dos.xml b/Data/Data/dos.xml → Data/data/dos.xml
diff --git a/Data/data/expansions.xml b/Data/data/expansions.xml
diff --git a/Data/Data/flash.xml → Data/data/flash.xml b/Data/Data/flash.xml → Data/data/flash.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<games xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="games.xsd" majorVersion="1" minorVersion="2" date="2011-12-25T00:00:00">
+<?xml version="1.0" encoding="UTF-8"?>
+<games xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="games.xsd" majorVersion="1" minorVersion="2" date="2012-03-12T08:48:46">
   <!--This file contains games that are based on Flash-->
   <game name="CodenameGordon" platform="Flash">
     <title>Codename: Gordon</title>
@@ -10,6 +10,7 @@
   <game name="Machinarium" platform="Flash">
     <title>Machinarium</title>
     <location_path environment_variable="flashshared" path="localhost\steam\steamapps\common\machinarium"/>
+    <location_path environment_variable="flashshared" path="localhost\program files\steam\steamapps\common\machinarium"/>
     <save/>
     <contributor>AvvA</contributor>
   </game>

diff --git a/Data/Data/games.xml → Data/data/games.xml b/Data/Data/games.xml → Data/data/games.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<games xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="games.xsd" majorVersion="1" minorVersion="2" date="2011-12-25T00:00:00">
+<?xml version="1.0" encoding="UTF-8"?>
+<games xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="games.xsd" majorVersion="1" minorVersion="2" date="2012-01-14T08:40:15">
   <!--This file contains games that have saves that are compatible with more than one platform-->
   <game name="Altitude">
     <title>Altitude</title>

diff --git a/Data/Data/games.xsd → Data/data/games.xsd b/Data/Data/games.xsd → Data/data/games.xsd
@@ -28,6 +28,8 @@
         <xs:enumeration value="steamuserdata"/>
         <xs:enumeration value="userprofile"/>
         <xs:enumeration value="userdocuments"/>
+        <xs:enumeration value="startmenu" />
+        <xs:enumeration value="desktop" />
       </xs:restriction>
     </xs:simpleType>
   </xs:attribute>
@@ -70,7 +72,6 @@
       </xs:restriction>
     </xs:simpleType>
   </xs:attribute>
-  <xs:attribute name="shortcut" type="xs:string"/>
   <xs:attribute name="value" type="xs:string"/>
 
   <xs:attribute name="platform_version">
@@ -138,6 +139,14 @@
         </xs:restriction>
       </xs:simpleType>
     </xs:attribute>
+
+    <xs:attribute name="append">
+      <xs:simpleType>
+        <xs:restriction base="xs:string" />
+      </xs:simpleType>
+    </xs:attribute>
+    <xs:attribute name="type" type="xs:string"/>
+
   </xs:attributeGroup>
 
   <xs:attributeGroup name="location_attributes">
@@ -181,7 +190,8 @@
 
   <xs:element name="location_shortcut">
     <xs:complexType>
-      <xs:attribute ref="shortcut" use="required"/>
+      <xs:attribute ref="environment_variable" use="required"/>
+      <xs:attribute ref="path" use="required"/>
       <xs:attributeGroup ref="location_attributes" />
     </xs:complexType>
   </xs:element>

diff --git a/Data/Data/mods.xml → Data/data/mods.xml b/Data/Data/mods.xml → Data/data/mods.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<games xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="games.xsd" majorVersion="1" minorVersion="2" date="2011-12-25T00:00:00">
+<?xml version="1.0" encoding="UTF-8"?>
+<games xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="games.xsd" majorVersion="1" minorVersion="2" date="2012-01-14T08:40:15">
   <!--This file contains mods for other games-->
   <game name="CinematicMod10HL2" platform="Windows">
     <title>Cinematic Mod 10 (Half-Life 2 Mod)</title>
@@ -27,7 +27,7 @@
   </game>
   <game name="NamelessMod" platform="Windows">
     <title>The Nameless Mod (Deus Ex Mod)</title>
-    <location_shortcut shortcut="Programs\The Nameless Mod\The Nameless Mod.lnk" append="TNM" detract="System"/>
+    <location_shortcut environment_variable="startmenu" path="Programs\The Nameless Mod\The Nameless Mod.lnk" append="TNM" detract="System"/>
     <location_game name="DeusEx" platform="Windows" append="TNM"/>
     <save path="System" filename="*.ini" type="Settings"/>
     <save path="Save"/>

diff --git a/Data/Data/ps1.xml → Data/data/ps1.xml b/Data/Data/ps1.xml → Data/data/ps1.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<games xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="games.xsd" majorVersion="1" minorVersion="2" date="2011-12-25T00:00:00">
+<?xml version="1.0" encoding="UTF-8"?>
+<games xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="games.xsd" majorVersion="1" minorVersion="2" date="2012-01-14T08:40:15">
   <!--This file contains PlayStation games-->
   <game name="ChronoCross" platform="PS1" region="USA">
     <title>Chrono Cross</title>

diff --git a/Data/Data/ps2.xml → Data/data/ps2.xml b/Data/Data/ps2.xml → Data/data/ps2.xml
@@ -1,6 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
-<games xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="games.xsd" majorVersion="1" minorVersion="2" date="2011-12-25T00:00:00">
+<?xml version="1.0" encoding="UTF-8"?>
+<games xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="games.xsd" majorVersion="1" minorVersion="2" date="2012-01-14T08:40:15">
   <!--This file contains PlayStation 2 games-->
+  <game name="AlterEcho" platform="PS2" region="USA">
+    <title>Alter Echo</title>
+    <ps_code prefix="SLUS" suffix="20465"/>
+    <contributor>SanMadJack</contributor>
+  </game>
   <game name="BeyondGoodAndEvil" platform="PS2" region="USA">
     <title>Beyond Good &amp; Evil</title>
     <ps_code prefix="SLUS" suffix="20763"/>
@@ -238,6 +243,11 @@
     <ps_code prefix="SCUS" suffix="97472"/>
     <contributor>SanMadJack</contributor>
   </game>
+  <game name="SilentHillShatteredMemories" platform="PS2" region="USA">
+    <title>Silent Hill: Shattered Memories</title>
+    <ps_code prefix="SLUS" suffix="21899"/>
+    <contributor>SanMadJack</contributor>
+  </game>
   <game name="SilentHill2GreatestHits" platform="PS2" region="USA">
     <title>Silent Hill 2: Greatest Hits Edition</title>
     <ps_code prefix="SLUS" suffix="20228"/>
@@ -289,6 +299,23 @@
     <ps_code prefix="SLUS" suffix="20034"/>
     <contributor>SanMadJack</contributor>
   </game>
+  <game name="Xenosaga" platform="PS2" region="USA">
+    <title>Xenosaga Episode I: Der Wille zur Macht</title>
+    <ps_code prefix="SLUS" suffix="20469"/>
+    <contributor>SanMadJack</contributor>
+  </game>
+  <game name="Xenosaga2" platform="PS2" region="USA">
+    <title>Xenosaga Episode II: Jenseits von Gut und Böse</title>
+    <ps_code prefix="SLUS" suffix="20892"/>
+    <ps_code prefix="SLUS" suffix="21133"/>
+    <contributor>SanMadJack</contributor>
+  </game>
+  <game name="Xenosaga3" platform="PS2" region="USA">
+    <title>Xenosaga Episode III: Also sprach Zarathustra</title>
+    <ps_code prefix="SLUS" suffix="21389"/>
+    <ps_code prefix="SLUS" suffix="21417"/>
+    <contributor>SanMadJack</contributor>
+  </game>
   <game name="XFilesResistOrServe" platform="PS2" region="USA">
     <title>The X-Files: Resist or Serve</title>
     <ps_code prefix="SLUS" suffix="20179"/>