6627 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Oskar Wiksten	09d4d39fe5	Refactor content editor - Provide table-based editor for monsters.	2013-02-09 12:35:17 +01:00
Oskar Wiksten	7ef0152e4c	Refactor content editor - Simplify item cost calculations.	2013-02-09 12:35:17 +01:00
Oskar Wiksten	9f9d1ae5d5	Refactor content editor - Simplify monster exp calculation.	2013-02-09 12:35:17 +01:00
Oskar Wiksten	d08af3a089	Refactor content editor - Removed old files.	2013-02-09 12:35:17 +01:00
Oskar Wiksten	4a4450d20d	Refactor content editor - Remove conversation tree. Provide links to follow conversation topics.	2013-02-09 12:35:17 +01:00
Oskar Wiksten	8ec233096a	Refactor content editor - Display (buggy) treeview for editing conversation phrases.	2013-02-09 12:35:17 +01:00
Oskar Wiksten	f2b9e6a9f3	Refactor content editor - Reorganized files into separate directories.	2013-02-09 12:35:17 +01:00
Oskar Wiksten	feb05838f8	Refactor content editor - work in progress on editor for dialogue.	2013-02-09 12:35:17 +01:00
Oskar Wiksten	30d8cb3a0d	Refactor content editor - Allow loading resources from existing json files.	2013-02-09 12:35:17 +01:00
Oskar Wiksten	948bd2c215	Refactor content editor - Actually remove things from model when pressing "remove".	2013-02-09 12:35:17 +01:00
Oskar Wiksten	889c607f9a	Refactor content editor - provide hovering hint on clickable icons.	2013-02-09 12:35:17 +01:00
Oskar Wiksten	bb33261d21	Refactor content editor - Enable popup to select icon for items, monsters and actor conditions.	2013-02-09 12:35:16 +01:00
Oskar Wiksten	d1412d8c9d	Refactor content editor - Handle unique monsters correctly.	2013-02-09 12:35:16 +01:00
Oskar Wiksten	f9e0a3e591	Refactor content editor - display icons of items, monsters and actor conditions.	2013-02-09 12:35:16 +01:00
Oskar Wiksten	cc0ff7bdb1	Refactor content editor - Remove unused files.	2013-02-09 12:35:16 +01:00
Oskar Wiksten	3dfd070d0b	Refactor content editor - More basic styling on import/export.	2013-02-09 12:35:16 +01:00
Oskar Wiksten	5970a584f5	Refactor content editor - More baic styling	2013-02-09 12:35:16 +01:00
Oskar Wiksten	aa9480448d	Refactor content editor - Basic ui styling	2013-02-09 12:35:16 +01:00
Oskar Wiksten	8f73b28979	Refactor content editor - Hide some item fields on standard layout.	2013-02-09 12:35:16 +01:00
Oskar Wiksten	1d712006df	Refactor content editor - Use default values correctly.	2013-02-09 12:35:16 +01:00
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