[alienbloodbath commit] r95 - Fixed the open source version resources so that it now builds and runs straight from svn.

[codesite...@google.com]

Author: matt.burkhart
Date: Tue Apr 28 23:02:32 2009
New Revision: 95

Added:
trunk/content_package/Classic/background.jpg (contents, props changed)
trunk/content_package/Classic/description_0.txt
trunk/content_package/Classic/description_1.txt
trunk/content_package/Classic/description_2.txt
trunk/res/drawable/kills.png (contents, props changed)
Modified:
trunk/README
trunk/content_package/Classic/ak47.png
trunk/content_package/Classic/ak47.weapon
trunk/content_package/Classic/tiles_1.txt
trunk/content_package/Classic/tiles_default.txt
trunk/prepare_content.sh
trunk/src/android/com/abb/LevelSelectActivity.java

Log:
Fixed the open source version resources so that it now builds and runs
straight from svn.

Modified: trunk/README
==============================================================================
--- trunk/README (original)
+++ trunk/README Tue Apr 28 23:02:32 2009
@@ -1,12 +1,12 @@
This project requires that the Java SDK, the Ant build system, and Android
SDK
-are installed. The build file expects that the Android SDK is located
within:
-/usr/local/android-sdk.
+are installed. The build file expects that the Android SDK version 1.5 is
+located at (or symbolically-linked to): /usr/local/android-sdk.

-To build:
+To compile:
# ant debug

To install:
-# ant install
+# ./install.sh

For more information, visit:
http://code.google.com/p/alienbloodbath

Modified: trunk/content_package/Classic/ak47.png
==============================================================================
Binary files. No diff available.

Modified: trunk/content_package/Classic/ak47.weapon
==============================================================================
--- trunk/content_package/Classic/ak47.weapon (original)
+++ trunk/content_package/Classic/ak47.weapon Tue Apr 28 23:02:32 2009
@@ -1,11 +1,11 @@
sprite ak47.png
-ammo 25
+ammo 50
damage 0.1
delay 0.15
weapon_rect_left 0
weapon_rect_top 0
-weapon_rect_right 57
-weapon_rect_bottom 18
+weapon_rect_right 51
+weapon_rect_bottom 16
projectile_rect_left 4
projectile_rect_top 31
projectile_rect_right 16

Added: trunk/content_package/Classic/background.jpg
==============================================================================
Binary file. No diff available.

Added: trunk/content_package/Classic/description_0.txt
==============================================================================
--- (empty file)
+++ trunk/content_package/Classic/description_0.txt Tue Apr 28 23:02:32 2009
@@ -0,0 +1 @@
+City 1

Added: trunk/content_package/Classic/description_1.txt
==============================================================================
--- (empty file)
+++ trunk/content_package/Classic/description_1.txt Tue Apr 28 23:02:32 2009
@@ -0,0 +1 @@
+Forest 1

Added: trunk/content_package/Classic/description_2.txt
==============================================================================
--- (empty file)
+++ trunk/content_package/Classic/description_2.txt Tue Apr 28 23:02:32 2009
@@ -0,0 +1 @@
+City 1

Modified: trunk/content_package/Classic/tiles_1.txt
==============================================================================
--- trunk/content_package/Classic/tiles_1.txt (original)
+++ trunk/content_package/Classic/tiles_1.txt Tue Apr 28 23:02:32 2009
@@ -1 +1,2 @@
tiles_forest.png
+background.jpg

Modified: trunk/content_package/Classic/tiles_default.txt
==============================================================================
--- trunk/content_package/Classic/tiles_default.txt (original)
+++ trunk/content_package/Classic/tiles_default.txt Tue Apr 28 23:02:32 2009
@@ -1 +1,2 @@
tiles_industrial.png
+background.jpg

Modified: trunk/prepare_content.sh
==============================================================================
--- trunk/prepare_content.sh (original)
+++ trunk/prepare_content.sh Tue Apr 28 23:02:32 2009
@@ -8,7 +8,7 @@
ALL_FILES=`find -L content_package | grep -v \~ | grep -v \.svn | grep -v
\.drop`
DEMO_FILES=`find -L content_package | grep -v \~ | grep -v \.svn | grep -v
\.drop | grep -v Classic | grep -v The_Second_Wave`

-CONTENT_FILES=$DEMO_FILES
+CONTENT_FILES=$ALL_FILES

rm $TARGET
rm $EPOCH

Added: trunk/res/drawable/kills.png
==============================================================================
Binary file. No diff available.

Modified: trunk/src/android/com/abb/LevelSelectActivity.java
==============================================================================
--- trunk/src/android/com/abb/LevelSelectActivity.java (original)
+++ trunk/src/android/com/abb/LevelSelectActivity.java Tue Apr 28 23:02:32
2009
@@ -173,6 +173,7 @@
private LevelArrayAdapter mLevelArrayAdapter;
private ArrayList<Level> mLevels = new ArrayList<Level>();

- private final String kRootDirectory = "content:///Demo/";
+ private final String kRootDirectory = "content:///Classic/";
+ //private final String kRootDirectory = "content:///Demo/";
//private final String kRootDirectory = "content:///The_Second_Wave/";
}