Marc Zinnschlag
|
8c4303399f
|
Merge branch 'master' into dialogue
Conflicts:
apps/opencs/model/world/columns.cpp
apps/opencs/model/world/columns.hpp
apps/opencs/model/world/data.cpp
components/esm/loadinfo.hpp
|
2013-11-10 13:21:39 +01:00 |
|
Marc Zinnschlag
|
dc473221e7
|
added ID-argument to CollectionBase::getAppendIndex (required for info record collection)
|
2013-10-22 11:21:12 +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
|
ba5e2a0330
|
changed ID listing to include deleted records by default
|
2013-09-19 13:42:19 +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
|
2968b96882
|
added a bit more documentation
|
2013-06-17 13:03:32 +02:00 |
|
Marc Zinnschlag
|
f4e7916ec4
|
moved IdCollection base into its own source file pair and renamed it to Collection
|
2013-06-17 11:42:02 +02:00 |
|