Marc Zinnschlag
|
f771b95a15
|
Merge remote-tracking branch 'cc9cii/master'
|
2014-12-04 20:04:19 +01:00 |
|
Marc Zinnschlag
|
406cf2b981
|
disable element visibility buttons that do not apply to the respective cell type
|
2014-12-02 11:17:39 +01:00 |
|
cc9cii
|
3b5cd286f6
|
Do not destroy overlay if it was never created (e.g. due to an Ogre exception).
|
2014-12-01 14:09:22 +11:00 |
|
cc9cii
|
44b11163d1
|
Do not delete physics objects if it was never created (e.g. preview window)
|
2014-12-01 10:07:02 +11:00 |
|
cc9cii
|
2d229c70cb
|
Another missed null shared_ptr conversion for gcc.
|
2014-12-01 09:41:03 +11:00 |
|
cc9cii
|
9fb4b1f499
|
Initialise null shared_ptr
|
2014-12-01 08:15:17 +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 |
|
Marc Zinnschlag
|
e177b66c1d
|
moved fog button from unpaged worldspace to worldspace
|
2014-11-28 09:16:39 +01:00 |
|
Marc Zinnschlag
|
e04ead2bd5
|
new element visibility button icons
|
2014-11-28 09:14:02 +01:00 |
|
Marc Zinnschlag
|
50a489321f
|
updated run button
|
2014-11-27 09:27:29 +01:00 |
|
Marc Zinnschlag
|
5eb9fd81e1
|
use placeholder icons in OpenCS when no proper icon is available
|
2014-11-13 12:09:10 +01: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
|
b7f8f848a8
|
added edit modes for exteriors
|
2014-11-13 10:45:59 +01:00 |
|
cc9cii
|
b86148411b
|
Fix for issue #2051. Not perfect (can get into a lock in some situations) but usable.
|
2014-11-12 14:02:08 +11:00 |
|
Marc Zinnschlag
|
2acf446f18
|
added edit mode button to scene toolbar
|
2014-11-11 15:58:22 +01:00 |
|
Marc Zinnschlag
|
b50fcd403b
|
renamed getElementMask to getVisibilityMask
|
2014-11-09 11:29:45 +01:00 |
|
cc9cii
|
bf669a51c1
|
Merge branch 'master' into mouse-picking-physics
|
2014-11-06 09:46:48 +11:00 |
|
scrawl
|
6b88f5f33e
|
Use Ogre::uint8, fixes a missing include for uint8_t
|
2014-11-05 20:58:49 +01:00 |
|
scrawl
|
61d4a6b344
|
Merge branch 'openmw-033'
|
2014-11-05 20:58:42 +01:00 |
|
scrawl
|
ba3d2be8e3
|
Add missing include (Fixes #2108)
|
2014-11-05 19:45:32 +01: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
|
85ef683319
|
Fix deleting physics object when scene node is cleared.
|
2014-11-03 08:10:28 +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 |
|
cc9cii
|
c6a2461fbd
|
Delay removing physics until the document is closed. Also other general cleanup.
|
2014-11-01 20:51:04 +11:00 |
|
cc9cii
|
b328aa1fb9
|
Multiple document support.
|
2014-11-01 18:57:39 +11:00 |
|
cc9cii
|
057982b1f8
|
Fix Subview interface clutter by keeping a map of Scenewidgets.
|
2014-11-01 08:29:08 +11:00 |
|
cc9cii
|
e51d532795
|
Show drag movements of objects in multiple scene managers.
|
2014-11-01 07:39:58 +11:00 |
|
cc9cii
|
d6e67b248f
|
Fix deleting objects and scenewidgets.
|
2014-11-01 07:29:16 +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
|
ac7acb2c22
|
Disable more debug code.
|
2014-10-31 22:21:24 +11:00 |
|
cc9cii
|
aa7b693a13
|
Remove debug settings and minor cleanup.
|
2014-10-31 22:04:10 +11:00 |
|
cc9cii
|
fbadaf55ee
|
Multiple SceneManagers per physics engine now working.
|
2014-10-31 21:50:57 +11:00 |
|
cc9cii
|
a2ac4c7650
|
Allow multiple scene managers per physics engine. Compiles but does not work properly.
|
2014-10-31 08:18:15 +11:00 |
|
cc9cii
|
0515159b74
|
Fix typo.
|
2014-10-29 23:38:19 +11:00 |
|
cc9cii
|
1741043f20
|
Revert to storing Scene Node names as the key in RigidBody. Allow moving objects up/down using scroll wheel or touchpad while dragging. Cleanup code a little.
|
2014-10-29 23:02:38 +11:00 |
|
cc9cii
|
792fbd119f
|
Resolve incorrect merge issues.
|
2014-10-29 10:43:55 +11:00 |
|
cc9cii
|
c990ed4335
|
Merge branch 'mouse-picking-state' into mouse-picking
Conflicts:
apps/opencs/view/render/pagedworldspacewidget.cpp
apps/opencs/view/render/pagedworldspacewidget.hpp
|
2014-10-29 09:33:48 +11:00 |
|
cc9cii
|
8e2a0ea90a
|
Implemented moving objects around x-y plane.
|
2014-10-29 08:13:13 +11:00 |
|