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
b920e1bde7
Support MSVC 2015. Tested(*) with updated dependencies:
...
- Microsoft Visual Studio Community 2015 Version 14.0.23107.0 D14REL
- Qt 5.5, commit 1d3966833b5f27fb262f2d3727557ef2c8947828
- SDL2 default branch, Changeset: 9834 (d3fa6d0d3793)
- Ogre default branch, Changeset: 8048 (19479be2c7c5)
- Boost 1.59, commit 9a02cf8eb34eb31f0858c223ce95319f103addfa
- OpenAL commit 8fa4f276f89985be44007ce166109837cbfd5763
(*) only tested compilation and startup of the each app
2015-08-12 06:50:22 +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
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
12511778d1
Remove duplicate parameter.
2014-11-12 22:43:22 +11:00
cc9cii
8c6890c682
Move element filtering back out of castRay().
2014-11-12 22:28:41 +11:00
cc9cii
d65adc4376
Reduce code duplication.
2014-11-12 22:04:48 +11:00
cc9cii
3eb556ff8a
Enhanced snap functionality for pathgrid points.
2014-11-11 19:40:04 +11:00
cc9cii
407edc770c
Added a simplistic snap to closest object or terrain.
2014-11-11 07:47:35 +11:00
cc9cii
1504119da7
Increase the sensitivity of the wheel movement.
2014-11-11 06:07:52 +11:00
cc9cii
48ecea7103
Simplistic drop-to-ground functionality for pathgrid points.
2014-11-10 22:38:29 +11:00
cc9cii
d7804974e8
Better mouse cursor tracking for the third axis.
2014-11-10 20:37:07 +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
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
7d133d508d
Remove unused code. Move the cleanup of global resources used by the PhysicsEngine to PhysicsManager.
2014-11-05 07:10:14 +11:00
cc9cii
0e70315f91
Experimental, compiles and runs but crashes in some exit scenarios.
2014-11-04 20:43:04 +11:00
cc9cii
bd6e54dde3
Add function to cancel drag by pressing ESC. Remove debug code.
2014-11-03 21:24:47 +11:00
cc9cii
092080c69c
Group the commands with begin/end macros.
2014-11-03 13:57:57 +11:00
cc9cii
bf5ba41223
Fix deleting physics object when scene nodes were still referencing it. Remove unused code from MouseState. Items that do not change are fetched only once.
2014-11-03 12:46:31 +11:00
cc9cii
e3a000917c
Minor tidy up.
2014-11-03 10:04:24 +11:00
cc9cii
d9755f82c3
Position saving - work in progress.
2014-11-03 08:11:15 +11:00
cc9cii
49d416353e
Remove a redundant list.
2014-11-02 17:56:28 +11:00
cc9cii
7f54dab6ef
Fix issue where objects were sometimes unresponsive after dragging.
2014-11-02 15:34:45 +11:00
cc9cii
e174428cc5
Minor tweaks.
2014-11-02 15:03:26 +11:00
cc9cii
1eed180a5c
Fix Gcc/MSVC differences with friend class. Invert camera derived direction.
2014-11-02 11:41:11 +11:00
cc9cii
a21958d007
Add option to move the mouse against the screen frame of reference.
2014-11-02 10:30:44 +11:00
cc9cii
89bb616cbc
Remove debugging code.
2014-11-02 08:33:32 +11:00
cc9cii
8b4651f055
Move mouse related functions and states out of WorldspaceWidget.
2014-11-02 08:22:27 +11:00
