cc9cii
|
e7bd298739
|
Undo now working via signals.
|
2015-04-24 01:28:49 +10:00 |
|
cc9cii
|
0e3e3cbae2
|
Merge branch 'master' into pathgrid-edit
|
2015-04-21 19:44:44 +10:00 |
|
cc9cii
|
18162557b0
|
TopicInfos result script are now displayed in dialogue subviews.
|
2015-04-19 13:31:16 +10:00 |
|
cc9cii
|
03578129c7
|
Merge branch 'master' into pathgrid-edit
Conflicts:
apps/opencs/view/render/cell.cpp
|
2015-04-18 15:47: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
|
a976dca27b
|
Changed over the remaining RefId adapters. Fixed issue where map entries were overwriting the same key...
|
2015-04-13 06:39:38 +10:00 |
|
cc9cii
|
ef84e553be
|
Renamed some stuff.
|
2015-04-12 13:48:23 +10:00 |
|
cc9cii
|
41b368a759
|
Moved templated code around a bit.
|
2015-04-12 10:52:01 +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
|
83bcc8d451
|
Reorganised class inheritance structure of collections, columns and idtable model.
|
2015-04-02 20:19:15 +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 |
|
Marc Zinnschlag
|
23cf859fee
|
added search stages (cell table only for now)
|
2015-03-27 16:33:54 +01:00 |
|
Marc Zinnschlag
|
78c6268891
|
added search class and search box widget
|
2015-03-25 11:56:14 +01:00 |
|
Marc Zinnschlag
|
d053c62032
|
setting up global search operation and subview
|
2015-03-17 12:30:47 +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
|
c0dfad23b3
|
Fixed editor operation multi-threading (Fixes #923)
|
2015-03-14 12:00:24 +01:00 |
|
Marc Zinnschlag
|
907ac5ef7f
|
Merge remote-tracking branch 'scrawl/master'
|
2015-03-06 19:24:15 +01:00 |
|
cc9cii
|
727b68dd15
|
Reduce difference with the master branch where possible.
|
2015-03-06 19:20:50 +11:00 |
|
scrawl
|
0fda1cdd53
|
Move oengine to a static library, fixes duplicate compilation of oengine/bullet files by openmw and opencs
|
2015-03-06 02:36:12 +01: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 |
|
cc9cii
|
7f7c3d57bd
|
Merge branch 'master' into pathgrid-edit
Conflicts:
apps/opencs/view/render/cell.cpp
apps/opencs/view/render/cell.hpp
|
2015-02-16 16:46:52 +11:00 |
|
Marc Zinnschlag
|
6cc9fa2b3f
|
Merge remote-tracking branch 'slothlife/cmake-release-build-fix'
|
2015-02-15 09:52:13 +01:00 |
|
Kamil Bar
|
e1314d6211
|
Implement OpenCS reference validation (Feature #831)
|
2015-02-13 04:45:18 +01:00 |
|
slothlife
|
cfe81bafe8
|
Remove setting CMAKE_BUILD_TYPE to Debug
Setting was causing single-target configurations (ninja, make) to
incorrectly link vs debug runtimes on Windows.
|
2015-02-11 21:46:00 -06:00 |
|
Nikolay Kasyanov
|
5534306eb3
|
Few rename fixes
|
2015-02-06 08:59:00 +02:00 |
|
scrawl
|
0b7b627443
|
CMake fix for opencs rename
|
2015-02-03 13:57:40 +01:00 |
|
Marc Zinnschlag
|
0557d45bd1
|
renamed opencs into openmw-cs
|
2015-02-03 13:18:03 +01:00 |
|
cc9cii
|
84f0ddd51c
|
Merge branch 'master' into pathgrid-edit
Conflicts:
apps/opencs/view/render/cell.cpp
apps/opencs/view/render/mousestate.cpp
apps/opencs/view/render/object.cpp
apps/opencs/view/render/object.hpp
apps/opencs/view/render/pagedworldspacewidget.cpp
apps/opencs/view/render/unpagedworldspacewidget.cpp
apps/opencs/view/render/worldspacewidget.cpp
|
2014-12-09 14:02:26 +11:00 |
|
Marc Zinnschlag
|
3a847732b4
|
abstracted message collection into a class
|
2014-12-07 18:57:47 +01:00 |
|
Marc Zinnschlag
|
7c59ea6296
|
added specialised report table
|
2014-12-06 13:01:55 +01:00 |
|
cc9cii
|
2720e5ea9d
|
Remove PhysicsManager singleton and use shared_ptr instead. Resolves the issue where sometimes destructors were called in an unexpected sequence resulting in a crash while exiting the application.
|
2014-12-01 06:44:12 +11:00 |
|
Marc Zinnschlag
|
e04ead2bd5
|
new element visibility button icons
|
2014-11-28 09:14:02 +01:00 |
|
cc9cii
|
9703fd95ac
|
Merge branch 'master' into pathgrid-edit
Conflicts:
apps/opencs/view/render/pagedworldspacewidget.cpp
|
2014-11-14 18:03:53 +11:00 |
|
Marc Zinnschlag
|
a60e4c036f
|
Merge branch 'mode'
Conflicts:
apps/opencs/view/render/pagedworldspacewidget.cpp
apps/opencs/view/render/worldspacewidget.cpp
apps/opencs/view/render/worldspacewidget.hpp
|
2014-11-13 11:12:20 +01:00 |
|
Marc Zinnschlag
|
2acf446f18
|
added edit mode button to scene toolbar
|
2014-11-11 15:58:22 +01:00 |
|
cc9cii
|
f2ff2f2988
|
Render pathgrid points and edges. Can move the points but the edges are not updated. Visibility mask does not work properly because pathgrid points are considered as objects by the physics engine.
|
2014-11-08 15:51:45 +11:00 |
|
Marc Zinnschlag
|
4dd645559d
|
added ModeButton specialisation of PushButton for use in SceneToolMode
|
2014-11-06 13:26:19 +01:00 |
|
cc9cii
|
a3a0682138
|
Remove files no longer used, reverting to OEngine.
|
2014-11-06 11:16:17 +11:00 |
|
cc9cii
|
0e70315f91
|
Experimental, compiles and runs but crashes in some exit scenarios.
|
2014-11-04 20:43:04 +11:00 |
|
cc9cii
|
8b4651f055
|
Move mouse related functions and states out of WorldspaceWidget.
|
2014-11-02 08:22:27 +11:00 |
|
cc9cii
|
b328aa1fb9
|
Multiple document support.
|
2014-11-01 18:57:39 +11:00 |
|
cc9cii
|
03a30c3f1d
|
Experimental, compiles but does not work.
|
2014-10-18 06:16:48 +11:00 |
|
cc9cii
|
094f046087
|
Convert OverlaySystem to a OpenCS style singleton.
|
2014-10-16 07:29:46 +11:00 |
|
cc9cii
|
313aed078e
|
Merge remote-tracking branch 'remotes/upstream/master' into QtOgre
Conflicts:
apps/opencs/CMakeLists.txt
|
2014-10-13 20:45:30 +11:00 |
|
cc9cii
|
e58e5c2bf5
|
Update overlays independently from multiple viewports.
|
2014-10-13 15:57:01 +11:00 |
|
scrawl
|
9323f96211
|
Move terrainstorage to opencs_units_noqt
|
2014-10-12 17:18:27 +02:00 |
|
cc9cii
|
809b8c6d5b
|
Conflicts:
apps/opencs/view/render/pagedworldspacewidget.cpp
|
2014-10-12 05:54:21 +11:00 |
|
Marc Zinnschlag
|
21b16f8425
|
Merge branch 'tables'
Conflicts:
apps/opencs/CMakeLists.txt
apps/opencs/model/world/data.cpp
apps/opencs/model/world/data.hpp
|
2014-10-10 16:11:54 +02:00 |
|