cc9cii
9716b671f1
Merge branch 'cc9cii' into Feature-1278
...
Conflicts:
apps/opencs/CMakeLists.txt
apps/opencs/model/world/nestedcoladapterimp.cpp
apps/opencs/view/render/cell.cpp
apps/opencs/view/render/worldspacewidget.cpp
2015-11-07 12:04:09 +11:00
cc9cii
f7598a67f4
Merge branch 'pathgrid-edit' into Feature-1278
...
Conflicts:
apps/opencs/view/render/cell.cpp
apps/opencs/view/render/mousestate.cpp
2015-11-07 11:56:34 +11:00
Marc Zinnschlag
ce34daa64b
removed indirection in OpenMW-CS land record
...
(cherry picked from commit 85f6bb892b
2015-11-01 18:56:07 +11:00
scrawl
f8f66bffb0
Remove empty line at the beginning of files
...
git ls-files -z | xargs -0 sed -i '1{/^$/d}'
2015-09-08 06:40:06 +10:00
cc9cii
a02448f0ba
Merge branch 'master' into pathgrid-edit
...
Conflicts:
apps/opencs/view/render/cell.cpp
apps/opencs/view/render/mousestate.cpp
2015-05-31 11:12:39 +10:00
cc9cii
193873b829
Feature #1278 : Editor: Mouse picking in worldspace widget
...
- With the move to OSG (see: https://forum.openmw.org/viewtopic.php?f=7&t=2755&p=31850#p31839 ) all the work done so far will soon be removed from the master branch.
- The pathgrid editing and integration to the model, as well as other improvements made, are unlikely to be accepted to the master.
- These will be maintained here until they can be ported to OSG. It is easier to port when there is a working code base, anyway.
2015-05-31 10:28:45 +10:00
Rohit Nirmal
396fba7fa9
Silence -Wreorder warnings, and remove -Wno-reorder.
2015-05-21 22:46:44 -05:00
cc9cii
3102a17522
Changes made to DialogueSubview pathgrid tables are now reflected on PagedWorldspaceWidget.
2015-04-24 04:00:49 +10:00
cc9cii
e7bd298739
Undo now working via signals.
2015-04-24 01:28:49 +10:00
cc9cii
1a31aecc2f
Undo rendering works, but not using signals yet.
2015-04-23 22:20:45 +10:00
cc9cii
27a73a25e3
Saving to document via UndoStack implemented.
2015-04-23 08:50:05 +10:00
cc9cii
68dbf929a2
Add updated pathgrid marker nif file and fix merge issues.
2015-04-18 16:14:25 +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
Marc Zinnschlag
a9a8b5ad47
improved performance of CSVRender::Cell::addObjects by bypassing Qt model
2015-03-31 14:25:27 +02:00
scrawl
f6509fe53e
Another crash fix for land record without data
2015-03-02 22:23:00 +01: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
scrawl
f931ba2efc
Fix some static analysis issues (coverity)
2014-12-24 15:45:12 +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
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
cc9cii
0a66877cf1
Remove no longer needed code.
2014-11-13 07:47:32 +11:00
cc9cii
0e0ad97a91
Pathgrid edge resource management for editing multiple cells or multiple documents.
2014-11-13 06:36:47 +11:00
cc9cii
e430dcfd8a
Check the resource group's existence before destroying it.
2014-11-13 05:59:04 +11:00
cc9cii
2412d127b0
Fix saving pathgrid positions when adding or moving.
2014-11-10 22:29:01 +11:00
cc9cii
1f73fae6ef
Allow adding or dragging pathgrid points over objects as well as terrain.
2014-11-09 20:03:29 +11:00
cc9cii
f5ba74cd10
Suppress warnings.
2014-11-09 18:10:44 +11:00
cc9cii
895739d6bb
Visibility mask working correctly.
2014-11-09 17:53:54 +11:00
cc9cii
a5a76cadca
Adding, deleting and moving pathgrid points work. However still not saving to the document.
2014-11-09 14:36:58 +11: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
cc9cii
b328aa1fb9
Multiple document support.
2014-11-01 18:57:39 +11:00
cc9cii
ade7f09203
Keep track of terrain in physics engine. Should resolve crash exiting after opening multiple subviews of the same cell.
2014-11-01 00:03:09 +11:00
cc9cii
b46df4034d
Cleanup bullet objects in the destructors.
2014-10-26 07:56:51 +11:00
cc9cii
9337d6533a
Add terrain collision. Support visibility mask for objects and terrain.
2014-10-25 22:09:19 +11:00
cc9cii
cb53e714f7
Convert PhysicsSystem to a singleton.
2014-10-24 19:14:02 +10:00
cc9cii
8bcd415cca
Fix duplicate calls to OEngine. Use correct position, rotation and scale. Debug draw not working.
2014-10-19 07:25:54 +11:00
cc9cii
03a30c3f1d
Experimental, compiles but does not work.
2014-10-18 06:16:48 +11:00
cc9cii
3e5027abbb
Incorporate terrain height to labels and camera.
2014-10-10 13:36:16 +11:00
scrawl
8786fb639f
Implement terrain rendering in OpenCS ( Fixes #1597 )
2014-10-08 17:17:31 +02:00
Marc Zinnschlag
74ed9cbb2d
added cell rendering class
2014-06-29 14:18:46 +02:00
