]> www.infradead.org Git - users/mchehab/andors-trail.git/commit
215 new lines of dialogue for v0.6.11
authoroskar.wiksten <oskar.wiksten@08aca716-68be-ccc6-4d58-36f5abd142ac>
Wed, 7 Dec 2011 22:10:56 +0000 (22:10 +0000)
committeroskar.wiksten <oskar.wiksten@08aca716-68be-ccc6-4d58-36f5abd142ac>
Wed, 7 Dec 2011 22:10:56 +0000 (22:10 +0000)
commit46baf81d8fabfc9d80ae534e7c9922acbdb78191
tree2ec4d10212155baab689a070a009a6c981be93e7
parent9818eb0351f809c0588c2a4ad7aeb29cc1569b61
215 new lines of dialogue for v0.6.11
37 new items for v0.6.11
Start of 3 new quests for v0.6.11
Tile fixes for waytolake* and mountaincave* maps.
Allow scripted conversation text to contain the player's name (using $playername as placeholder in the text).

git-svn-id: https://andors-trail.googlecode.com/svn/trunk@209 08aca716-68be-ccc6-4d58-36f5abd142ac
19 files changed:
AndorsTrail/res/drawable/items_misc.png
AndorsTrail/res/drawable/map_tiles_2_2.png
AndorsTrail/res/values/content_actorconditions.xml
AndorsTrail/res/values/content_conversationlist.xml
AndorsTrail/res/values/content_droplist.xml
AndorsTrail/res/values/content_itemlist.xml
AndorsTrail/res/values/content_monsterlist.xml
AndorsTrail/res/values/content_questlist.xml
AndorsTrail/res/xml/lonelyhouse1.tmx
AndorsTrail/res/xml/mountaincave0.tmx
AndorsTrail/res/xml/mountaincave1.tmx
AndorsTrail/res/xml/mountaincave2.tmx
AndorsTrail/res/xml/mountaincave3.tmx
AndorsTrail/res/xml/waterway9.tmx
AndorsTrail/res/xml/waytolake0.tmx
AndorsTrail/res/xml/waytolake1.tmx
AndorsTrail/res/xml/waytolake5.tmx
AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ConversationActivity.java
AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ConversationController.java