Marc Zinnschlag
|
25952369ae
|
merge land tables
(cherry picked from commit a8dc1c1198)
|
2015-11-01 18:56:18 +11:00 |
|
Marc Zinnschlag
|
a2d4957d2a
|
merge land texture tables
(cherry picked from commit 890bbb6b11)
|
2015-11-01 13:40:21 +11:00 |
|
Marc Zinnschlag
|
e5038cbece
|
fixed merge stage order; added proper initialisation
(cherry picked from commit b7983d08ba)
|
2015-11-01 13:40:07 +11:00 |
|
Marc Zinnschlag
|
73ab89bf70
|
merge references tables
(cherry picked from commit a97a632aa7)
|
2015-11-01 13:39:56 +11:00 |
|
Marc Zinnschlag
|
9230c62884
|
merge referenceables table
(cherry picked from commit f95950e8d8)
|
2015-11-01 13:39:30 +11:00 |
|
Marc Zinnschlag
|
98cac624a9
|
added info tables and pathgrid table to merge operation
(cherry picked from commit 103073150e)
|
2015-11-01 13:37:14 +11:00 |
|
Marc Zinnschlag
|
973c65bc82
|
merge id collections
(cherry picked from commit 3902513e65)
|
2015-11-01 13:35:15 +11:00 |
|
Marc Zinnschlag
|
55dfe48ef7
|
copy meta data from game file when merging
(cherry picked from commit 47dd9505a9)
Conflicts:
apps/opencs/model/doc/document.cpp
apps/opencs/model/world/data.cpp
|
2015-11-01 13:34:41 +11:00 |
|
Marc Zinnschlag
|
3eef192e4d
|
create merged document and open a view for it (document is still empty at this point)
(cherry picked from commit 1b663f01af)
Conflicts:
apps/opencs/CMakeLists.txt
apps/opencs/model/doc/documentmanager.cpp
|
2015-11-01 13:31:28 +11:00 |
|
Marc Zinnschlag
|
e4381c3ec8
|
added merge operation (doesn't do anything yet)
(cherry picked from commit 904ad94952)
Conflicts:
apps/opencs/CMakeLists.txt
apps/opencs/model/tools/tools.cpp
|
2015-11-01 13:25:34 +11:00 |
|