cc9cii
|
0c461f4424
|
Add TopicInfos special conditions table.
|
2015-05-09 21:21:16 +10:00 |
|
cc9cii
|
acb800b8f9
|
Resolve merge issues and fix typos.
|
2015-04-25 09:39:37 +10:00 |
|
cc9cii
|
f1a58994c6
|
Merge branch 'master' into moveref
Conflicts:
apps/opencs/model/world/columns.hpp
apps/opencs/model/world/commands.cpp
apps/opencs/model/world/commands.hpp
apps/opencs/model/world/ref.cpp
apps/opencs/view/world/dialoguesubview.cpp
apps/opencs/view/world/dialoguesubview.hpp
apps/opencs/view/world/util.cpp
components/esm/cellref.hpp
|
2015-04-25 06:52:53 +10:00 |
|
cc9cii
|
18162557b0
|
TopicInfos result script are now displayed in dialogue subviews.
|
2015-04-19 13:31:16 +10:00 |
|
cc9cii
|
f88be67556
|
Convert AI package type and AI wander repeat columns in the nested tables to use enum delegate
|
2015-04-18 09:37:19 +10:00 |
|
cc9cii
|
e241fb0104
|
Convert clothing/armour part reference type column in the nested tables to use enum delegates.
|
2015-04-18 08:31:08 +10:00 |
|
cc9cii
|
e00d7f72ac
|
Convert magic effects ID and Range columns in the nested tables to use enum delegate
|
2015-04-18 08:09:14 +10:00 |
|
cc9cii
|
befd6fe658
|
Convert magic effects Skills column in the nested tables to use enum delegates.
|
2015-04-18 07:15:40 +10:00 |
|
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
|
a2d824bfa6
|
Changes to support dialogue only items but in a list view via QDataWidgetMapper.
|
2015-04-17 01:27:36 +10:00 |
|
cc9cii
|
41b368a759
|
Moved templated code around a bit.
|
2015-04-12 10:52:01 +10:00 |
|
cc9cii
|
4b9c9bf095
|
Simplify and relocate nested column definitions.
|
2015-04-12 08:52:09 +10:00 |
|
cc9cii
|
ea9563ad92
|
Add faction reactions table to dialogue subview. Fix gcc compile issues. Change nested columns to generic ones where possible.
|
2015-04-11 17:51:30 +10:00 |
|
cc9cii
|
88bc62e054
|
Add Region sounds table to dialogue subview.
|
2015-04-11 15:55:26 +10:00 |
|
cc9cii
|
1220369da3
|
Changes as per feedback comments.
|
2015-04-11 11:26:29 +10:00 |
|
cc9cii
|
05210d7f21
|
Nested table support for Pathgrids.
|
2015-04-09 19:29:03 +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 |
|
Marc Zinnschlag
|
1ec0db231c
|
add a separate display type for ID column
|
2015-03-28 14:48:06 +01:00 |
|
Marc Zinnschlag
|
78c6268891
|
added search class and search box widget
|
2015-03-25 11:56:14 +01:00 |
|
cc9cii
|
ca21181483
|
Fix typo to get table display working.
|
2015-03-07 11:42:50 +11:00 |
|
cc9cii
|
fb2ba7610c
|
Merge remote-tracking branch 'remotes/upstream/master' into NonTableFields
Conflicts:
apps/opencs/CMakeLists.txt
apps/opencs/model/doc/document.cpp
apps/opencs/model/world/columnbase.hpp
apps/opencs/model/world/columns.cpp
apps/opencs/model/world/columns.hpp
apps/opencs/model/world/commands.cpp
apps/opencs/model/world/idtable.cpp
apps/opencs/view/world/dialoguesubview.cpp
apps/opencs/view/world/dialoguesubview.hpp
apps/opencs/view/world/util.cpp
|
2015-03-04 11:22:42 +11:00 |
|
Marc Zinnschlag
|
561ddfa0c5
|
make column type accessable via the regular table model
|
2015-01-16 11:29:44 +01:00 |
|
Thoronador
|
51cd2bb5d9
|
remove unused/double variable from CSMWorld::Column class
|
2014-10-11 00:15:36 +02:00 |
|
Marc Zinnschlag
|
ff530a2e19
|
added missing magic effect table columns
|
2014-09-30 12:33:48 +02:00 |
|
Marc Zinnschlag
|
33cd04b37d
|
added missing sound gen table columns
|
2014-09-25 11:40:45 +02:00 |
|
Marc Zinnschlag
|
d1d861e1be
|
Merge branch 'run'
Conflicts:
apps/opencs/model/world/columns.cpp
apps/opencs/model/world/columns.hpp
apps/opencs/model/world/data.cpp
components/CMakeLists.txt
|
2014-09-14 11:59:54 +02:00 |
|
Marc Zinnschlag
|
03c0cbc65a
|
added owner global column to references table (Fixes #1695)
|
2014-08-30 10:13:34 +02:00 |
|
Marc Zinnschlag
|
5c536d571b
|
added script column to debug profile table (dialogue only)
|
2014-08-24 13:15:18 +02: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
|
f0c6ef185e
|
Nest columns directly, created NestedColumn class and NestColumn.
|
2014-07-16 13:13:22 +02:00 |
|
Marek Kochanowicz
|
0252d021eb
|
removed pointless member field
|
2014-07-13 12:37:05 +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 |
|
Marc Zinnschlag
|
9d5956585c
|
added separate display type for colours
|
2014-07-08 09:08:01 +02:00 |
|
Marc Zinnschlag
|
37a2b48fa2
|
added missing type columns to body part table
|
2014-07-01 14:28:12 +02:00 |
|
Marc Zinnschlag
|
ab8bee4d1a
|
added enchantment type column to enchantment table
|
2014-07-01 09:42:56 +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
|
256b075914
|
getting rid of not needed abstract class
|
2014-06-19 16:11:31 +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
|
55d451febe
|
changes in the model (idtable) to support nested data
|
2014-06-02 20:41:37 +02:00 |
|
Marek Kochanowicz
|
089732419a
|
introduce longString
|
2014-03-10 17:18:29 +01:00 |
|
Marek Kochanowicz
|
08ccae6b49
|
handle comboboxes
|
2014-03-08 16:21:49 +01:00 |
|
Marek Kochanowicz
|
1c35a85adf
|
fixed bugs, added extra display_type
|
2014-02-20 19:27:51 +01:00 |
|
Marek Kochanowicz
|
5f3f867a10
|
Implemented convertEnums function
|
2014-02-13 10:21:49 +01:00 |
|
Marek Kochanowicz
|
62c9c77ddf
|
Compiles now.
|
2014-02-12 11:42:19 +01:00 |
|