mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 13:19:54 +00:00
Code Issues Releases Wiki Activity
13704 commits 38 branches 54 tags 122 MiB
Commit graph

241 commits

Author SHA1 Message Date
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
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
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
8b0dc88db8 Use the correct name for deleting objects. 2014-10-26 08:15:18 +11:00
cc9cii
b46df4034d Cleanup bullet objects in the destructors. 2014-10-26 07:56:51 +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
dd9208afeb Merge remote-tracking branch 'upstream/master' into mouse-picking 2014-10-25 10:59:17 +01: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
98ff3e7307 No physics or mouse picking for object preview. 2014-10-24 07:57:29 +11:00
cc9cii
39cd89a9af Make gcc happy. 2014-10-23 18:51:31 +11:00
cc9cii
cca6d0a024 Fixed issue with mouse picking accuracy. 2014-10-23 12:43:06 +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
Marc Zinnschlag
94ae222f0e Merge branch 'settings' 2014-10-19 13:44:15 +02: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
Marc Zinnschlag
8a05c0e5c0 fixed overlay singleton 2014-10-17 14:23:27 +02:00
Marc Zinnschlag
4b921c3876 user settings cleanup 2014-10-17 13:49:33 +02:00
cc9cii
094f046087 Convert OverlaySystem to a OpenCS style singleton. 2014-10-16 07:29:46 +11:00
cc9cii
1d0ac3b4df Delete Ogre::OverlaySystem before Ogre::Root 2014-10-15 07:02:19 +11:00
cc9cii
8cebfc411b Minor visual improvements. 2014-10-14 17:34:10 +11:00
cc9cii
994420aa57 Singleton wrapper for Ogre OverlaySystem. 2014-10-14 13:21:43 +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
961867e39f Hide overlay if off screen. 2014-10-13 20:58:07 +11:00
cc9cii
43838ccf01 Remove override (c++11) 2014-10-13 16:42:50 +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
Thoronador
ab364c9440 fix some more uninitialized class member fields 2014-10-11 00:50:32 +02:00
cc9cii
3e5027abbb Incorporate terrain height to labels and camera. 2014-10-10 13:36:16 +11:00
cc9cii
bfd10a03c0 User configuration manager's resource directory. 2014-10-10 13:35:14 +11:00
cc9cii
406135ee96 Merge remote-tracking branch 'upstream/master' into terrain 2014-10-09 23:47:30 +01:00
Marc Zinnschlag
c85735abed Merge remote-tracking branch 'scrawl/terrain' 2014-10-09 12:56:42 +02: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
scrawl
8786fb639f Implement terrain rendering in OpenCS (Fixes #1597) 2014-10-08 17:17:31 +02:00
cc9cii
5d8022bdc5 Update overlay upon control elements button signal. 2014-10-08 21:22:12 +11:00
cc9cii
e2560de05a Don't use windows path separator. 2014-10-08 08:08:03 +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
0197f7088f Remove extra frame rendering after enabling/disabling the label. 2014-10-07 06:04:13 +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
6d687993b8 Remove C++11 stuff. 2014-10-06 14:08:35 +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
c9e054cdd7 Merge remote-tracking branch 'remotes/upstream/master' into QtOgre 
This reverts commit 0b133d5c2e0d258274ef5f272d7c1a185225673a, reversing
changes made to 3aea1bf5f9.
 2014-10-04 06:20:10 +10:00
Marc Zinnschlag
9fd82212b3 Merge remote-tracking branch 'cc9cii/opencs-settings' 2014-10-03 13:11:05 +02: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
cc9cii
7675df60ba Fix far clip distance (again), workaround for broken settings minimum value. 2014-09-29 08:17:51 +10:00
cc9cii
f0c739b763 Apply camera setting changes immediately. Remove current value check for shader setting changes. 2014-09-29 06:27:54 +10:00
cc9cii
6e8977348a Check the FSAA setting of windows rather than system value. 2014-09-28 19:43:26 +10:00
cc9cii
303b0ee8c6 Update scenewidget when antialiasing settings change. 2014-09-28 15:43:33 +10:00
cc9cii
8a0ff17c22 Update SceneWidget when relevant user settings change. 2014-09-28 14:08:14 +10:00
cc9cii
a25cffc242 Fixed default value not being set for spinbox. Changed the default value of max subviews to 256. Simplified the call signature to get settings & set an initial value. Fixed missing settings for num_lights. 2014-09-28 10:17:54 +10:00
scrawl
7252cb63a6 Fix cppcheck issues 2014-09-26 17:48:14 +02:00
cc9cii
61bab6b1f1 Sanitised version. Some settings are only accessible via manually editing the config file. 2014-09-25 08:15:07 +10:00
cc9cii
67503c93b2 Added some scenewidget user settings but noticed during testing that the spinbox view resets the value if enter key is pressed. 2014-09-23 22:33:49 +10:00
Marc Zinnschlag
1254198d90 add debug profiles to scene subviews view drag and drop 2014-09-13 18:54:29 +02:00
Marc Zinnschlag
717c1b15f5 fixed drop implementation for unpaged worldspace (wasn't updating cell object) 2014-09-11 13:08:30 +02: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
f913d51e35 remove deleted debug profiles from run tool 2014-09-07 12:55:52 +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
gus
465914c77c more clean up 2014-08-12 17:20:02 +02:00
gus
321d385a5d clean up 2014-08-12 17:18:08 +02:00
gus
d4d8f07bf3 clean up 2014-08-12 13:32:56 +02:00
gus
e9cc1df69e use QPainter 2014-08-12 13:31:32 +02:00
Marc Zinnschlag
1e6d557089 Merge branch 'visibility' 2014-07-31 14:34:25 +02:00