cc9cii
|
ab693f1f64
|
Workaround file lock being lost if the same file is closed elsewhere in the program (see https://svn.boost.org/trac/boost/ticket/3582)
|
2014-12-05 07:50:03 +11:00 |
|
cc9cii
|
8d0cca6cfc
|
Merge remote-tracking branch 'remotes/upstream/master' into single-instance
Conflicts:
apps/opencs/editor.cpp
|
2014-12-05 07:38:33 +11:00 |
|
Marc Zinnschlag
|
f771b95a15
|
Merge remote-tracking branch 'cc9cii/master'
|
2014-12-04 20:04:19 +01:00 |
|
cc9cii
|
6731afc79c
|
Use float for setting skill use values. Should resolve bug #2183.
|
2014-12-05 03:59:16 +11:00 |
|
cc9cii
|
07f10a0140
|
Use append syntax compatible with older versions of boost.
|
2014-12-05 01:32:20 +11:00 |
|
cc9cii
|
e67cf96250
|
Allow only one instance of OpenCS. Only tested on windows x64.
|
2014-12-05 01:09:42 +11:00 |
|
Marc Zinnschlag
|
f2d991505e
|
handle other Windows-specific path issues regarding OpenCS resources handling
|
2014-12-03 15:31:00 +01:00 |
|
Marc Zinnschlag
|
58b6e757e3
|
fixed another case folding problem regarding OpenCS resources handling
|
2014-12-03 15:24:37 +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 |
|
Marc Zinnschlag
|
cbcd6a26d5
|
memory leak fix
|
2014-12-01 22:57:32 +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
|
64e1594b41
|
Move the destruction of global resources, being used by multiple documents, to the editor.
|
2014-12-01 14:08:27 +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
|
db17dbe324
|
don't store esm readers for non-base content files
|
2014-11-30 18:04:18 +01:00 |
|
Marc Zinnschlag
|
4a9d2038fa
|
load land for non-base content files immediately
|
2014-11-30 14:33:39 +01: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
|
d37ff8ec63
|
fixed missing tooltip update for toggle/mode-type buttons
|
2014-11-27 08:59:21 +01:00 |
|
cc9cii
|
936094ae95
|
Set range of spinbox types in dialogsubview.
|
2014-11-26 08:08:28 +11:00 |
|
cc9cii
|
6e334064d3
|
Merge branch 'master' into pathgrid-edit
|
2014-11-23 06:43:16 +11:00 |
|
cc9cii
|
31fdf49616
|
Use Qt exit function rather than system one.
|
2014-11-22 06:59:23 +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 |
|
scrawl
|
3028141815
|
Set up ESMReader indices in OpenCS (fixes wrong terrain textures when multiple content files are loaded)
|
2014-11-18 11:47:46 +01: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
|
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 |
|