OMGeeky/andors-trail
1
0
Fork 0
mirror of https://github.com/OMGeeky/andors-trail.git synced 2026-02-23 15:38:29 +01:00
Code Issues 1 Packages Projects Releases Wiki Activity
620 Commits 44 Branches 0 Tags
d05baa266e25c19eb85cbbb19ebdac1a7cdcd6fc
Commit Graph

5 Commits

Author SHA1 Message Date
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