mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-22 04:53:52 +00:00
Code Issues Releases Wiki Activity
34741 commits 108 branches 66 tags 133 MiB
Commit graph

174 commits

Author SHA1 Message Date
Aesylwinn
8b6cb73369 Add ability to invert selection. 2016-05-16 17:03:00 -04:00
Aesylwinn
9645d0cc8a Pass more mouse pick information in scene view editor. 2016-05-12 18:21:43 -04:00
Aesylwinn
7fbcc47b15 Add pathgrid modified signals. 2016-05-02 22:08:49 -04:00
Aesylwinn
933504dbd0 Revert "Pathgrid rendering v2" 
This reverts commit 4dee9604bb.
 2016-05-02 15:37:08 -04:00
Aesylwinn
4dee9604bb Pathgrid rendering v2 2016-05-02 06:29:56 -04:00
Marc Zinnschlag
091e1bf25d improved scene element visibility buttons 2016-04-23 13:54:19 +02:00
Aesylwinn
7009355baf Remove unused variable 2016-03-18 14:46:53 -04:00
Aesylwinn
2cff2cd643 Remove unnecessary override. 2016-03-14 00:45:08 -04:00
Aesylwinn
ebdc212886 Moved selectNavigationMode to SceneWidget class, centralized camera selection. 2016-03-14 00:44:46 -04:00
Marc Zinnschlag
6a2fe564ef Merge branch 'master' into move 2016-03-11 12:47:33 +01:00
Marc Zinnschlag
1240e0c716 cancel instance move on drag abort 2016-03-04 15:19:26 +01:00
Aesylwinn
9d985d883b added grid icon 2016-03-02 20:45:04 -05:00
Marc Zinnschlag
a19ac72215 render marker 2016-03-01 15:48:34 +01:00
Marc Zinnschlag
dececf6c38 instance moving via drag in 3D scenes 2016-02-16 16:02:29 +01:00
Marc Zinnschlag
1d0ef97bf6 added select all of same ID item to selection mode button menu 2016-01-26 11:31:37 +01:00
Marc Zinnschlag
c1f0aa7260 added delete selection item to selection mode button menu 2016-01-25 14:55:02 +01:00
Marc Zinnschlag
45e6974266 added select all and clear selection features 2016-01-19 14:25:20 +01:00
scrawl
18320b2cd0 Move the Button enum to WorldSpaceWidget 2016-01-15 15:49:10 +01:00
scrawl
41c571d4f4 Merge branch 'master' of https://github.com/OpenMW/openmw into lighting 
Conflicts:
	apps/opencs/view/render/instancemode.cpp
 2016-01-15 15:46:10 +01:00
Marc Zinnschlag
6eba647a9d added accessor function for cell selection in paged worldspace 2016-01-14 13:19:37 +01:00
scrawl
ad2145b463 OpenCS: use a separate enum for the toggle buttons 2016-01-11 23:10:16 +01:00
Marc Zinnschlag
7dd7be7f0e make scenes drop target for referenceables 2016-01-10 08:56:15 +01:00
Marc Zinnschlag
843225996c get modifiers from event instead of from the application 2015-10-27 15:43:52 +01:00
Marc Zinnschlag
e34af4c4b5 handle primary and secondary edit button clicks on cell arrows 2015-10-25 15:16:22 +01:00
Marc Zinnschlag
361634489e properly handle cells that don't exist 2015-10-15 14:46:08 +02:00
Marc Zinnschlag
0d35938794 basic cell arrow rendering (shape is a placeholder) 2015-10-12 14:12:01 +02:00
Marc Zinnschlag
2cb106f6ad added missing flagAsModified calls 2015-09-29 16:06:55 +02:00
Marc Zinnschlag
319e3f24a3 on edit mode change clear selection of elements that are not affected by current edit mode (only support for instance for now since we do not have selection for other elements yet) 2015-09-29 13:48:04 +02:00
scrawl
12b8fcf0bf OpenCS: Fix camera position retrieval in WorldspaceWidget 2015-09-23 23:37:09 +02:00
scrawl
67bd6cd708 Remove empty line at the beginning of files 
git ls-files -z | xargs -0 sed -i '1{/^$/d}'
 2015-08-18 23:06:12 +02:00
scrawl
e3bfbcb44b OpenCS: connect navigation button to OSG camera manipulators 2015-03-26 00:55:58 +01:00
scrawl
72400747f2 OpenCS: preliminary port of cell rendering to OSG 2015-03-25 23:35:10 +01:00
scrawl
aedafe651a OpenCS: delete physicssystem, will be replaced with OSG picking 2015-03-25 19:08:09 +01:00
scrawl
34d503017a OpenCS: Set up an osgQt GraphicsWindow in SceneWidget 2015-03-20 16:22:33 +01:00
scrawl
49c2da27b3 OpenCS compiles and runs again (no rendering) 2015-03-19 17:21:15 +01:00
Marc Zinnschlag
f771b95a15 Merge remote-tracking branch 'cc9cii/master' 2014-12-04 20:04:19 +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
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
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
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
Marc Zinnschlag
b50fcd403b renamed getElementMask to getVisibilityMask 2014-11-09 11:29:45 +01:00
cc9cii
b328aa1fb9 Multiple document support. 2014-11-01 18:57:39 +11:00
cc9cii
ac7acb2c22 Disable more debug code. 2014-10-31 22:21:24 +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
cc9cii
792fbd119f Resolve incorrect merge issues. 2014-10-29 10:43:55 +11:00
cc9cii
c990ed4335 Merge branch 'mouse-picking-state' into mouse-picking 
Conflicts:
	apps/opencs/view/render/pagedworldspacewidget.cpp
	apps/opencs/view/render/pagedworldspacewidget.hpp
 2014-10-29 09:33:48 +11:00
cc9cii
8e2a0ea90a Implemented moving objects around x-y plane. 2014-10-29 08:13:13 +11:00
cc9cii
68b7532383 Move code to WorldspaceWidget so that UnpagedWorldspaceWidget can be supported. 2014-10-29 00:50:48 +11:00
cc9cii
5afaa0083f Minimise false detection of grab & drag operation. 2014-10-28 06:42:33 +11:00
cc9cii
a01a921644 Experimental mouse event state machine for 3d editing, starting with drag & drop objects. 2014-10-28 06:01:19 +11:00
cc9cii
6c8320a638 More cleanup. 2014-10-27 12:09:20 +11:00
cc9cii
c2c33eac0f Minor cleanup. 2014-10-27 08:26:01 +11:00
cc9cii
0b63ba5727 Move debug rendering code out of PhysicsSystem. 2014-10-27 08:08:33 +11:00
cc9cii
fb0f85c8db Report terrain position on cursor position. 2014-10-26 21:15:47 +11:00
cc9cii
9337d6533a Add terrain collision. Support visibility mask for objects and terrain. 2014-10-25 22:09:19 +11:00
cc9cii
cc0acec64c Add settings to enable/disable debug rendering of mouse picking. 2014-10-25 21:02:40 +11:00
cc9cii
54a6897df8 Use QString rather than std::to_string 2014-10-24 20:43:29 +10:00
cc9cii
e5dd8d06a0 Store object reference id to RigidBody instead of scene node handles. 2014-10-24 21:18:29 +11:00
cc9cii
cb53e714f7 Convert PhysicsSystem to a singleton. 2014-10-24 19:14:02 +10:00
cc9cii
39cd89a9af Make gcc happy. 2014-10-23 18:51:31 +11:00
cc9cii
fdee3fd919 Added debug lines to show ray hit position. Added highlighting the Entity hit by the ray. Incorporated user setting far clip distance. 2014-10-23 06:59:14 +11:00
cc9cii
4b53b8658b Debug rendering toggled by double clicking the right mouse button. Raycasting works, but inaccurate. 2014-10-22 07:11:04 +11:00
cc9cii
8bcd415cca Fix duplicate calls to OEngine. Use correct position, rotation and scale. Debug draw not working. 2014-10-19 07:25:54 +11:00
cc9cii
03a30c3f1d Experimental, compiles but does not work. 2014-10-18 06:16:48 +11:00
Marc Zinnschlag
994159fafd fixed broken iterator 2014-10-17 14:23:37 +02:00
cc9cii
8cebfc411b Minor visual improvements. 2014-10-14 17:34:10 +11:00
cc9cii
57b337d368 Fix corruption issue when the initial scenewidget is closed before subsequent ones. Also place the label closer to the terrain height at the center of the cell, should reduce the perception of the label jumping around too much. 2014-10-14 11:43:56 +11:00
cc9cii
e58e5c2bf5 Update overlays independently from multiple viewports. 2014-10-13 15:57:01 +11:00
cc9cii
47c5bc9a19 Set bounding box on manual objects rather than creating meshes. 2014-10-13 07:42:43 +11:00
cc9cii
758ce0ed98 Various fixes as per feedback comments. 2014-10-12 21:15:50 +11:00
cc9cii
809b8c6d5b Conflicts: 
apps/opencs/view/render/pagedworldspacewidget.cpp
 2014-10-12 05:54:21 +11:00
cc9cii
3e5027abbb Incorporate terrain height to labels and camera. 2014-10-10 13:36:16 +11:00
cc9cii
406135ee96 Merge remote-tracking branch 'upstream/master' into terrain 2014-10-09 23:47:30 +01:00
cc9cii
13f028e27b Avoid out of range exceptions. 2014-10-09 07:01:18 +11:00
cc9cii
b3ef7a71e2 Different implementation of update overlay fix. 2014-10-09 05:56:44 +11:00
cc9cii
5d8022bdc5 Update overlay upon control elements button signal. 2014-10-08 21:22:12 +11:00
cc9cii
e1197e75bc Handle change of names or regions to dynamically update the overlay. 2014-10-08 07:54:22 +11:00
cc9cii
7836ee9ab6 Fixed crash exiting internal cells. Better starting camera position for external cells. 2014-10-07 21:18:32 +11:00
cc9cii
0cccdfd114 Added description below the cell id (name if exists, or region) 2014-10-07 19:35:28 +11:00
cc9cii
7640875f9d More cleanup. 2014-10-07 10:34:30 +11:00
cc9cii
f48f841d31 Add full path for Ogre Overlay headers (workaround for osx). 2014-10-07 06:40:28 +11:00
cc9cii
b3e09cce00 Remove mouse picking code. 2014-10-06 22:29:45 +11:00
cc9cii
972c789060 Add Ogre Overlay path to cmake. 2014-10-06 20:25:09 +11:00
cc9cii
cc6153eb8e Removed temporary key bindings. 2014-10-06 14:21:44 +11:00
cc9cii
e38417e662 Visibility mask implemented. For testing rigged up 'M' and 'N' keys for show/hide. 
The scenewidget doesn't receive any mouse events for about a second after toggling the visibility flag.  No idea what is causing this.
 2014-10-06 13:55:36 +11:00
cc9cii
dbb2781817 Mouse click on text overlay implemented. Removed 'm' keybinding for overlay toggle. White lines not visible by default. 2014-10-06 08:20:09 +11:00
cc9cii
85d93807c5 Working version. White lines still present. Marker toggle hard-coded to 'm' key. Mouse events not implemented. 2014-10-05 19:25:37 +11:00
cc9cii
5ffb740120 Fix silly mistake (thanks scrawl for picking that up) 2014-10-01 07:19:15 +10:00
cc9cii
a9745cce1e Suppress some compiler warnings. 2014-09-30 21:02:31 +10:00
cc9cii
dee090355f Changes to compile on Ubuntu 14.04. 2014-09-30 19:23:19 +10:00
cc9cii
687b62dfd3 Revert some changes (mostly iostream adds) 2014-09-30 18:46:26 +10:00
cc9cii
312b7cd571 Merge branch 'master' into QtOGre 
Conflicts:
	apps/opencs/model/doc/document.cpp
	apps/opencs/view/render/pagedworldspacewidget.cpp
	apps/opencs/view/render/pagedworldspacewidget.hpp
	components/nif/niffile.hpp
	libs/openengine/bullet/physic.hpp
 2014-09-30 10:52:04 +10:00
Marc Zinnschlag
0db288ce07 generalising and cleaning up drop implementation of worldspace widget 2014-09-11 13:04:20 +02:00
Marc Zinnschlag
5a9376450b some cleanup of the scene view drop code 2014-09-11 11:27:56 +02:00
Marc Zinnschlag
51128d2d57 added run button to scene subview toolbar 2014-09-06 16:11:06 +02:00
gus
1ac220593d clean up 2014-08-12 21:32:07 +02:00
gus
11922dc53a code is shorter, thanks scrawl 2014-08-12 17:41:13 +02:00