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
1,018 Commits 44 Branches 0 Tags
091ed4e77318c2ca6b305cec4ddb6e2a87feaf2a
Commit Graph

72 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
Zukero
a17eaadf4e Added UI to show the stats for the "revenge strike" feature. 2017-08-28 17:52:34 +02:00
Zukero
d15e15a897 Fixed bug in feature ending a round at the end of a combat that caused 
an infinite recursion (Stack overflow) when the combat ended due to
player death while afflicted by an actor condition.
 2017-08-21 14:40:46 +02:00
Zukero
efcf683adf Merge pull request #22 from HummusSamurai/feature/SortingAndCategories 
Feature/sorting and categories
Inventory, skills and shoplists can now be filtered and sorted !
Thank you M.H. Alkotob.
 2017-02-22 14:13:24 +01:00
M.H. Alkotob
4eff7a97c9 Changed layout_height(s) to "wrap_content" 2017-02-22 14:40:13 +02:00
M.H. Alkotob
afaf284a59 request changes 2017-01-31 10:21:41 +02:00
Zukero
ef2af81e87 Quickslots assignment UI - now it's looking better. 2017-01-21 00:34:50 +01:00
Zukero
941b8332e5 Redesign of quickbuttons assignment UI. 2017-01-20 18:36:19 +01:00
Mohamad Alkotob
7c61ad5f81 extra newlines 2017-01-13 16:52:17 +02:00
HummusSamurai
a60e2ab4c5 The sorting/category buttons in the inventory are now above the inventory list directly. 2017-01-13 16:49:43 +02:00
Mohamad Alkotob
e2b8ac73e8 a space 2017-01-04 19:13:03 +02:00
Mohamad Alkotob
1905e39e43 style 2017-01-04 19:12:42 +02:00
Zukero
ac2c4d7313 Solved button text no showing in shops issue. 
All button instances in XML layouts now use layout_height="wrap_parent"
and minHeight="0dp" instead of a fixed 35sp size. It should be safer.
 2017-01-04 15:38:42 +01:00
life
0907b0978d Skills, Inventory, and Shops now have the Sort & Category options in the UI. 2017-01-04 01:29:46 +02:00
Zukero
f4db713e63 Continued %-symbol deletion. 2015-10-29 16:04:10 +01:00
Zukero
4d1609d3c4 Fixed UI icons resolution on HDPI devices introduced with sprite upscaling prevention for densities >1 
Fixed variable text size in debug buttons
Fixed game crahing & walkalbe issues in new versions of BWM maps.
 2015-07-10 15:53:10 +02:00
Oskar Wiksten
6006fe1eb5 Refactor: Don't use hardcoded text for placeholders 2013-11-03 14:57:07 +01: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
c51952186c Possible bugfix for NPE on hero&shop screens on droid2.1 (thanks Mayweed!) 2013-07-08 23:33:17 +02:00
Oskar Wiksten
daec6ee814 Basic UI styling for game statistics 2013-07-06 11:02:13 +02:00
Oskar Wiksten
4ead45744e Added game statistics to hero overview screen 2013-07-06 01:01:49 +02:00
Oskar Wiksten
f16149bccb Start using FragmentActivity & FragmentTabHost for tabs instead of TabHost. 2013-07-05 22:26:15 +02:00
Oskar Wiksten
fd2014a697 Add warning on the startscreen about savegames in alpha- and beta version. 2013-07-01 20:09:00 +02:00
Oskar Wiksten
8ac12ac960 Add preferences for setting position of quickslots 2013-06-29 18:11:07 +02:00
Oskar Wiksten
98caa3295e Fix some Android Lint warnings. 2013-06-26 22:26:57 +02:00
Oskar Wiksten
9b7c5207d0 Add toolbox button for displaying combat log. 2013-06-15 09:40:53 +02:00
Oskar Wiksten
52cec01ed2 Remove in-game menu. 
* Move Save from menu to toolbox
* Move preferences to startscreen
* Remove exit on startscreen
 2013-06-14 21:41:49 +02:00
Oskar Wiksten
8575e89dee Update R.layout.inventoryitemview to a single TextView instead of a combined ImageView & TextView. 2013-02-15 12:04:05 +00:00
Oskar Wiksten
fb45d7e372 Add support for "description" field on items, for lore/background text that should be displayed on the item. 2013-02-11 11:10:00 +00:00
Oskar Wiksten
a50c1a1279 Actor traits refactoring - Reworked UI for displaying the actor stats tableview. 2013-01-28 01:01:29 +01:00
Oskar Wiksten
b881b6c15d Merge branch 'traits_refactoring' 2012-10-07 18:19:44 +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
4a834765b4 Styled worldmap. Default generated worldmap tilesize changed from 12 to 8 pixels. 2012-10-07 16:41:17 +02:00
Oskar Wiksten
51883dbdf5 WIP on displaying an actual worldmap in-game. 2012-10-07 16:40:43 +02:00
Oskar Wiksten
534148431e Refactored how item stats are applied. Changed item stats from re-using CombatTraits (which is used on actors) on items, to now instead use more explicit fields on the AbilityModifierTraits object. 2012-10-07 16:39:28 +02:00
Oskar Wiksten
bd0ee9713d WIP display duration & magnitude on condition icons. 2012-10-07 16:25:36 +02:00
oskar.wiksten
cf744a7b92 Minor conversation fixes (thanks ctnbeh13 & sdevaney) 
Implemented actual gameplay help in the about section (thanks Nyktos & sdevaney!)

git-svn-id: https://andors-trail.googlecode.com/svn/trunk@244 08aca716-68be-ccc6-4d58-36f5abd142ac
 2012-05-13 15:58:46 +00:00
oskar.wiksten
8782a83437 First attempt at displaying quantities on quickbar buttons. 
git-svn-id: https://andors-trail.googlecode.com/svn/trunk@236 08aca716-68be-ccc6-4d58-36f5abd142ac
 2012-04-29 15:47:05 +00:00
oskar.wiksten
0bf3fab678 Changes to critical hits - now based on "critical skill" that defines the effective critical chance by a nonlinear formula (sqrt). 
Conversation corrections (thanks ctnbeh13)

git-svn-id: https://andors-trail.googlecode.com/svn/trunk@227 08aca716-68be-ccc6-4d58-36f5abd142ac
 2012-03-30 16:38:19 +00:00
oskar.wiksten
02d5a2fac1 Fixed lots of Android lint warnings. 
New graphics for red damage animation.
Added better script triggers to Mikhail's conversation while doing the bread and rats quests.
Start outline of new minor quest for v0.6.11 (sisterfight).
Re-spawn monsters that were not unique in v0.6.10 (issue 301).

git-svn-id: https://andors-trail.googlecode.com/svn/trunk@225 08aca716-68be-ccc6-4d58-36f5abd142ac
 2012-03-24 11:28:14 +00:00
oskar.wiksten
a985b6e29f Minor conversation correction to wellguard in Loneford (issue 259, thanks bluers0 & Samuel) 
Remove slider from bulkselection dialog when there is just one item, provide image&name in bulkselection dialog (issue 279, thanks Samuel)

git-svn-id: https://andors-trail.googlecode.com/svn/trunk@224 08aca716-68be-ccc6-4d58-36f5abd142ac
 2012-03-12 22:06:36 +00:00
oskar.wiksten
2fe1e3f0b0 Added immunity to critical hits for ghosts, undead and demons. 
Added a way to re-sort the player's inventory by moving items to top/bottom.
Auto-close the level-up dialog if the player cannot level up (issue 284)

git-svn-id: https://andors-trail.googlecode.com/svn/trunk@222 08aca716-68be-ccc6-4d58-36f5abd142ac
 2012-03-12 21:16:57 +00:00
oskar.wiksten@gmail.com
411454683d Allow selection of conversation replies with keyboard. 
Prevent FC when changing maps while animations are running (such as regeneration)


git-svn-id: https://andors-trail.googlecode.com/svn/trunk@188 08aca716-68be-ccc6-4d58-36f5abd142ac
 2011-10-19 22:26:38 +00:00
oskar.wiksten@gmail.com
49eb55cbf0 Structural refactoring: moved CombatTraits from being a superclass of ActorTraits into being a property of Actor (for issue 251 & issue 253). 
Save active monster conditions in savegame file (issue 253).
Save individual monster combat stats in savegame file (issue 251).
Display active monster conditions on monster info dialog. (issue 252).
Renamed "unequipped stats" to "Base combat statistics (without equipment and skills)".
Bumped version number.

git-svn-id: https://andors-trail.googlecode.com/svn/trunk@177 08aca716-68be-ccc6-4d58-36f5abd142ac
 2011-10-12 22:04:46 +00:00
oskar.wiksten@gmail.com
6aedc946c5 Updated to version v0.6.10a3. 
Updated dialog of Oluag, Unnmir and Gaela for when the player has already talked to them.
Updated conversation of guard in Prim main hall.
Sort skills according to id.
Renamed old healing potions to differentiate them from the new healing potions.
Spelling corrections to v0.6.10 conversation content.
Removed overScrollFooter for conversation listview (for issue 205)

git-svn-id: https://andors-trail.googlecode.com/svn/trunk@173 08aca716-68be-ccc6-4d58-36f5abd142ac
 2011-10-09 11:14:38 +00:00
oskar.wiksten
6f4f466c1f Refactor: Made sure that IDs are used where applicable, instead of names (in particular with regards to MonsterType) 
Refactor: Reduce dependencies from Phrase object (changed Droplist property into id instead of actual object)
Refactor: Renamed some images to maintain filename naming scheme.
Bugfix: Conversation editor did not guess new phrase ids correctly.

git-svn-id: https://andors-trail.googlecode.com/svn/trunk@157 08aca716-68be-ccc6-4d58-36f5abd142ac
 2011-09-14 11:52:19 +00:00
oskar.wiksten
65664d5c47 Corrections to horizontal alignment issues on Samsung Galaxy S2. (Issue 242) 
Updated authors list.

git-svn-id: https://andors-trail.googlecode.com/svn/trunk@154 08aca716-68be-ccc6-4d58-36f5abd142ac
 2011-09-09 19:03:27 +00:00
oskar.wiksten
475d330dde Changed all "fill_parent" to "match_parent" in layouts. 
git-svn-id: https://andors-trail.googlecode.com/svn/trunk@153 08aca716-68be-ccc6-4d58-36f5abd142ac
 2011-09-07 18:37:04 +00:00