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 |
|