54 commits

Author	SHA1	Message	Date
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
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	f381451ae0	added control element selector toolbar button	2014-07-31 14:33:38 +02:00
gus	baf6cca051	modified tab to space	2014-07-22 13:32:15 +02:00
gus	195767db7f	link back to OGre Wiki for some copied past code	2014-07-22 12:25:31 +02:00
gus	546b44a3be	bugfixes	2014-07-22 12:10:58 +02:00
gus	a5058625b3	clean up + toggle function for the billboard	2014-07-21 18:57:35 +02:00
gus	f8019b4a97	added a bilboard with the Cell coord. Can't be toggled off yet, and no clean up too.	2014-07-21 18:35:51 +02:00
Marc Zinnschlag	a25321f07e	update paged scene view according to changes made to cell records	2014-06-30 17:57:38 +02:00
Marc Zinnschlag	5fb2e1a877	do not render deleted exterior cells in scene view	2014-06-30 17:33:03 +02:00
Marc Zinnschlag	2fe2def64c	added cell rendering in paged worldspaces	2014-06-29 16:00:06 +02:00
Marek Kochanowicz	f51f826dad	fixed compilation	2014-05-04 15:13:03 +02:00
Marek Kochanowicz	5e99381019	Drag and drop works.	2014-05-03 14:00:30 +02:00
Marek Kochanowicz	ea1aaef8ca	replace paged with unpaged (and vice versa)	2014-05-01 18:25:28 +02:00
Marek Kochanowicz	d00dbf47d5	working on worldspace drops	2014-05-01 15:09:47 +02:00
Marek Kochanowicz	57131332f4	fixing minor issues	2014-05-01 12:34:54 +02:00
Marek Kochanowicz	6aaa15b2e8	paged worldspace drop	2014-04-30 15:03:46 +02:00
Marek Kochanowicz	19dac9dc86	that would be it	2014-04-30 14:27:11 +02:00