updating version to 0.18.3

projects/mtg/Android/AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="net.wagic.app"   
-      android:versionCode="182"
+      android:versionCode="183"
-      android:versionName="0.18.2">
+      android:versionName="0.18.3">
     <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"></uses-permission>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.INTERNET"/>

projects/mtg/Android/build.xml

@@ -1,67 +1,83 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project name="Wagic">
+<project name="Wagic" default="help">
 
     <!-- The local.properties file is created and updated by the 'android' tool.
-         It contains the path to the SDK. It should *NOT* be checked in in Version
+         It contains the path to the SDK. It should *NOT* be checked into
-         Control Systems. -->
+         Version Control Systems. -->
     <property file="local.properties" />
 
-    <!-- The build.properties file can be created by you and is never touched
+    <!-- The ant.properties file can be created by you. It is only edited by the
-         by the 'android' tool. This is the place to change some of the default property values
+         'android' tool to add properties to it.
-         used by the Ant rules.
+         This is the place to change some Ant specific build properties.
          Here are some properties you may want to change/update:
 
-         application.package
-             the name of your application package as defined in the manifest. Used by the
-             'uninstall' rule.
          source.dir
-             the name of the source directory. Default is 'src'.
+             The name of the source directory. Default is 'src'.
          out.dir
-             the name of the output directory. Default is 'bin'.
+             The name of the output directory. Default is 'bin'.
 
-         Properties related to the SDK location or the project target should be updated
+         For other overridable properties, look at the beginning of the rules
-          using the 'android' tool with the 'update' action.
+         files in the SDK, at tools/ant/build.xml
 
-         This file is an integral part of the build system for your application and
+         Properties related to the SDK location or the project target should
-         should be checked in in Version Control Systems.
+         be updated using the 'android' tool with the 'update' action.
+
+         This file is an integral part of the build system for your
+         application and should be checked into Version Control Systems.
 
          -->
-    <property file="build.properties" />
+    <property file="ant.properties" />
 
-    <!-- The default.properties file is created and updated by the 'android' tool, as well
+    <!-- The project.properties file is created and updated by the 'android'
-         as ADT.
+         tool, as well as ADT.
-         This file is an integral part of the build system for your application and
-         should be checked in in Version Control Systems. -->
-    <property file="default.properties" />
 
-    <!-- Custom Android task to deal with the project target, and import the proper rules.
+         This contains project specific properties such as project target, and library
-         This requires ant 1.6.0 or above. -->
+         dependencies. Lower level build properties are stored in ant.properties
-    <path id="android.antlibs">
+         (or in .classpath for Eclipse projects).
-        <pathelement path="${sdk.dir}/tools/lib/anttasks.jar" />
-        <pathelement path="${sdk.dir}/tools/lib/sdklib.jar" />
-        <pathelement path="${sdk.dir}/tools/lib/androidprefs.jar" />
-        <pathelement path="${sdk.dir}/tools/lib/apkbuilder.jar" />
-        <pathelement path="${sdk.dir}/tools/lib/jarutils.jar" />
-    </path>
 
-    <taskdef name="setup"
+         This file is an integral part of the build system for your
-        classname="com.android.ant.SetupTask"
+         application and should be checked into Version Control Systems. -->
-        classpathref="android.antlibs" />
+    <loadproperties srcFile="project.properties" />
 
-    <!-- Execute the Android Setup task that will setup some properties specific to the target,
+    <!-- quick check on sdk.dir -->
-         and import the build rules files.
+    <fail
+            message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through an env var"
+            unless="sdk.dir"
+    />
 
-         The rules file is imported from
+    <!--
-            <SDK>/platforms/<target_platform>/templates/android_rules.xml
+        Import per project custom build rules if present at the root of the project.
-
+        This is the place to put custom intermediary targets such as:
-         To customize some build steps for your project:
+            -pre-build
-         - copy the content of the main node <project> from android_rules.xml
+            -pre-compile
-         - paste it in this build.xml below the <setup /> task.
+            -post-compile (This is typically used for code obfuscation.
-         - disable the import by changing the setup task below to <setup import="false" />
+                           Compiled code location: ${out.classes.absolute.dir}
-
+                           If this is not done in place, override ${out.dex.input.absolute.dir})
-         This will ensure that the properties are setup correctly but that your customized
+            -post-package
-         build steps are used.
+            -post-build
+            -pre-clean
     -->
-    <setup />
+    <import file="custom_rules.xml" optional="true" />
+
+    <!-- Import the actual build file.
+
+         To customize existing targets, there are two options:
+         - Customize only one target:
+             - copy/paste the target into this file, *before* the
+               <import> task.
+             - customize it to your needs.
+         - Customize the whole content of build.xml
+             - copy/paste the content of the rules files (minus the top node)
+               into this file, replacing the <import> task.
+             - customize to your needs.
+
+         ***********************
+         ****** IMPORTANT ******
+         ***********************
+         In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
+         in order to avoid having your file be overridden by tools such as "android update project"
+    -->
+    <!-- version-tag: 1 -->
+    <import file="${sdk.dir}/tools/ant/build.xml" />
 
 </project>

projects/mtg/bin/Res/createResourceZip.py

@@ -26,14 +26,14 @@ def createResZipFile(filename):
         zip_file.close()
 
 def createStandardResFile():
-    filename = 'core_0182.zip'
+    filename = 'core_0183.zip'
     createResZipFile( filename )
     print >> sys.stderr, 'Created Resource Package for Standard Distribution: {0}'.format( filename)
 
 def createIosResFile():
     print 'Preparing Resource Package for iOS'
     utilities = ZipUtilities()
-    filename = 'core_0182_iOS.zip'
+    filename = 'core_0183_iOS.zip'
     #createResZipFile( filename )
     zip_file = zipfile.ZipFile(filename, 'a', zipfile.ZIP_STORED)
     zip_file.write("../../iOS/Res/rules/modrules.xml", "rules/modrules.xml", zipfile.ZIP_STORED)

projects/mtg/include/Wagic_Version.h

@@ -13,7 +13,7 @@
 /* Wagic versions */
 #define WAGIC_VERSION_MAJOR     0
 #define WAGIC_VERSION_MEDIUM    18
-#define WAGIC_VERSION_MINOR     2
+#define WAGIC_VERSION_MINOR     3
 
 #define VERSION_DOT(a, b, c) a ##.## b ##.## c
 #define VERSION_WITHOUT_DOT(a, b, c) a ## b ## c

projects/mtg/src/GameStateDuel.cpp

@@ -515,7 +515,9 @@ void GameStateDuel::Update(float dt)
                 }
                 //END almosthumane - mulligan
                 menu->Add(MENUITEM_MAIN_MENU, "Back to main menu");
+#ifdef DEBUG
                 menu->Add(MENUITEM_UNDO, "Undo");
+#endif
 #ifdef TESTSUITE
                 menu->Add(MENUITEM_LOAD, "Load");
 #endif