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
448 Commits 44 Branches 0 Tags
f5ff29a0fe48a1f9eaa5e72d295aa55239ac0c73
Commit Graph

370 Commits

Author SHA1 Message Date
Oskar Wiksten
f5ff29a0fe Refactored results of phrase rewards, in preparation of displaying more results when gaining rewards. 2013-02-18 07:43:38 +00:00
Oskar Wiksten
24ab3b95f0 Updated IntelliJ Idea project file to work with any Android API version. 2013-02-15 15:14:49 +00: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
9bb1e73f07 Reduce compilation warnings from code inspection rules. 
(Reduce visibilities to private, add final where applicable)
 2013-02-15 09:59:57 +00:00
Oskar Wiksten
59df54f1bb Remove compilation warnings about showDialog() and removeDialog() being deprecated. 2013-02-15 07:50:45 +00:00
Oskar Wiksten
a8b21461de Minor refactoring CombatController. 2013-02-14 14:57:40 +00:00
Oskar Wiksten
f16cfa3ab0 Remove compilation warnings about "new BitmapDrawable(Bitmap)" being deprecated. 2013-02-14 14:57:00 +00:00
Oskar Wiksten
d2428ad36c Add IntelliJ Idea project file. 
Add Android v4 support library.
 2013-02-14 14:47:46 +00:00
Oskar Wiksten
91015e5ea7 Rearrange .gitignore. 2013-02-14 14:47:09 +00:00
Oskar Wiksten
668993c01b Add clear() method to event listener queues. 2013-02-13 15:31:11 +00:00
Oskar Wiksten
2bc06041ad Remove trailing spaces in some conversation phrase texts. 2013-02-12 13:58:46 +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
48d93fbbd0 Only apply "more criticals" skill if the player has CS>0. (Thanks to TriangleGM for reporting it!) 2013-02-09 17:02:33 +01:00
Oskar Wiksten
52a5b8f387 Converted all resource files to json instead of our previous custom format. 2013-02-09 12:34:03 +01:00
Oskar Wiksten
76eaf13772 Minor fix to loading json files from raw/. 2013-02-09 11:10:30 +01:00
Oskar Wiksten
8e75512cfa Fixes to JSON parsing of resource files. 2013-02-09 11:10:30 +01:00
Oskar Wiksten
9ff01745d0 Read JSON resources from raw/ folder instead of encoded in string blocks from values/ folder. 2013-02-09 11:10:30 +01:00
Oskar Wiksten
89759f77f4 Updated parsers for reading resources as JSON. 2013-02-09 11:10:30 +01:00
Oskar Wiksten
81665520c0 WIP on parsing resource data as json instead of the old resource format. 2013-02-09 11:10:29 +01:00
Oskar Wiksten
4b8577e690 Increased exp reward for most quests tenfold. (Issue 283, thanks to jrozek!) 2013-02-09 11:08:27 +01:00
Oskar Wiksten
3bbd38548f Updated Polish translation by tobik9090siemens. 2013-02-09 09:10:46 +01:00
Oskar Wiksten
3da6d0808c Updated translations of itemlist with changes to how food is healing. 2013-02-06 07:53:37 +00:00
Oskar Wiksten
7a3e167bc5 Bugfix: Food poisoning should have an effect every round. 2013-02-03 15:54:15 +01:00
Oskar Wiksten
429429e63f Doubled the amount of health provided by all food items. 2013-02-03 15:54:15 +01:00
Oskar Wiksten
7c38e0337d Changed all food to slowly heal over time instead of healing instantaneously. 2013-02-03 15:54:15 +01:00
Oskar Wiksten
fbe7312e1c Updated maps from master. 2013-02-03 10:34:17 +01:00
Oskar Wiksten
278c605bdb Updated some map tiles. 2013-02-03 10:34:17 +01:00
Oskar Wiksten
eb8232af1f Updated tileset map_wall_1 2013-02-03 10:34:16 +01:00
Oskar Wiksten
ff3fb12a50 Updated tile size for cave walls. 2013-02-03 10:34:16 +01:00
Oskar Wiksten
91fc3a7745 Updated tmx files with new tileset files. 2013-02-03 10:34:16 +01:00
Oskar Wiksten
2ecd64c003 Updated map tileset image files. Updated template.tmx . 2013-02-03 10:31:50 +01:00
Oskar Wiksten
939a406b88 Realign waterway2 & waterway4 on worldmap. 2013-02-03 10:00:01 +01:00
Oskar Wiksten
3e5f77d891 Updated copyright notice to "2010-2013". 2013-02-02 13:56:26 +01:00
Oskar Wiksten
c4a10c5d7d Updated German translation from SamuelPlentz. 
(From issue 331)
 2013-02-02 13:25:29 +01:00
Oskar Wiksten
7d5084312a Updated list of authors with Polish translator tobik9090siemens. 2013-02-02 13:16:38 +01:00
Oskar Wiksten
8f5c35fabb Updated Russian translation from istasman. 
Added istasman to list of authors for Russian translation.
(From issue 332 and issue 333)
 2013-02-02 13:11:53 +01:00
Oskar Wiksten
8f3a22beb4 Changed visibility of methods used in unit tests. 2013-01-28 01:30:37 +01:00
Oskar Wiksten
33345acabd Add public visibility for methods used in unit tests. 2013-01-28 01:25:54 +01:00
Oskar Wiksten
215dd4e31f Updated .gitignore 2013-01-28 01:25:54 +01:00
Oskar Wiksten
be2e54978d Refactor: moved "Savegames" class into savegames package. Moved ListOfListeners into util package. 2013-01-28 01:25:54 +01:00
Oskar Wiksten
16a69bf48c Bugfix: clone list of monster loot bags when picking up items (prevents double drops). 2013-01-28 01:25:54 +01:00
Oskar Wiksten
ad36da6418 Code cleanup: make classes final where possible. 2013-01-28 01:25:54 +01:00
Oskar Wiksten
e3406df935 Emit "new map" events on calling thread, and not inside the async maploading handler. 2013-01-28 01:25:54 +01:00
Oskar Wiksten
e2446d153e Only redraw game screen when something inside the view has actually changed. 2013-01-28 01:25:54 +01:00
Oskar Wiksten
1032b2ee51 Provide reference to current map object when emitting monster spawned events. 2013-01-28 01:25:54 +01:00
Oskar Wiksten
6a59f5d99e Use correct previousPosition when moving monsters. 2013-01-28 01:25:54 +01:00
Oskar Wiksten
5d437db461 Use WeakReference<> for references to application instance. 2013-01-28 01:25:54 +01:00
Oskar Wiksten
32e9a92fef Work in progress on moving ui dependencies away from model. 2013-01-28 01:25:54 +01:00
Oskar Wiksten
e3ea3342c5 Work in progress on moving UI dependencies into being pubsub instead of direct calls from model->ui. 2013-01-28 01:25:54 +01:00
Oskar Wiksten
a99b0fc96f Initialize Player & Monster health correctly when respawning either one. 2013-01-28 01:01:29 +01:00