Commit Graph

7 Commits

Author SHA1 Message Date
Zukero
29379be41c UI to show actor conditions active on the targeted NPC during battle. 2017-10-24 18:23:45 +02:00
Oskar Wiksten
83d2a8bde0 Convert all code spaces to tabs.
* Yay for spaces-vs-tabs flamewar!
* Also removes trailing whitespaces in code
2013-07-23 16:36:26 +02:00
Oskar Wiksten
7aedeae7ba Merge branch 'worldmap'
Conflicts:
	AndorsTrail/res/values/strings.xml
	AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/MainActivity.java
	AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/CombatController.java
	AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/StatusView.java
2012-10-07 18:17:53 +02:00
Oskar Wiksten
714bf9189e Move toolbox to lower right hand corner, replaces old "toggle quickitems" button. 2012-10-07 16:41:23 +02:00
Oskar Wiksten
18f60e1707 First version of replacing the hero icon with the toolbox drawer. 2012-10-07 16:41:17 +02:00
Oskar Wiksten
c90d7c4ef0 Use animations when changing visibility of the combat bar. 2012-10-07 16:27:08 +02:00
Oskar Wiksten
bd0ee9713d WIP display duration & magnitude on condition icons. 2012-10-07 16:25:36 +02:00