1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-25 09:09:53 +00:00
Commit graph

941 commits

Author SHA1 Message Date
cc9cii
6e334064d3 Merge branch 'master' into pathgrid-edit 2014-11-23 06:43:16 +11:00
cc9cii
911839bb91 Simplify detecting whether a universal id represents a referenceable type. 2014-11-21 06:48:42 +11:00
cc9cii
ede1b97b46 Check the type of universal id before getting its id. Should resolve bug #2137 2014-11-19 18:10:29 +10: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
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
0a66877cf1 Remove no longer needed code. 2014-11-13 07:47:32 +11:00
cc9cii
ba1a42ec05 Don't delete physics object if it was never created. 2014-11-13 07:41:31 +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
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
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
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
2412d127b0 Fix saving pathgrid positions when adding or moving. 2014-11-10 22:29:01 +11:00
cc9cii
d7804974e8 Better mouse cursor tracking for the third axis. 2014-11-10 20:37:07 +11:00
Marc Zinnschlag
b50fcd403b renamed getElementMask to getVisibilityMask 2014-11-09 11:29:45 +01:00
cc9cii
1f73fae6ef Allow adding or dragging pathgrid points over objects as well as terrain. 2014-11-09 20:03:29 +11:00
cc9cii
89eb30054b Fix deleting physic objects. 2014-11-09 18:37:04 +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
2c09b9ba21 Fix scene node being erased in the object reference map. 2014-11-09 12:34:26 +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
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
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