cc9cii
be9f94b766
Adjust edge indexes when adding/removing points. Fix some travis warnings.
2015-04-09 21:23:02 +10:00
cc9cii
23db79ebab
Fix for more gcc differences.
2015-04-09 20:53:41 +10:00
cc9cii
3a46512b7f
Attempt to account for gcc differences.
2015-04-09 20:15:38 +10:00
cc9cii
860754e460
Minor formatting cleanup and comments.
2015-04-09 19:33:42 +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
cc9cii
8eaf6b068c
Adding missing file.
2015-04-02 21:02:17 +11:00
cc9cii
851effb0e3
Merge branch 'master' into NonTableFields
2015-04-02 20:43:48 +11:00
cc9cii
83bcc8d451
Reorganised class inheritance structure of collections, columns and idtable model.
2015-04-02 20:19:15 +11:00
cc9cii
ece34a1baa
Workaround for crash while exiting the application.
2015-03-30 18:14:07 +11:00
cc9cii
619b5206cd
More consistency nit pick.
2015-03-30 16:41:55 +11:00
cc9cii
29ef08bb75
Spelling and other consistencies nit pick.
2015-03-30 11:53:33 +11:00
cc9cii
3d280a6ba5
Fixed the display issues of the nested tables in the dialogue subview. Needs further work but usable for now.
2015-03-30 11:19:37 +11:00
cc9cii
76adb64e20
Compilation fix after merging commt e30f24
2015-03-16 13:21:02 +11:00
scrawl
4d0bb6329a
Fix incorrect reference check
...
This check was broken for exterior cells (empty cell id).
It was superfluous anyway. A CellRef is owned by the cell it is in, so the cell must always exist.
2015-03-16 01:50:57 +01: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
Marc Zinnschlag
cf077dcf5d
Merge remote-tracking branch 'cc9cii/fix-hide-overload-warn'
2015-03-14 14:25:49 +01:00
Marc Zinnschlag
55bd0c728e
Merge branch 'threadfix'
2015-03-14 12:00:35 +01:00
Marc Zinnschlag
c0dfad23b3
Fixed editor operation multi-threading ( Fixes #923 )
2015-03-14 12:00:24 +01:00
cc9cii
17e6244bd6
Yet more warnings suppressed.
2015-03-14 12:42:46 +11:00
cc9cii
fd86076db3
More warning fixes.
2015-03-14 08:09:19 +11:00
cc9cii
4f6c772437
Fix more warnings.
2015-03-14 06:36:35 +11:00
cc9cii
488bc76da5
Fix saving land data.
2015-03-13 22:06:55 +11:00
cc9cii
589b0b9171
Add saving land and land textures. Should resolve Bug #2447 .
2015-03-13 08:01:48 +11:00
Marc Zinnschlag
8e37e9a14a
removed redundant functions
2015-03-12 10:51:50 +01:00
Marc Zinnschlag
8a8db8bc24
Merge remote-tracking branch 'cc9cii/editor-clone-fix'
2015-03-12 10:45:51 +01:00
cc9cii
dc9af19dcf
Don't use C++11 features.
2015-03-12 08:28:26 +11:00
Scott Howard
e2ef8c4022
fix -Wnewline-eof warnings
2015-03-11 10:54:45 -04:00
cc9cii
28259f914c
Remove potential memory leak.
2015-03-11 10:49:21 +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
8ac7b77d36
For RefId's, modify a copy of the base record rather than modifying the record directly.
2015-03-10 06:51:54 +11:00
cc9cii
8b3adec3ec
Added a missing copy constructor.
2015-03-09 21:25:41 +11:00
cc9cii
f90cdec53b
Remove default parameters from the implementation.
2015-03-09 16:24: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
cc9cii
ca21181483
Fix typo to get table display working.
2015-03-07 11:42:50 +11:00
cc9cii
727b68dd15
Reduce difference with the master branch where possible.
2015-03-06 19:20:50 +11:00
cc9cii
6d6ff8c6a4
Resolved compile issues, but not fully working.
2015-03-06 14:36:13 +11:00
Marc Zinnschlag
0b70fdac57
added start script verifier
2015-03-05 11:24:01 +01: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
1ed606065c
save start script records
2015-03-03 16:11:00 +01:00
Marc Zinnschlag
4e1c086d6a
load start up script records
2015-03-03 14:31:59 +01:00
cc9cii
66ef9d237c
Another try to make it work with gcc/travis.
2015-03-03 10:12:40 +11:00
cc9cii
7c0f5b72c5
Add enum namespace to workaround travis.
2015-03-03 08:31:06 +11:00
cc9cii
a8427c2efb
Do not add NAME subrecords while saving magic effects or scripts.
2015-03-03 07:36:11 +11:00
Marc Zinnschlag
64938b3796
Merge remote-tracking branch 'cc9cii/saving-skil'
2015-03-01 10:36:26 +01:00
Marc Zinnschlag
59c7fe28d9
Merge remote-tracking branch 'naclander/master'
2015-03-01 10:23:08 +01:00
cc9cii
5ff66ad40b
Fix Bug #2402 . SKIL records should not have NAME subrecord.
2015-03-01 13:09:23 +11:00
scrawl
3158d34abb
Fix for incorrect OpenCS verifier warning: pcvampire and pcwerewolf are not required, pcyear does not exist at all.
2015-02-25 20:25:41 +01:00