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 |
|
Marc Zinnschlag
|
9e67a07ad4
|
allow externally supplied ModeButtons in SceneToolMode
|
2014-11-07 11:11:43 +01: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
|
bf669a51c1
|
Merge branch 'master' into mouse-picking-physics
|
2014-11-06 09:46:48 +11:00 |
|
cc9cii
|
f051fb65ff
|
Fix memory leak when multiple documents in 3D edit. Support multiple physics engine per document.
|
2014-11-06 08:35:24 +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
|
03abd69b4f
|
Include string header for gcc.
|
2014-11-05 07:20:20 +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
|
37a050873c
|
Fix crash when multiple scenewidgets were closed. BtOgre was destroying resources each time.
|
2014-11-04 21:46:35 +11:00 |
|
cc9cii
|
70b5d6857a
|
Add missing files.
|
2014-11-04 20:52:28 +11:00 |
|
cc9cii
|
0e70315f91
|
Experimental, compiles and runs but crashes in some exit scenarios.
|
2014-11-04 20:43:04 +11:00 |
|
Marc Zinnschlag
|
bf40a3bb5d
|
enhanced SceneToolBar tool handling (remove and insert at specific point)
|
2014-11-03 13:18:53 +01: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
|
4556eb74fe
|
Fix saving position and rotation.
|
2014-11-03 10:07:21 +11:00 |
|
cc9cii
|
e3a000917c
|
Minor tidy up.
|
2014-11-03 10:04:24 +11:00 |
|
cc9cii
|
358cac2f0a
|
Fix deleting object physics again.
|
2014-11-03 10:03:54 +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
|
3796240b19
|
Refactor duplicate code sections.
|
2014-11-02 18:13:25 +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
|
998982b16a
|
Keep physics engines until physics code is moved out of OEngine.
|
2014-11-01 21:04:53 +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
|
1ee64c7087
|
Add missing files for multi-document support.
|
2014-11-01 19:12:22 +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
|
4f685092fb
|
Merge remote-tracking branch 'remotes/upstream/master' into mouse-picking
|
2014-10-31 22:05: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 |
|