1422 commits

Author	SHA1	Message	Date
cc9cii	815e832dbb	Merge branch 'master' into mouse-picking-state	2014-10-27 18:57:42 +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	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
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	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
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	ba46bcad40	Revert "Don't allow viewing non-existent cells from the regionmap." ... This reverts commit 7cdab41501.	2014-10-17 13:52:21 +02:00
Marc Zinnschlag	4b921c3876	user settings cleanup	2014-10-17 13:49:33 +02:00
Marc Zinnschlag	ed44f3ec7d	added tooltip support to user settings UI	2014-10-16 16:22:36 +02:00
Marc Zinnschlag	f4894deff1	removed special value text from spin boxes (broken feature, not used anyway)	2014-10-16 14:47:55 +02:00
Marc Zinnschlag	dddd20ba1e	added default values for display format settings	2014-10-16 14:31:13 +02:00
Marc Zinnschlag	799cd87b52	name convention and spelling fixes	2014-10-16 14:24:17 +02:00
Marc Zinnschlag	e27da6a0d4	removed settings file mixup	2014-10-16 13:59:34 +02:00
Marc Zinnschlag	c94c1adaf3	split off settings page label from internal section name	2014-10-16 13:48:07 +02:00
cc9cii	7cdab41501	Don't allow viewing non-existent cells from the regionmap.	2014-10-16 07:36:47 +11:00
cc9cii	094f046087	Convert OverlaySystem to a OpenCS style singleton.	2014-10-16 07:29:46 +11:00
Marc Zinnschlag	720ba2c0d8	split off settings label from internal settings name	2014-10-15 13:39:53 +02:00
Marc Zinnschlag	daf7cab416	refactored section handling	2014-10-15 12:38:17 +02:00
Marc Zinnschlag	219fbd427f	unclutter user settings declarations	2014-10-15 12:13:22 +02:00
Marc Zinnschlag	868fdfba51	reclaiming some unused space	2014-10-15 11:07:40 +02:00
Marc Zinnschlag	e20fa209cc	user settings UI layout improvements	2014-10-15 11:02:41 +02:00
cc9cii	aff6f6fdb2	Setup OverlaySystem after Ogre::Root but before initialisation as per the API documentation.	2014-10-15 18:48:01 +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