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
|
9603325b99
|
Merge remote-tracking branch 'origin/master'
|
2015-01-15 17:33:20 +01:00 |
|
Marc Zinnschlag
|
706df3f881
|
silenced a coverity warning
|
2015-01-15 12:13:53 +01:00 |
|
scrawl
|
f11ec653d0
|
Add setting for showing MRK nodes to NIF loaders
This makes marker objects show up in OpenCS.
|
2015-01-13 17:29:25 +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
|
e6307a5151
|
move cursor in scripteditor to position of error
|
2014-12-08 12:29:23 +01:00 |
|
cc9cii
|
6731afc79c
|
Use float for setting skill use values. Should resolve bug #2183.
|
2014-12-05 03:59:16 +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
|
e04ead2bd5
|
new element visibility button icons
|
2014-11-28 09:14:02 +01:00 |
|
cc9cii
|
936094ae95
|
Set range of spinbox types in dialogsubview.
|
2014-11-26 08:08:28 +11: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 |
|
cc9cii
|
0a66877cf1
|
Remove no longer needed code.
|
2014-11-13 07:47:32 +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 |
|
Marc Zinnschlag
|
2acf446f18
|
added edit mode button to scene toolbar
|
2014-11-11 15:58:22 +01: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
|
48ecea7103
|
Simplistic drop-to-ground functionality for pathgrid points.
|
2014-11-10 22:38:29 +11:00 |
|
cc9cii
|
89eb30054b
|
Fix deleting physic objects.
|
2014-11-09 18:37:04 +11:00 |
|
cc9cii
|
895739d6bb
|
Visibility mask working correctly.
|
2014-11-09 17:53:54 +11:00 |
|
cc9cii
|
2c09b9ba21
|
Fix scene node being erased in the object reference map.
|
2014-11-09 12:34:26 +11:00 |
|
cc9cii
|
a3a0682138
|
Remove files no longer used, reverting to OEngine.
|
2014-11-06 11:16:17 +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 |
|
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 |
|
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
|
358cac2f0a
|
Fix deleting object physics again.
|
2014-11-03 10:03:54 +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
|
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
|
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
|
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 |
|
Alexander "Ace" Olofsson
|
c1ce570e37
|
Use the enum value from Qt::KeyboardModifiers
This fixes the windows build at least
|
2014-10-29 04:55:06 +01:00 |
|