cc9cii
|
15b9a628ac
|
Fix the name of DragRecordTable::startDrag method. Make the compiler be quiet about BulletShapeLoader's hidden overloaded methods.
|
2015-03-14 19:41:55 +11:00 |
|
cc9cii
|
17e6244bd6
|
Yet more warnings suppressed.
|
2015-03-14 12:42:46 +11:00 |
|
Marc Zinnschlag
|
26955dc6d3
|
Merge remote-tracking branch 'cc9cii/editor-var-edit'
|
2015-03-12 10:44:55 +01:00 |
|
cc9cii
|
418025e0a2
|
Add missing editor type to the dialogue. Should resolve Bug #2437.
|
2015-03-12 13:10:25 +11:00 |
|
Scott Howard
|
e2ef8c4022
|
fix -Wnewline-eof warnings
|
2015-03-11 10:54:45 -04:00 |
|
cc9cii
|
727b68dd15
|
Reduce difference with the master branch where possible.
|
2015-03-06 19:20:50 +11:00 |
|
cc9cii
|
6d6ff8c6a4
|
Resolved compile issues, but not fully working.
|
2015-03-06 14:36:13 +11:00 |
|
cc9cii
|
fb2ba7610c
|
Merge remote-tracking branch 'remotes/upstream/master' into NonTableFields
Conflicts:
apps/opencs/CMakeLists.txt
apps/opencs/model/doc/document.cpp
apps/opencs/model/world/columnbase.hpp
apps/opencs/model/world/columns.cpp
apps/opencs/model/world/columns.hpp
apps/opencs/model/world/commands.cpp
apps/opencs/model/world/idtable.cpp
apps/opencs/view/world/dialoguesubview.cpp
apps/opencs/view/world/dialoguesubview.hpp
apps/opencs/view/world/util.cpp
|
2015-03-04 11:22:42 +11:00 |
|
Marc Zinnschlag
|
a148b851c0
|
added start script table
|
2015-03-03 14:32:12 +01:00 |
|
scrawl
|
f6509fe53e
|
Another crash fix for land record without data
|
2015-03-02 22:23:00 +01:00 |
|
cc9cii
|
1ee6153940
|
Remove unnecessary boolean passing between objects.
|
2015-03-02 06:51:31 +11:00 |
|
cc9cii
|
6d5899361e
|
Merge branch 'master' into pathgrid-edit
|
2015-03-01 16:05:35 +11:00 |
|
cc9cii
|
c4625b94e5
|
Fix OpenCS crashing since commit 9d6145 by showing gamefiles if the content selector was created from OpenCS.
|
2015-03-01 12:52:43 +11:00 |
|
Bret Curtis
|
5672c86924
|
Rename window title for OpenMW-CS
|
2015-02-24 23:37:53 +01:00 |
|
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 |
|
cc9cii
|
e5c1c31648
|
Ignore case when detecting legacy extensions (.esm or .exp). Should resolve bug #2227.
|
2015-02-16 14:27:25 +11:00 |
|
Alexander "Ace" Olofsson
|
62acb03735
|
More Ogre + recent Boost build fixes
|
2015-01-27 21:07:26 +01:00 |
|
Marc Zinnschlag
|
fa4718283d
|
Merge remote-tracking branch 'scrawl/contentselector'
|
2015-01-21 15:23:38 +01:00 |
|
Marc Zinnschlag
|
9603325b99
|
Merge remote-tracking branch 'origin/master'
|
2015-01-15 17:33:20 +01:00 |
|
Marc Zinnschlag
|
640d473866
|
Merge remote-tracking branch 'scrawl/master'
|
2015-01-15 17:33:08 +01:00 |
|
scrawl
|
6146a3843c
|
Merge remote-tracking branch 'upstream/coverity_scan' into HEAD
|
2015-01-15 15:59:57 +01:00 |
|
Marc Zinnschlag
|
c55e9b9c58
|
one more potential 0-pointer fix
|
2015-01-15 15:00:16 +01:00 |
|
Marc Zinnschlag
|
706df3f881
|
silenced a coverity warning
|
2015-01-15 12:13:53 +01:00 |
|
Marc Zinnschlag
|
7b8e6f9dda
|
addressed potential 0-pointer issue
|
2015-01-15 12:04:23 +01:00 |
|
scrawl
|
b39cc0c8c8
|
Fix OpenCS window opening issue when config file doesn't exist
It would attempt to create a zero-sized window (or even negative-sized, after subtracting the frame dimensions).
|
2015-01-15 02:49:54 +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 |
|
Marc Zinnschlag
|
9f6a2d00e8
|
Merge remote-tracking branch 'thoronador/fix-uninitialized-members'
|
2015-01-02 18:17:25 +01:00 |
|
Marc Zinnschlag
|
bdc28c0523
|
Merge remote-tracking branch 'maqifrnswa/feature1325'
|
2015-01-02 18:14:42 +01:00 |
|
Scott Howard
|
f24c1845b6
|
remove pop-up message on load failure
|
2015-01-02 10:42:09 -05:00 |
|
Scott Howard
|
dece4e2640
|
remove unneeded includes
|
2015-01-01 22:54:32 -05:00 |
|
Scott Howard
|
ce7cef924e
|
when loading a file fails, pop-up critical window and highlight error text
|
2015-01-01 22:27:08 -05:00 |
|
Thoronador
|
91ff536460
|
fix uninit, #2
|
2015-01-02 00:26:45 +01:00 |
|
scrawl
|
f931ba2efc
|
Fix some static analysis issues (coverity)
|
2014-12-24 15:45:12 +01:00 |
|
cc9cii
|
4c3c674223
|
Resolve merge issues.
|
2014-12-09 19:37:37 +11: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 |
|
Marc Zinnschlag
|
6a67aba336
|
added double click with modifier actions in report table
|
2014-12-06 15:08:51 +01:00 |
|
Marc Zinnschlag
|
58f4cc882f
|
added remove action to report table context menu
|
2014-12-06 14:30:40 +01:00 |
|
Marc Zinnschlag
|
f2fc693325
|
added context menu to report table
|
2014-12-06 14:17:56 +01:00 |
|
Marc Zinnschlag
|
350b0cb93c
|
added hidden hint column to report model
|
2014-12-06 13:45:47 +01:00 |
|
Marc Zinnschlag
|
6c18a3b0b5
|
allow drags from report table
|
2014-12-06 13:19:43 +01:00 |
|
Marc Zinnschlag
|
7c59ea6296
|
added specialised report table
|
2014-12-06 13:01:55 +01: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 |
|
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
|
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
|
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
|
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 |
|