93 commits

Author	SHA1	Message	Date
cc9cii	c41b4b84a6	Cleanup post merge.	2015-04-17 13:45:45 +10:00
cc9cii	47d5eac290	Merge branch 'master' into NonTableFields ... Conflicts: apps/opencs/model/world/columnbase.cpp apps/opencs/model/world/columnbase.hpp apps/opencs/model/world/idtable.hpp	2015-04-17 12:37:34 +10:00
cc9cii	32e73c3deb	Add creature/item levelled lists (non table items) to dialogue subview.	2015-04-17 11:50:19 +10:00
cc9cii	1c7ed795c2	Add creature/item levelled lists to dialogue subview.	2015-04-13 22:21:27 +10:00
cc9cii	513c3a47cb	Add clothing/armor part reference table to dialogue subview.	2015-04-13 21:08:23 +10:00
cc9cii	526b53fce0	Add AI packages table to dialogue subview. Also minor bug fixes.	2015-04-13 14:14:00 +10:00
cc9cii	60e5ff8811	Remove duplicated checks and exceptions.	2015-04-13 08:03:30 +10:00
cc9cii	a976dca27b	Changed over the remaining RefId adapters. Fixed issue where map entries were overwriting the same key...	2015-04-13 06:39:38 +10:00
cc9cii	7ccf53e750	Changed over inventory adapters. Fixed a few places where modified records were not set properly.	2015-04-12 20:03:55 +10:00
cc9cii	25261a60e5	Add potion magic effects table to dialogue subview. Integration of the adapters to RefIdCollection is incomplete.	2015-04-12 18:29:42 +10:00
cc9cii	f939648736	Add race spells table to dialogue subview.	2015-04-11 19:05:03 +10:00
cc9cii	1220369da3	Changes as per feedback comments.	2015-04-11 11:26:29 +10:00
cc9cii	bdf0d8db22	Re-organise the inheritance structure once more in preparation for adding Pathgrid tables.	2015-04-09 19:11:19 +10:00
Marc Zinnschlag	3b408b6427	sorting out some Display enum mixup	2015-04-04 19:55:53 +02:00
cc9cii	83bcc8d451	Reorganised class inheritance structure of collections, columns and idtable model.	2015-04-02 20:19:15 +11:00
cc9cii	29ef08bb75	Spelling and other consistencies nit pick.	2015-03-30 11:53:33 +11:00
cc9cii	5eefcd862f	Merge branch 'master' into NonTableFields ... Conflicts: apps/opencs/model/tools/tools.cpp apps/opencs/model/world/columnbase.cpp apps/opencs/model/world/commands.cpp apps/opencs/model/world/commands.hpp apps/opencs/model/world/idtable.hpp apps/opencs/model/world/refidadapter.cpp apps/opencs/model/world/refidadapter.hpp apps/opencs/view/world/dialoguesubview.hpp	2015-03-16 10:30:54 +11:00
cc9cii	43ec933b7b	Revert to the original clone() method. Create a new copy method for modified records.	2015-03-10 09:45:35 +11:00
cc9cii	6087a18c94	Implement clone() using a new Record constructor.	2015-03-09 14:58:07 +11:00
cc9cii	128371c902	Copy base data to modified.	2015-03-08 15:50:50 +11:00
cc9cii	a54ab153b0	Cloned references should be considered "Base" rather than "Modified". Should fix bug #2429.	2015-03-08 10:05:10 +11:00
Marek Kochanowicz	ade27293be	handling destination for guides	2014-07-25 17:11:18 +02:00
Marek Kochanowicz	39545670a8	Added spells table (and it works!)	2014-07-25 12:09:25 +02:00
Marek Kochanowicz	864b93e745	added enums for spells	2014-07-25 11:42:02 +02:00
Marek Kochanowicz	9defb188ea	handle inventory in the actors	2014-07-22 13:08:32 +02:00
Marek Kochanowicz	4d79034dbf	correctly handling the nestedTable for undo (but removing and adding ... rows in proper QT way is still TODO)	2014-07-20 18:52:35 +02:00
Marek Kochanowicz	1ff8abb240	store whole container representing the nested table inside of the ... command Static nature of C++ forced me to use templates. Bit frustraiting.	2014-07-18 18:26:22 +02:00
Marek Kochanowicz	6e07568b43	Corrected syntax.	2014-07-17 12:56:51 +02:00
Marek Kochanowicz	f0c6ef185e	Nest columns directly, created NestedColumn class and NestColumn.	2014-07-16 13:13:22 +02:00
Marek Kochanowicz	4b4a72c3b6	Merge remote-tracking branch 'refs/remotes/master/master' into NonTableFields	2014-07-13 10:52:39 +02:00
Marc Zinnschlag	1548f4670a	drop part of resources drag and drop	2014-07-08 09:51:17 +02:00
Marek Kochanowicz	172f1a1301	Merge remote-tracking branch 'refs/remotes/master/master' into NonTableFields	2014-06-30 20:06:44 +02:00
Marc Zinnschlag	4f08efc4d7	added missing combat, magic and stealth columns for creatures (Feature #1312)	2014-06-30 19:51:59 +02:00
Marc Zinnschlag	3541d03809	fixed deleting of referenceables (modification state column was incorrectly flagged as non-editable)	2014-06-27 12:29:23 +02:00
Marek Kochanowicz	7b5bf637ab	Changes needed to add new nested row.	2014-06-24 19:03:29 +02:00
Marek Kochanowicz	c45061614b	Added code to delete nestedRows	2014-06-24 12:21:40 +02:00
Marek Kochanowicz	894c98ee89	Added extra columnid type to use for ID of the inventory item	2014-06-20 14:22:40 +02:00
Marek Kochanowicz	a076798f8f	Quick and dirty prototype of actual nested header data implementation	2014-06-19 18:46:09 +02:00
Marek Kochanowicz	75b5513c6c	Column is responsible for telling that it can nest columns now.	2014-06-18 11:58:18 +02:00
Marek Kochanowicz	ce5e889015	Nested table sits inside it's own layout now.	2014-06-17 20:12:14 +02:00
Marek Kochanowicz	defd0b1754	Merge branch 'dialog-fix' into NonTableFields ... TODO stop failing epicly with git	2014-06-17 14:08:59 +02:00
Marek Kochanowicz	48691136fb	Merge remote-tracking branch 'refs/remotes/master/master' into dialog-fix	2014-06-16 09:44:49 +02:00
Marek Kochanowicz	21a1f6f4ae	working on the issue	2014-06-09 10:35:39 +02:00
Marc Zinnschlag	1b9b275f30	fix for bug #1369	2014-06-05 13:40:37 +02:00
Marek Kochanowicz	55d451febe	changes in the model (idtable) to support nested data	2014-06-02 20:41:37 +02:00
Marek Kochanowicz	befc7a4078	adding column for the content of the container	2014-05-25 17:02:40 +02:00
Marc Zinnschlag	0afa61eed5	fixed referenceable-loading in case of more than one content file	2014-02-15 15:50:17 +01:00
Marek Kochanowicz	6662560cbc	new displays for referencable table columns	2014-02-13 15:43:19 +01:00
Marc Zinnschlag	1d34f5e096	Merge remote-tracking branch 'sirherrbatka/cloning' ... Conflicts: apps/opencs/model/world/refiddata.cpp	2014-01-28 12:40:14 +01:00
Marek Kochanowicz	2bd98a69ab	Corrections, according to the comments. Thanks for the review. :-)	2014-01-28 11:16:48 +01:00