1442 commits

Author	SHA1	Message	Date
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	6ca88dc541	Merge branch 'master' into mouse-picking ... Conflicts: apps/opencs/model/settings/usersettings.cpp	2014-10-29 09:28:23 +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
Marc Zinnschlag	e604fcf282	Merge branch 'double'	2014-10-27 09:56:52 +01:00
Marc Zinnschlag	6f4b753750	replaced regular function call from SubView to View with signal-slot-connection	2014-10-27 09:51:55 +01:00
Marc Zinnschlag	1aef9304e9	replaced the signal/slot user settings update with a regular function call	2014-10-27 09:44:18 +01:00
Marc Zinnschlag	b0a7b457f7	made double click actions in tables configurable	2014-10-27 09:32:02 +01:00
cc9cii	815e832dbb	Merge branch 'master' into mouse-picking-state	2014-10-27 18:57:42 +11:00
Marc Zinnschlag	275bf854ed	added new user setting: window/hide-subview (hide subview titlebar if there is only one subview in the window)	2014-10-27 08:57:18 +01: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	dd2c067e17	Cleanup for better legibility.	2014-10-27 06:50:51 +11:00
cc9cii	fb0f85c8db	Report terrain position on cursor position.	2014-10-26 21:15:47 +11:00
cc9cii	95683bc8c3	Add user interface for top level window status-bar setting (implementation already existed). For feature #854.	2014-10-26 15:04:52 +10: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
Marc Zinnschlag	aad13e6bff	close view when closing last sub-view unless this view is the last view	2014-10-25 18:13:56 +02:00
Marc Zinnschlag	a9f5632afd	extended double click functionality in tables	2014-10-25 16:27:36 +02: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
Marc Zinnschlag	6ff41c6a00	intercept shift/ctrl double-clicks in tables	2014-10-23 11:28:58 +02:00
cc9cii	2f26fc1188	Avoid Ogre exceptions and null pointers.	2014-10-23 20:14:01 +11:00
cc9cii	39cd89a9af	Make gcc happy.	2014-10-23 18:51:31 +11:00
cc9cii	4d86371ca3	Minor refactoring and cleanup.	2014-10-23 15:35:01 +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	843493e90a	fixed case-problem in OpenCS script compiler	2014-10-21 12:38:18 +02:00
Marc Zinnschlag	94ae222f0e	Merge branch 'settings'	2014-10-19 13:44:15 +02:00
Marc Zinnschlag	a5bbfff9e2	another layout correction	2014-10-19 13:43:40 +02:00
Marc Zinnschlag	5a1ce4943e	added advance 3D rendering user settings section	2014-10-19 13:41:56 +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	49938182e8	silenced a compiler warning regarding null pointer dereferencing	2014-10-17 15:46:07 +02:00
Marc Zinnschlag	a3c894c1e2	Merge branch 'cellmarker'	2014-10-17 14:26:16 +02:00