graffy76
|
ba365ff49e
|
Fixed merge conflicts with saving branch
|
2013-10-25 19:23:03 -05:00 |
|
Marc Zinnschlag
|
c995533e07
|
Merge branch 'dialogue' into saving
Conflicts:
apps/opencs/model/world/columnimp.hpp
apps/opencs/model/world/columns.cpp
apps/opencs/model/world/columns.hpp
apps/opencs/model/world/data.cpp
components/esm/loaddial.hpp
|
2013-10-21 16:45:43 +02:00 |
|
Marc Zinnschlag
|
3b85d97087
|
handle deleted dialogue records
|
2013-10-21 15:38:13 +02:00 |
|
Marc Zinnschlag
|
dc12648a3e
|
add fixed dialogue records when creating a new omwgame file
|
2013-10-21 14:26:54 +02:00 |
|
Marc Zinnschlag
|
0be157efea
|
set dialogue type for newly created dialogue records
|
2013-10-21 13:39:13 +02:00 |
|
Marc Zinnschlag
|
75c5316ad7
|
added dialogue type column to topics table
|
2013-10-20 17:26:09 +02:00 |
|
Marc Zinnschlag
|
adf3a41a83
|
added topic and journal tables
|
2013-10-20 17:15:32 +02:00 |
|
Marc Zinnschlag
|
ebf7732912
|
some cleanup
|
2013-10-20 15:48:39 +02:00 |
|
Marc Zinnschlag
|
b8ae195a46
|
Merge branch 'scene'
|
2013-10-13 15:42:27 +02:00 |
|
Marc Zinnschlag
|
a77044cda4
|
fixed column numbering
|
2013-10-12 16:15:47 +02:00 |
|
Marc Zinnschlag
|
9ea092927f
|
added basic scene subview (no functionality yet)
|
2013-09-28 09:25:54 +02:00 |
|
Marc Zinnschlag
|
e7c48cbe58
|
load project files
|
2013-09-27 15:04:30 +02:00 |
|
Marc Zinnschlag
|
62148b3247
|
moved implementation of searchColumnIndex and findColumnIndex functions from IdTable to CollectionBase
|
2013-09-27 15:04:09 +02:00 |
|
Marc Zinnschlag
|
6ac4dedfbe
|
added missing column enum
|
2013-09-27 13:56:23 +02:00 |
|
Marc Zinnschlag
|
23095ec3ec
|
added missing scope column to filter table
|
2013-09-27 13:54:21 +02:00 |
|
Marc Zinnschlag
|
96fd1c35bf
|
preserve author/descriptin meta data
|
2013-09-24 17:17:01 +02:00 |
|
Marc Zinnschlag
|
830530bd06
|
set record count in TES3 header
|
2013-09-24 17:08:24 +02:00 |
|
Marc Zinnschlag
|
e4fdebc85b
|
added saving for referenceable records
|
2013-09-24 13:53:19 +02:00 |
|
Marek Kochanowicz
|
ae5e8b95ff
|
Solving Issue912
|
2013-09-23 20:12:04 +02:00 |
|
Marc Zinnschlag
|
f2875e234c
|
added missing position columns to reference table
|
2013-09-22 10:43:09 +02:00 |
|
Marc Zinnschlag
|
ba5e2a0330
|
changed ID listing to include deleted records by default
|
2013-09-19 13:42:19 +02:00 |
|
Marc Zinnschlag
|
9c751ae370
|
separate highlight colour for IDs
|
2013-09-19 12:30:42 +02:00 |
|
Marc Zinnschlag
|
3d2281fe80
|
added signals and functions to Data for handling ID list changes
|
2013-09-19 12:11:27 +02:00 |
|
Marc Zinnschlag
|
dc345dd43d
|
Merge branch 'filter'
|
2013-09-05 15:47:52 +02:00 |
|
Marc Zinnschlag
|
9332684335
|
allow the use of value types in string filters
|
2013-09-05 15:05:49 +02:00 |
|
Marc Zinnschlag
|
f2e86e860e
|
allow the use of record types in string filters
|
2013-09-05 14:39:56 +02:00 |
|
Marc Zinnschlag
|
8bebe7179c
|
some UniversalId fixes
|
2013-09-05 13:58:36 +02:00 |
|
Alexander "Ace" Olofsson
|
5e42c73356
|
Better fix for unshield, comments on changes, no more commented out code.
|
2013-09-05 10:39:17 +02:00 |
|
Alexander "Ace" Olofsson
|
22a5f7198f
|
A few fixes to build on Windows
|
2013-09-04 23:25:47 +02:00 |
|
Marc Zinnschlag
|
842a616909
|
more cleanup
|
2013-09-03 14:18:34 +02:00 |
|
Marc Zinnschlag
|
80f8024da7
|
allow specifying record modification status column enum via strings
|
2013-09-03 13:03:02 +02:00 |
|
Marc Zinnschlag
|
649ef6f120
|
moved list of enum literals from ViewManager to Columns (which makes them available to the rest of model now)
|
2013-09-02 11:58:05 +02:00 |
|
Marc Zinnschlag
|
9f0b34eae0
|
fixed reference loading code (editor)
|
2013-08-29 13:27:54 +02:00 |
|
Marc Zinnschlag
|
20bd0707dc
|
avoid use of column number literals
|
2013-08-26 12:25:52 +02:00 |
|
Marc Zinnschlag
|
937f5b11a2
|
fixed broken record deletion
|
2013-08-26 12:25:19 +02:00 |
|
Marc Zinnschlag
|
7e02c9acf2
|
added filter text column to filter table
|
2013-08-24 18:53:11 +02:00 |
|
Marc Zinnschlag
|
25e6380884
|
implemented use of predefined filters
|
2013-08-24 17:40:00 +02:00 |
|
Marc Zinnschlag
|
7aee1da5c6
|
fixed some columns
|
2013-08-24 16:51:49 +02:00 |
|
Marc Zinnschlag
|
50041fc211
|
simplified filter system by taking out filter references and user values for now (these are post-1.0 features anyway)
|
2013-08-22 09:17:57 +02:00 |
|
Marc Zinnschlag
|
c7e97a83e1
|
automatically build column map on filter change
|
2013-08-18 17:28:04 +02:00 |
|
Marc Zinnschlag
|
ea8b9ce45b
|
apply filter to table after filter text change
|
2013-08-18 16:53:28 +02:00 |
|
Marc Zinnschlag
|
a95715b61d
|
added description field to filter record
|
2013-08-09 13:45:50 +02:00 |
|
Marc Zinnschlag
|
0944338c27
|
avoid the use of hardcoded column numbers
|
2013-08-08 12:49:30 +02:00 |
|
Marc Zinnschlag
|
76b9d3dbc1
|
columns are now identified via an enum instead the name string
|
2013-08-07 09:36:05 +02:00 |
|
Marc Zinnschlag
|
d2f96deb98
|
renamed columns.hpp to columimp.hpp
|
2013-08-02 10:42:52 +02:00 |
|
Marc Zinnschlag
|
adb05737ee
|
Merge branch 'master' into filter
Conflicts:
apps/opencs/model/world/universalid.cpp
apps/opencs/view/doc/view.cpp
apps/opencs/view/world/subviews.cpp
|
2013-07-30 15:55:50 +02:00 |
|
Marc Zinnschlag
|
434f97c95c
|
fixed two missing icons
|
2013-07-30 12:55:02 +02:00 |
|
Marc Zinnschlag
|
102700a498
|
added specialised Creator for references
|
2013-07-30 12:53:03 +02:00 |
|
Marc Zinnschlag
|
57be764cce
|
added specialised Creator for referenceable records
|
2013-07-30 12:34:18 +02:00 |
|
Marc Zinnschlag
|
34c825ce52
|
added icons and type listing to UniversalId class
|
2013-07-29 16:21:42 +02:00 |
|