]> www.infradead.org Git - users/mchehab/andors-trail.git/commit
Update monster HP before running the attack animation.
authoroskar.wiksten@gmail.com <oskar.wiksten@gmail.com@08aca716-68be-ccc6-4d58-36f5abd142ac>
Tue, 18 Oct 2011 18:02:21 +0000 (18:02 +0000)
committeroskar.wiksten@gmail.com <oskar.wiksten@gmail.com@08aca716-68be-ccc6-4d58-36f5abd142ac>
Tue, 18 Oct 2011 18:02:21 +0000 (18:02 +0000)
commit58c89023de9137139fbf5987c7d288a463c68574
tree12ebca9eaea3db545d9e878284e0abb04ff0d4c1
parent2a46837b2c28586829ebb66df62e4a0a385c54e2
Update monster HP before running the attack animation.
Spelling corrections to conversations.
Prevent FC when running maploader on maps that have exits that do not specify a destination map (such as south of Prim).
Reuse loaded graphics tiles in shopactivity.
Do not use android.util.Pair (since it's not available in Android v1.6)
Updated German translation (thanks Samuel)

git-svn-id: https://andors-trail.googlecode.com/svn/trunk@186 08aca716-68be-ccc6-4d58-36f5abd142ac
19 files changed:
AndorsTrail/res/values-de/content_actorconditions.xml [new file with mode: 0644]
AndorsTrail/res/values-de/content_itemlist.xml
AndorsTrail/res/values-de/strings.xml
AndorsTrail/res/values/content_conversationlist.xml
AndorsTrail/res/values/strings.xml
AndorsTrail/res/xml/crossroads.tmx
AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/DebugInterface.java
AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ShopActivity.java
AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/CombatController.java
AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/ResourceFileTokenizer.java
AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/ActorConditionsTypeParser.java
AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/ConversationListParser.java
AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/DropListParser.java
AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/ItemTypeParser.java
AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/MonsterTypeParser.java
AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/QuestParser.java
AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/tiles/TileManager.java
AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/Pair.java [new file with mode: 0644]
AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ShopItemContainerAdapter.java