Pause stuff (thread errors)

akatkov7 · Mar 4, 2014 · 13266b9 · 13266b9
1 parent 20553e4
commit 13266b9
Show file tree

Hide file tree

Showing 23 changed files with 180 additions and 156 deletions.
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
@@ -11,27 +11,28 @@
     <application
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
+        android:debuggable="true"
         android:label="@string/app_name"
         android:theme="@android:style/Theme.NoTitleBar.Fullscreen" >
         <activity
             android:name=".MainActivity"
             android:screenOrientation="portrait" >
         </activity>
+        <activity android:name=".TitleMenu" >
+        </activity>
+        <activity android:name=".LoginMenu" >
+        </activity>
+        <activity android:name=".SignUpMenu" >
+        </activity>
         <activity
-            android:name=".TitleMenu"
+            android:name=".GameSelect"
             android:label="@string/app_name" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name=".LoginMenu" >
-        </activity>
-        <activity android:name=".SignUpMenu" >
-        </activity>
-        <activity android:name=".GameSelect" >
-        </activity>
         <activity android:name=".PauseScreen" >
         </activity>
     </application>

diff --git a/bin/AndroidManifest.xml b/bin/AndroidManifest.xml
@@ -11,27 +11,28 @@
     <application
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
+        android:debuggable="true"
         android:label="@string/app_name"
         android:theme="@android:style/Theme.NoTitleBar.Fullscreen" >
         <activity
             android:name=".MainActivity"
             android:screenOrientation="portrait" >
         </activity>
+        <activity android:name=".TitleMenu" >
+        </activity>
+        <activity android:name=".LoginMenu" >
+        </activity>
+        <activity android:name=".SignUpMenu" >
+        </activity>
         <activity
-            android:name=".TitleMenu"
+            android:name=".GameSelect"
             android:label="@string/app_name" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name=".LoginMenu" >
-        </activity>
-        <activity android:name=".SignUpMenu" >
-        </activity>
-        <activity android:name=".GameSelect" >
-        </activity>
         <activity android:name=".PauseScreen" >
         </activity>
     </application>

diff --git a/bin/AvalancheGame.apk b/bin/AvalancheGame.apk
diff --git a/bin/classes.dex b/bin/classes.dex
diff --git a/bin/classes/com/example/avalanchegame/CustomSurfaceView$GameThread.class b/bin/classes/com/example/avalanchegame/CustomSurfaceView$GameThread.class
diff --git a/bin/classes/com/example/avalanchegame/CustomSurfaceView.class b/bin/classes/com/example/avalanchegame/CustomSurfaceView.class
diff --git a/bin/classes/com/example/avalanchegame/MainActivity.class b/bin/classes/com/example/avalanchegame/MainActivity.class
diff --git a/bin/classes/com/example/avalanchegame/Player.class b/bin/classes/com/example/avalanchegame/Player.class
diff --git a/bin/classes/com/example/avalanchegame/R$id.class b/bin/classes/com/example/avalanchegame/R$id.class
diff --git a/bin/classes/com/example/avalanchegame/R$layout.class b/bin/classes/com/example/avalanchegame/R$layout.class
diff --git a/bin/classes/com/example/avalanchegame/R$menu.class b/bin/classes/com/example/avalanchegame/R$menu.class
diff --git a/bin/classes/com/example/avalanchegame/R$string.class b/bin/classes/com/example/avalanchegame/R$string.class
diff --git a/bin/classes/com/example/avalanchegame/R$style.class b/bin/classes/com/example/avalanchegame/R$style.class
diff --git a/bin/resources.ap_ b/bin/resources.ap_
diff --git a/gen/com/example/avalanchegame/R.java b/gen/com/example/avalanchegame/R.java
@@ -24,18 +24,19 @@ public static final class drawable {
         public static final int ic_launcher=0x7f020000;
     }
     public static final class id {
-        public static final int action_settings=0x7f08000b;
-        public static final int backToGame=0x7f080006;
-        public static final int exit=0x7f080007;
-        public static final int login=0x7f080005;
-        public static final int nameField=0x7f080009;
-        public static final int passwordField=0x7f080004;
-        public static final int rootLogin=0x7f080002;
-        public static final int rootSignUp=0x7f080008;
+        public static final int action_settings=0x7f08000c;
+        public static final int backToGame=0x7f080007;
+        public static final int exit=0x7f080008;
+        public static final int login=0x7f080006;
+        public static final int nameField=0x7f08000a;
+        public static final int passwordField=0x7f080005;
+        public static final int rootLogin=0x7f080003;
+        public static final int rootSignUp=0x7f080009;
         public static final int screenContainer=0x7f080000;
-        public static final int signUp=0x7f08000a;
-        public static final int singlePlayer=0x7f080001;
-        public static final int usernameField=0x7f080003;
+        public static final int signUp=0x7f08000b;
+        public static final int singlePlayer=0x7f080002;
+        public static final int startGame=0x7f080001;
+        public static final int usernameField=0x7f080004;
     }
     public static final class layout {
         public static final int activity_main=0x7f030000;

diff --git a/libs/gson-2.2.4.jar b/libs/gson-2.2.4.jar
diff --git a/res/layout/activity_main.xml b/res/layout/activity_main.xml
@@ -9,4 +9,12 @@
         android:layout_width="fill_parent"
         android:layout_height="fill_parent" />
 
+    <Button
+        android:id="@+id/startGame"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true"
+        android:onClick="startGame"
+        android:text="Start" />
+
 </RelativeLayout>
diff --git a/src/com/example/avalanchegame/Box.java b/src/com/example/avalanchegame/Box.java
@@ -237,7 +237,7 @@ public void fixIntersection(RectF other, int whichSide)
         }
         else if (whichSide == 2) // bottom
         {
-            Log.d("Fock", "Top Top Fockothy");
+            // Log.d("Fock", "Top Top Fockothy");
             float amount = other.top - this.bottom + 0.5f;
             offset(0, amount);