diff --git a/README.MD b/README.MD index 430900056..2f3d0c387 100644 --- a/README.MD +++ b/README.MD @@ -1,71 +1,71 @@ -[Download latest Androminion.apk](https://github.com/mehtank/androminion/releases/download/5.0.0/Androminion.apk "Androminion.apk") - -1. About this project - - This is a fork of androminion by Ankur Metah, originated from google code - project "androminion", an android based implementation of the game - "Dominion" by Rio Grande Games. - - This fork was originally based on version r561 (2012-08-02) of the - official project and has since been updated up to r638 (2012-08-31). - - Goals of this fork are: - - A better User Interface, first for smartphones and later for tablets - (done) - - Better AI players, possibly using a neural network - (work in progress) - - Possibly a separate server and multiplayer functionality - (later) - - And of course some bug fixing and code commenting - (partly done) - - Licensed under LGPL: http://www.gnu.org/licenses/lgpl-3.0.html - -2. Branching strategy - - ------------------------------------------------------------------------------ - master: - latest stable version, ready for production - ------------------------------------------------------------------------------ - ^ - | - ------------------------------------------------------------------------------ - develop: - contains changes in progress, may not be ready for production - will be marged into master when in a stable, tested state - ------------------------------------------------------------------------------ - ^ ^ ^ ^ ^ - | | | | | - ------------------------------------------------------------------------------ - topic branches (e.g. dev-ui or dev-bot): - for working on a feature or bug fix, will then be merged into develop - ------------------------------------------------------------------------------ - - See also: - http://stackoverflow.com/questions/2428722/git-branch-strategy-for-small-dev-team - -3. Import newest changes from Google Code SVN - - 3.1 Prepare SVN synchronisation with SVN metadata - (Do only once after cloning bitbucket repository) - - git checkout master - git update-ref refs/remotes/trunk origin/master - git svn init http://androminion.googlecode.com/svn/trunk/ - git svn fetch - - 3.2 Copy newest changes in SVN to bitbucket - - git checkout master - git svn fetch (or git svn rebase?) - git push master - - 3.3 Copy newest changes in git/bitbucket back to SVN - - git checkout master - git svn dcommit - --commit-url https://androminion.googlecode.com/svn/trunk/ - --username=google.user@gmail.com - - Merging seems only to work properly with the master branch, so this is - used for synchronizing svn and git. +[Download latest Androminion.apk](https://github.com/mehtank/androminion/releases/download/5.0.0/Androminion.apk "Androminion.apk") + +1. About this project + + This is a fork of androminion by Ankur Metah, originated from google code + project "androminion", an android based implementation of the game + "Dominion" by Rio Grande Games. + + This fork was originally based on version r561 (2012-08-02) of the + official project and has since been updated up to r638 (2012-08-31). + + Goals of this fork are: + - A better User Interface, first for smartphones and later for tablets + (done) + - Better AI players, possibly using a neural network + (work in progress) + - Possibly a separate server and multiplayer functionality + (later) + - And of course some bug fixing and code commenting + (partly done) + + Licensed under LGPL: http://www.gnu.org/licenses/lgpl-3.0.html + +2. Branching strategy + + ------------------------------------------------------------------------------ + master: + latest stable version, ready for production + ------------------------------------------------------------------------------ + ^ + | + ------------------------------------------------------------------------------ + develop: + contains changes in progress, may not be ready for production + will be marged into master when in a stable, tested state + ------------------------------------------------------------------------------ + ^ ^ ^ ^ ^ + | | | | | + ------------------------------------------------------------------------------ + topic branches (e.g. dev-ui or dev-bot): + for working on a feature or bug fix, will then be merged into develop + ------------------------------------------------------------------------------ + + See also: + http://stackoverflow.com/questions/2428722/git-branch-strategy-for-small-dev-team + +3. Import newest changes from Google Code SVN + + 3.1 Prepare SVN synchronisation with SVN metadata + (Do only once after cloning bitbucket repository) + + git checkout master + git update-ref refs/remotes/trunk origin/master + git svn init http://androminion.googlecode.com/svn/trunk/ + git svn fetch + + 3.2 Copy newest changes in SVN to bitbucket + + git checkout master + git svn fetch (or git svn rebase?) + git push master + + 3.3 Copy newest changes in git/bitbucket back to SVN + + git checkout master + git svn dcommit + --commit-url https://androminion.googlecode.com/svn/trunk/ + --username=google.user@gmail.com + + Merging seems only to work properly with the master branch, so this is + used for synchronizing svn and git. diff --git a/androminion/AndroidManifest.xml b/androminion/AndroidManifest.xml index 207bb2eaf..9728434f4 100644 --- a/androminion/AndroidManifest.xml +++ b/androminion/AndroidManifest.xml @@ -1,8 +1,8 @@ + android:versionCode="607" + android:versionName="6.07" > + + + + + + + diff --git a/androminion/res/drawable/journeytoken.xml b/androminion/res/drawable/journeytoken.xml index 050b85fb3..2ef4a0ff1 100644 --- a/androminion/res/drawable/journeytoken.xml +++ b/androminion/res/drawable/journeytoken.xml @@ -3,7 +3,7 @@ + android:color="#6e2d21" /> - + diff --git a/androminion/res/drawable/rectangulartoken.xml b/androminion/res/drawable/rectangulartoken.xml new file mode 100644 index 000000000..cb19ab66b --- /dev/null +++ b/androminion/res/drawable/rectangulartoken.xml @@ -0,0 +1,16 @@ + + + + + + + + + \ No newline at end of file diff --git a/androminion/res/drawable/stashborder.xml b/androminion/res/drawable/stashborder.xml new file mode 100644 index 000000000..e25214ed0 --- /dev/null +++ b/androminion/res/drawable/stashborder.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/androminion/res/drawable/thinstashborder.xml b/androminion/res/drawable/thinstashborder.xml new file mode 100644 index 000000000..c83acbddb --- /dev/null +++ b/androminion/res/drawable/thinstashborder.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/androminion/res/layout/fragment_startgame.xml b/androminion/res/layout/fragment_startgame.xml index 394c1f39d..f4909c9ec 100644 --- a/androminion/res/layout/fragment_startgame.xml +++ b/androminion/res/layout/fragment_startgame.xml @@ -3,163 +3,365 @@ android:layout_width="fill_parent" android:layout_height="fill_parent" android:orientation="vertical" > - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +