fixed pax britannica, vectorpinball png crush settings et. al.

diff --git a/demos/invaders/gdx-invaders-ios/gdx-invaders-ios.userprefs b/demos/invaders/gdx-invaders-ios/gdx-invaders-ios.userprefs
index 1de8c83..d3d269c 100644 (file)
--- a/demos/invaders/gdx-invaders-ios/gdx-invaders-ios.userprefs
+++ b/demos/invaders/gdx-invaders-ios/gdx-invaders-ios.userprefs
@@ -1,21 +1,29 @@
 <Properties>
-  <MonoDevelop.Ide.Workspace ActiveConfiguration="Release|iPhone" />
-  <MonoDevelop.Ide.Workbench ActiveDocument="gdx-invaders-ios/Main.cs">
+  <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhoneSimulator" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneSimulatorTarget.IPhone.5.0" />
+  <MonoDevelop.Ide.Workbench ActiveDocument="../gdx-invaders/src/com/badlogic/gdxinvaders/Renderer.java">
     <Files>
-      <File FileName="gdx-invaders-ios/Main.cs" Line="9" Column="24" />
+      <File FileName="gdx-invaders-ios/Main.cs" Line="24" Column="1" />
+      <File FileName="../gdx-invaders/src/com/badlogic/gdxinvaders/screens/GameLoop.java" Line="84" Column="1" />
+      <File FileName="../gdx-invaders/src/com/badlogic/gdxinvaders/GdxInvaders.java" Line="40" Column="1" />
+      <File FileName="../gdx-invaders/src/com/badlogic/gdxinvaders/screens/InvadersScreen.java" Line="34" Column="1" />
+      <File FileName="../gdx-invaders/src/com/badlogic/gdxinvaders/Renderer.java" Line="126" Column="23" />
     </Files>
     <Pads>
       <Pad Id="ProjectPad">
         <State expanded="True">
           <Node name="gdx-invaders-ios" expanded="True">
-            <Node name="References" expanded="True" selected="True" />
+            <Node name="References" expanded="True" />
+            <Node name="Main.cs" selected="True" />
           </Node>
         </State>
       </Pad>
     </Pads>
   </MonoDevelop.Ide.Workbench>
   <MonoDevelop.Ide.DebuggingService.Breakpoints>
-    <BreakpointStore />
+    <BreakpointStore>
+      <Breakpoint file="/Users/badlogic/workspace/libgdx-git/backends/gdx-backend-iosmonotouch/Test.java" line="3" column="1" />
+      <Breakpoint file="/Users/badlogic/workspace/libgdx/demos/invaders/gdx-invaders/src/com/badlogic/gdxinvaders/screens/GameLoop.java" line="84" column="1" />
+    </BreakpointStore>
   </MonoDevelop.Ide.DebuggingService.Breakpoints>
   <MonoDevelop.Ide.DebuggingService.PinnedWatches />
 </Properties>
\ No newline at end of file

diff --git a/demos/invaders/gdx-invaders-ios/gdx-invaders-ios/convert.properties b/demos/invaders/gdx-invaders-ios/gdx-invaders-ios/convert.properties
new file mode 100644 (file)
index 0000000..303aa66
--- /dev/null
+++ b/demos/invaders/gdx-invaders-ios/gdx-invaders-ios/convert.properties
@@ -0,0 +1,6 @@
+SRC =       ../../gdx-invaders/src/
+CLASSPATH = ../../../../gdx/bin
+EXCLUDE   = **/*Desktop.java
+IN        = -r:../../../../gdx/libs/ios32/gdx.dll -recurse:target/*.class
+OUT       = invaders.dll
+

diff --git a/demos/invaders/gdx-invaders-ios/gdx-invaders-ios/convert.xml b/demos/invaders/gdx-invaders-ios/gdx-invaders-ios/convert.xml
index 339b588..8848391 100644 (file)
--- a/demos/invaders/gdx-invaders-ios/gdx-invaders-ios/convert.xml
+++ b/demos/invaders/gdx-invaders-ios/gdx-invaders-ios/convert.xml
@@ -1,23 +1,19 @@
 <project name="gdx" default="convert" basedir=".">
        <property environment="env"/>
-       <property name="IKVM_HOME" value="${env.IKVM_HOME}"/>
+       <property file="convert.properties" />
+       <property name="IKVM_HOME" value="../../../../backends/gdx-backend-iosmonotouch/libs/ikvm"/>
        <property name="MONO_HOME" value="/Developer/MonoTouch/usr/lib/mono/2.1"/>
-       <property name="IN" value="-recurse:target/core/*.class"/>
-       <property name="OUT" value="gdx.dll"/>
-       <property name="SRC" value="src/"/>
-       <property name="CLASSPATH" value=""/>
-       <property name="EXCLUDE" value=""/>
 
        <target name="compile">
                <delete dir="target"/>
                <mkdir dir="target"/>
-               <javac srcdir="${SRC}" debug="on" destdir="target" classpath="${CLASSPATH}">
+               <javac srcdir="${SRC}" debug="on" source="1.6" target="1.6" destdir="target" classpath="${CLASSPATH}">
                        <include name="**/*.java"/>
                        <exclude name="${EXCLUDE}"/>
                </javac>
        </target>
 
-       <target name="convert">
+       <target name="convert" depends="compile">
                <exec executable="mono">
                        <arg value="${IKVM_HOME}/bin/ikvmc.exe"/>
                        <arg value="-nostdlib"/>
@@ -35,4 +31,4 @@
                        <arg line="${IN}"/>
                </exec>
        </target>
-</project>
\ No newline at end of file
+</project>

diff --git a/demos/invaders/gdx-invaders-ios/gdx-invaders-ios/gdx-invaders-ios.csproj b/demos/invaders/gdx-invaders-ios/gdx-invaders-ios/gdx-invaders-ios.csproj
index 90eedec..a13eb47 100644 (file)
--- a/demos/invaders/gdx-invaders-ios/gdx-invaders-ios/gdx-invaders-ios.csproj
+++ b/demos/invaders/gdx-invaders-ios/gdx-invaders-ios/gdx-invaders-ios.csproj
@@ -21,7 +21,6 @@
     <WarningLevel>4</WarningLevel>
     <ConsolePause>False</ConsolePause>
     <MtouchDebug>True</MtouchDebug>
-    <MtouchProfiling>True</MtouchProfiling>
     <MtouchLink>None</MtouchLink>
     <MtouchExtraArgs>-nosymbolstrip -nostrip -cxx -gcc_flags "-L${ProjectDir} -likvm-natives -lgdx -force_load ${ProjectDir}/libgdx.a -force_load ${ProjectDir}/libikvm-natives.a"</MtouchExtraArgs>
     <MtouchI18n>west</MtouchI18n>
@@ -30,6 +29,8 @@
         <Command type="BeforeBuild" command="ant -f convert.xml compile convert -DSRC=&quot;../../gdx-invaders/src/&quot; -DCLASSPATH=&quot;../../../../gdx/bin/;../../../../backends/gdx-backend-lwjgl/bin&quot; -DIN=&quot;-r:../../../../backends/gdx-backend-iosmonotouch/libs/gdx.dll -recurse:target/*.class&quot;  -DOUT=&quot;invaders.dll&quot; -DEXCLUDE=&quot;**/GdxInvadersDesktop.java&quot; -v" workingdir="${ProjectDir}" />
       </CustomCommands>
     </CustomCommands>
+    <MtouchArch>ARMv7</MtouchArch>
+    <OptimizePNGs>false</OptimizePNGs>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhoneSimulator' ">
     <DebugType>none</DebugType>
@@ -44,9 +45,11 @@
     <MtouchUseLlvm>True</MtouchUseLlvm>
     <CustomCommands>
       <CustomCommands>
-        <Command type="BeforeBuild" command="ant -f convert.xml compile convert -DSRC=&quot;../../gdx-invaders/src/&quot; -DCLASSPATH=&quot;../../../../gdx/bin/;../../../../backends/gdx-backend-lwjgl/bin&quot; -DIN=&quot;-r:../../../../backends/gdx-backend-iosmonotouch/libs/gdx.dll -recurse:target/*.class&quot;  -DOUT=&quot;invaders.dll&quot; -DEXCLUDE=&quot;**/GdxInvadersDesktop.java&quot; -v" workingdir="${ProjectDir}" />
+        <Command type="BeforeBuild" command="ant -v -f convert.xml" workingdir="${ProjectDir}" />
       </CustomCommands>
     </CustomCommands>
+    <MtouchArch>ARMv7</MtouchArch>
+    <OptimizePNGs>false</OptimizePNGs>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhone' ">
     <DebugSymbols>True</DebugSymbols>
@@ -59,7 +62,6 @@
     <ConsolePause>False</ConsolePause>
     <CodesignKey>iPhone Developer</CodesignKey>
     <MtouchDebug>True</MtouchDebug>
-    <MtouchProfiling>True</MtouchProfiling>
     <CustomCommands>
       <CustomCommands>
         <Command type="BeforeBuild" command="ant -f convert.xml compile convert -DSRC=&quot;../../gdx-invaders/src/&quot; -DCLASSPATH=&quot;../../../../gdx/bin/;../../../../backends/gdx-backend-lwjgl/bin&quot; -DIN=&quot;-r:../../../../backends/gdx-backend-iosmonotouch/libs/gdx.dll -recurse:target/*.class&quot;  -DOUT=&quot;invaders.dll&quot; -DEXCLUDE=&quot;**/GdxInvadersDesktop.java&quot; -v" workingdir="${ProjectDir}" />
@@ -68,6 +70,7 @@
     <MtouchExtraArgs>-nosymbolstrip -nostrip -cxx -gcc_flags "-L${ProjectDir} -likvm-natives -lgdx -force_load ${ProjectDir}/libgdx.a -force_load ${ProjectDir}/libikvm-natives.a"</MtouchExtraArgs>
     <MtouchArch>ARMv7</MtouchArch>
     <MtouchI18n>west</MtouchI18n>
+    <OptimizePNGs>false</OptimizePNGs>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
     <DebugType>none</DebugType>
@@ -87,6 +90,7 @@
     <MtouchExtraArgs>-nosymbolstrip -nostrip -cxx -gcc_flags "-L${ProjectDir} -likvm-natives -lgdx -force_load ${ProjectDir}/libgdx.a -force_load ${ProjectDir}/libikvm-natives.a"</MtouchExtraArgs>
     <MtouchArch>ARMv7</MtouchArch>
     <MtouchUseSGen>True</MtouchUseSGen>
+    <OptimizePNGs>false</OptimizePNGs>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Ad-Hoc|iPhone' ">
     <DebugType>none</DebugType>
@@ -115,9 +119,6 @@
     <Reference Include="gdx">
       <HintPath>..\..\..\..\gdx\libs\ios32\gdx.dll</HintPath>
     </Reference>
-    <Reference Include="gdx-backend-ios">
-      <HintPath>..\..\..\..\backends\gdx-backend-iosmonotouch\libs\gdx-backend-ios.dll</HintPath>
-    </Reference>
     <Reference Include="invaders">
       <HintPath>invaders.dll</HintPath>
     </Reference>
@@ -151,6 +152,12 @@
     <Reference Include="IKVM.Runtime">
       <HintPath>..\..\..\..\backends\gdx-backend-iosmonotouch\libs\ikvm\bin\IKVM.Runtime.dll</HintPath>
     </Reference>
+    <Reference Include="gdx-backend-ios">
+      <HintPath>..\..\..\..\backends\gdx-backend-iosmonotouch\libs\ios32\gdx-backend-ios.dll</HintPath>
+    </Reference>
+    <Reference Include="libObjectAL">
+      <HintPath>..\..\..\..\backends\gdx-backend-iosmonotouch\libs\objectal\libObjectAL.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <None Include="Info.plist" />

diff --git a/demos/invaders/gdx-invaders/.classpath b/demos/invaders/gdx-invaders/.classpath
index ddde917..d585873 100644 (file)
--- a/demos/invaders/gdx-invaders/.classpath
+++ b/demos/invaders/gdx-invaders/.classpath
@@ -1,10 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<classpath>\r
-       <classpathentry excluding="**/.svn/*" kind="src" path="src"/>\r
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>\r
-       <classpathentry combineaccessrules="false" kind="src" path="/gdx"/>\r
-       <classpathentry combineaccessrules="false" kind="src" path="/gdx-backend-lwjgl"/>\r
-       <classpathentry combineaccessrules="false" kind="src" path="/gdx-controllers"/>\r
-       <classpathentry combineaccessrules="false" kind="src" path="/gdx-controllers-desktop"/>\r
-       <classpathentry kind="output" path="bin"/>\r
-</classpath>\r
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+       <classpathentry excluding="**/.svn/*" kind="src" path="src"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+       <classpathentry combineaccessrules="false" kind="src" path="/gdx"/>
+       <classpathentry combineaccessrules="false" kind="src" path="/gdx-backend-lwjgl"/>
+       <classpathentry kind="output" path="bin"/>
+</classpath>

diff --git a/demos/invaders/gdx-invaders/src/com/badlogic/gdxinvaders/screens/GameLoop.java b/demos/invaders/gdx-invaders/src/com/badlogic/gdxinvaders/screens/GameLoop.java
index a492bf0..2736563 100644 (file)
--- a/demos/invaders/gdx-invaders/src/com/badlogic/gdxinvaders/screens/GameLoop.java
+++ b/demos/invaders/gdx-invaders/src/com/badlogic/gdxinvaders/screens/GameLoop.java
@@ -16,11 +16,6 @@ package com.badlogic.gdxinvaders.screens;
 import com.badlogic.gdx.Gdx;\r
 import com.badlogic.gdx.Input.Keys;\r
 import com.badlogic.gdx.audio.Sound;\r
-import com.badlogic.gdx.controllers.Controller;\r
-import com.badlogic.gdx.controllers.ControllerAdapter;\r
-import com.badlogic.gdx.controllers.ControllerListener;\r
-import com.badlogic.gdx.controllers.Controllers;\r
-import com.badlogic.gdx.controllers.mappings.Ouya;\r
 import com.badlogic.gdxinvaders.Renderer;\r
 import com.badlogic.gdxinvaders.simulation.Simulation;\r
 import com.badlogic.gdxinvaders.simulation.SimulationListener;\r
@@ -35,21 +30,21 @@ public class GameLoop extends InvadersScreen implements SimulationListener {
        /** shot sound **/\r
        private final Sound shot;\r
        /** controller **/\r
-       private Controller controller;\r
-       private int buttonsPressed = 0;\r
-       private ControllerListener listener = new ControllerAdapter() {\r
-               @Override\r
-               public boolean buttonDown (Controller controller, int buttonIndex) {\r
-                       buttonsPressed++;\r
-                       return true;\r
-               }\r
-\r
-               @Override\r
-               public boolean buttonUp (Controller controller, int buttonIndex) {\r
-                       buttonsPressed--;\r
-                       return true;\r
-               }\r
-       };\r
+//     private Controller controller;\r
+//     private int buttonsPressed = 0;\r
+//     private ControllerListener listener = new ControllerAdapter() {\r
+//             @Override\r
+//             public boolean buttonDown (Controller controller, int buttonIndex) {\r
+//                     buttonsPressed++;\r
+//                     return true;\r
+//             }\r
+//\r
+//             @Override\r
+//             public boolean buttonUp (Controller controller, int buttonIndex) {\r
+//                     buttonsPressed--;\r
+//                     return true;\r
+//             }\r
+//     };\r
 \r
        public GameLoop () {\r
                simulation = new Simulation();\r
@@ -60,13 +55,13 @@ public class GameLoop extends InvadersScreen implements SimulationListener {
                \r
                // check for attached controllers and if we are on\r
                // Ouya, take the first controller. Doesn't handle disconnects :D\r
-               if(Controllers.getControllers().size > 0) {\r
-                       Controller controller = Controllers.getControllers().get(0);\r
-                       if(Ouya.ID.equals(controller.getName())) {\r
-                               this.controller = controller;\r
-                               controller.addListener(listener);\r
-                       }\r
-               }\r
+//             if(Controllers.getControllers().size > 0) {\r
+//                     Controller controller = Controllers.getControllers().get(0);\r
+//                     if(Ouya.ID.equals(controller.getName())) {\r
+//                             this.controller = controller;\r
+//                             controller.addListener(listener);\r
+//                     }\r
+//             }\r
        }\r
 \r
        @Override\r
@@ -74,8 +69,8 @@ public class GameLoop extends InvadersScreen implements SimulationListener {
                renderer.dispose();\r
                shot.dispose();\r
                explosion.dispose();\r
-               if (controller != null)\r
-                       controller.removeListener(listener);\r
+//             if (controller != null)\r
+//                     controller.removeListener(listener);\r
                simulation.dispose();\r
        }\r
 \r
@@ -99,20 +94,20 @@ public class GameLoop extends InvadersScreen implements SimulationListener {
                else\r
                        simulation.moveShipRight(delta, Math.abs(accelerometerY) / 10);\r
                \r
-               if(controller != null) {\r
-                       // if any button is pressed, we shoot.\r
-                       if(buttonsPressed > 0) simulation.shot();\r
-                       \r
-                       // if the left stick moved, move the ship\r
-                       float axisValue = controller.getAxis(Ouya.AXIS_LEFT_X) * 0.5f;\r
-                       if(Math.abs(axisValue) > 0.25f) {\r
-                               if(axisValue > 0) {\r
-                                       simulation.moveShipRight(delta, axisValue);\r
-                               } else {\r
-                                       simulation.moveShipLeft(delta, -axisValue);\r
-                               }\r
-                       }\r
-               }\r
+//             if(controller != null) {\r
+//                     // if any button is pressed, we shoot.\r
+//                     if(buttonsPressed > 0) simulation.shot();\r
+//                     \r
+//                     // if the left stick moved, move the ship\r
+//                     float axisValue = controller.getAxis(Ouya.AXIS_LEFT_X) * 0.5f;\r
+//                     if(Math.abs(axisValue) > 0.25f) {\r
+//                             if(axisValue > 0) {\r
+//                                     simulation.moveShipRight(delta, axisValue);\r
+//                             } else {\r
+//                                     simulation.moveShipLeft(delta, -axisValue);\r
+//                             }\r
+//                     }\r
+//             }\r
 \r
                if (Gdx.input.isKeyPressed(Keys.DPAD_LEFT) || Gdx.input.isKeyPressed(Keys.A)) simulation.moveShipLeft(delta, 0.5f);\r
                if (Gdx.input.isKeyPressed(Keys.DPAD_RIGHT) || Gdx.input.isKeyPressed(Keys.D)) simulation.moveShipRight(delta, 0.5f);\r

diff --git a/demos/invaders/gdx-invaders/src/com/badlogic/gdxinvaders/screens/GameOver.java b/demos/invaders/gdx-invaders/src/com/badlogic/gdxinvaders/screens/GameOver.java
index 627a603..d7c55c8 100644 (file)
--- a/demos/invaders/gdx-invaders/src/com/badlogic/gdxinvaders/screens/GameOver.java
+++ b/demos/invaders/gdx-invaders/src/com/badlogic/gdxinvaders/screens/GameOver.java
@@ -14,10 +14,6 @@
 package com.badlogic.gdxinvaders.screens;\r
 \r
 import com.badlogic.gdx.Gdx;\r
-import com.badlogic.gdx.controllers.Controller;\r
-import com.badlogic.gdx.controllers.ControllerAdapter;\r
-import com.badlogic.gdx.controllers.Controllers;\r
-import com.badlogic.gdx.controllers.mappings.Ouya;\r
 import com.badlogic.gdx.graphics.Color;\r
 import com.badlogic.gdx.graphics.GL10;\r
 import com.badlogic.gdx.graphics.Texture;\r
@@ -57,18 +53,18 @@ public class GameOver extends InvadersScreen {
 \r
                font = new BitmapFont(Gdx.files.internal("data/font16.fnt"), Gdx.files.internal("data/font16.png"), false);\r
                \r
-               if(Controllers.getControllers().size > 0) {\r
-                       Controller controller = Controllers.getControllers().get(0);\r
-                       if(Ouya.ID.equals(controller.getName())) {\r
-                               controller.addListener(new ControllerAdapter() {\r
-                                       @Override\r
-                                       public boolean buttonUp (Controller controller, int buttonIndex) {\r
-                                               isDone = true;\r
-                                               return false;\r
-                                       }\r
-                               });\r
-                       }\r
-               }\r
+//             if(Controllers.getControllers().size > 0) {\r
+//                     Controller controller = Controllers.getControllers().get(0);\r
+//                     if(Ouya.ID.equals(controller.getName())) {\r
+//                             controller.addListener(new ControllerAdapter() {\r
+//                                     @Override\r
+//                                     public boolean buttonUp (Controller controller, int buttonIndex) {\r
+//                                             isDone = true;\r
+//                                             return false;\r
+//                                     }\r
+//                             });\r
+//                     }\r
+//             }\r
        }\r
 \r
        @Override\r

diff --git a/demos/invaders/gdx-invaders/src/com/badlogic/gdxinvaders/screens/MainMenu.java b/demos/invaders/gdx-invaders/src/com/badlogic/gdxinvaders/screens/MainMenu.java
index d17a2b6..5f4118c 100644 (file)
--- a/demos/invaders/gdx-invaders/src/com/badlogic/gdxinvaders/screens/MainMenu.java
+++ b/demos/invaders/gdx-invaders/src/com/badlogic/gdxinvaders/screens/MainMenu.java
@@ -15,12 +15,6 @@ package com.badlogic.gdxinvaders.screens;
 \r
 import com.badlogic.gdx.Application.ApplicationType;\r
 import com.badlogic.gdx.Gdx;\r
-import com.badlogic.gdx.controllers.Controller;\r
-import com.badlogic.gdx.controllers.ControllerAdapter;\r
-import com.badlogic.gdx.controllers.ControllerListener;\r
-import com.badlogic.gdx.controllers.Controllers;\r
-import com.badlogic.gdx.controllers.PovDirection;\r
-import com.badlogic.gdx.controllers.mappings.Ouya;\r
 import com.badlogic.gdx.graphics.Color;\r
 import com.badlogic.gdx.graphics.GL10;\r
 import com.badlogic.gdx.graphics.Texture;\r
@@ -61,18 +55,18 @@ public class MainMenu extends InvadersScreen {
                \r
                // check for attached controllers and if we are on\r
                // Ouya.\r
-               if(Controllers.getControllers().size > 0) {\r
-                       Controller controller = Controllers.getControllers().get(0);\r
-                       if(Ouya.ID.equals(controller.getName())) {\r
-                               controller.addListener(new ControllerAdapter() {\r
-                                       @Override\r
-                                       public boolean buttonUp (Controller controller, int buttonIndex) {\r
-                                               isDone = true;\r
-                                               return false;\r
-                                       }\r
-                               });\r
-                       }\r
-               }\r
+//             if(Controllers.getControllers().size > 0) {\r
+//                     Controller controller = Controllers.getControllers().get(0);\r
+//                     if(Ouya.ID.equals(controller.getName())) {\r
+//                             controller.addListener(new ControllerAdapter() {\r
+//                                     @Override\r
+//                                     public boolean buttonUp (Controller controller, int buttonIndex) {\r
+//                                             isDone = true;\r
+//                                             return false;\r
+//                                     }\r
+//                             });\r
+//                     }\r
+//             }\r
        }\r
 \r
        @Override\r

diff --git a/demos/pax-britannica/pax-britannica-iosmonotouch/pax-britannica-iosmonotouch.userprefs b/demos/pax-britannica/pax-britannica-iosmonotouch/pax-britannica-iosmonotouch.userprefs
index 367476e..74af6fa 100644 (file)
--- a/demos/pax-britannica/pax-britannica-iosmonotouch/pax-britannica-iosmonotouch.userprefs
+++ b/demos/pax-britannica/pax-britannica-iosmonotouch/pax-britannica-iosmonotouch.userprefs
@@ -12,8 +12,8 @@
     <Pads>
       <Pad Id="ProjectPad">
         <State expanded="True">
-          <Node name="pax-britannica-iosmonotouch" expanded="True">
-            <Node name="References" expanded="True" selected="True" />
+          <Node name="pax-britannica-iosmonotouch" expanded="True" selected="True">
+            <Node name="References" expanded="True" />
           </Node>
         </State>
       </Pad>

diff --git a/demos/pax-britannica/pax-britannica-iosmonotouch/pax-britannica-iosmonotouch/pax-britannica-iosmonotouch.csproj b/demos/pax-britannica/pax-britannica-iosmonotouch/pax-britannica-iosmonotouch/pax-britannica-iosmonotouch.csproj
index 4eece77..a5fd929 100644 (file)
--- a/demos/pax-britannica/pax-britannica-iosmonotouch/pax-britannica-iosmonotouch/pax-britannica-iosmonotouch.csproj
+++ b/demos/pax-britannica/pax-britannica-iosmonotouch/pax-britannica-iosmonotouch/pax-britannica-iosmonotouch.csproj
@@ -32,7 +32,6 @@
     <MtouchI18n>west</MtouchI18n>
     <MtouchArch>ARMv7</MtouchArch>
     <OptimizePNGs>false</OptimizePNGs>
-    <MtouchSdkVersion>5.0</MtouchSdkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhoneSimulator' ">
     <DebugType>none</DebugType>

diff --git a/demos/vector-pinball/gdx-vectorpinball-ios/gdx-vectorpinball-ios.userprefs b/demos/vector-pinball/gdx-vectorpinball-ios/gdx-vectorpinball-ios.userprefs
index ca74170..beef695 100644 (file)
--- a/demos/vector-pinball/gdx-vectorpinball-ios/gdx-vectorpinball-ios.userprefs
+++ b/demos/vector-pinball/gdx-vectorpinball-ios/gdx-vectorpinball-ios.userprefs
@@ -8,8 +8,9 @@
     <Pads>
       <Pad Id="ProjectPad">
         <State expanded="True">
-          <Node name="gdx-vectorpinball-ios" expanded="True" selected="True">
+          <Node name="gdx-vectorpinball-ios" expanded="True">
             <Node name="References" expanded="True" />
+            <Node name="Main.cs" selected="True" />
           </Node>
         </State>
       </Pad>