OMGeeky/andors-trail
1
0
Fork 0
mirror of https://github.com/OMGeeky/andors-trail.git synced 2026-01-06 19:50:01 +01:00
Code Issues 1 Packages Projects Releases Wiki Activity
407 Commits 46 Branches 0 Tags
d54c1ab6f815aeda6e4e4ce287ad5e80cd64eece
Commit Graph

407 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Oskar Wiksten
d54c1ab6f8 Refactor content editor - Add support for loading actual content with http get. 2013-02-09 12:35:16 +01:00
Oskar Wiksten
f80157a0d0 Refactor content editor - Add support for editing items and item categories. 2013-02-09 12:35:16 +01:00
Oskar Wiksten
8570d4d760 Refactor content editor - Add support for editing droplists. 2013-02-09 12:35:16 +01:00
Oskar Wiksten
c33cd6bd2a Refactor content editor - Added views for updating, exporting and importing quests and actor conditions. 2013-02-09 12:35:16 +01:00
Oskar Wiksten
004a67f2c9 Refactor content editor - More work on default values for import/export. 2013-02-09 12:35:16 +01:00
Oskar Wiksten
b9d36db162 Refactor content editor - Updated editor to use module pattern. Implemented import/export of json formats. 2013-02-09 12:35:16 +01:00
Oskar Wiksten
6d05129384 Work in progress on updated Content editor that uses angular.js instead of jqueryui. 2013-02-09 12:35:16 +01:00
Oskar Wiksten
bc1fb7daa5 Merge branch 'resource_as_json' 2013-02-09 12:34:57 +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
f358741d99 Merge branch 'healfood' 2013-02-06 07:54:22 +00: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
d0552dad83 Merge branch 'updated_tileset' 2013-02-03 10:37:45 +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
109fb5ecfb Merge branch 'refactor_listener' 2013-01-28 01:27:31 +01:00
Oskar Wiksten
159bc8799f Merge branch 'actortraits_refactoring' 2013-01-28 01:27:20 +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
Oskar Wiksten
a50c1a1279 Actor traits refactoring - Reworked UI for displaying the actor stats tableview. 2013-01-28 01:01:29 +01:00