390 commits

Author	SHA1	Message	Date
Aesylwinn	9afb0e0f90	Input restructuring.	2016-03-14 00:42:15 -04:00
Aesylwinn	f4f7afb53b	Removed now unnecessary installation of event filter.	2016-03-14 00:41:57 -04:00
Aesylwinn	38059593a7	Removed workaround for OSG input handling in RenderWidget.	2016-03-14 00:41:04 -04:00
Marc Zinnschlag	900378a31e	changed 'not implemented' warning message for object movement	2016-03-12 13:26:33 +01:00
Marc Zinnschlag	d6b8033b46	handle cell transitions when moving objects	2016-03-12 13:19:51 +01:00
Marc Zinnschlag	fa9689c5e7	delay command execution until call to Object::apply has finished (avoids cutting off the branch we are sitting on)	2016-03-11 14:04:47 +01:00
Marc Zinnschlag	6a2fe564ef	Merge branch 'master' into move	2016-03-11 12:47:33 +01:00
Marc Zinnschlag	b2181fae20	safer handling of command macros	2016-03-08 10:48:44 +01:00
Marc Zinnschlag	b5005f7812	keep sub mode over mode changes	2016-03-05 11:41:42 +01:00
Marc Zinnschlag	a63453846b	properly clear drag mode at the end of a drag	2016-03-05 11:14:08 +01:00
Marc Zinnschlag	51a4e3fa7d	properly abort drags from outside the worldspace widget (code was leaving unclean dragging flags behind)	2016-03-05 10:56:54 +01:00
Marc Zinnschlag	70745487f3	cancel instance move on editing lock becoming active	2016-03-05 10:44:46 +01:00
Marc Zinnschlag	b1fb64bf68	added missing drag mode resets	2016-03-04 16:25:30 +01:00
Marc Zinnschlag	dd564daba0	do not start move drags while the document is locked for editing	2016-03-04 16:24:02 +01:00
Marc Zinnschlag	1726393963	cancel instance move on edit mode change	2016-03-04 15:31:50 +01:00
Marc Zinnschlag	25effc4222	cancel instance move on sub mode change	2016-03-04 15:30:28 +01:00
Marc Zinnschlag	1240e0c716	cancel instance move on drag abort	2016-03-04 15:19:26 +01:00
Marc Zinnschlag	d57021b23c	some code simplification	2016-03-04 12:02:45 +01:00
Marc Zinnschlag	c2a8be9048	confine move marker drags to a single axis	2016-03-04 12:00:05 +01:00
Aesylwinn	9d985d883b	added grid icon	2016-03-02 20:45:04 -05:00
Aesylwinn	fa1bd72bc0	fix usage of deprecated function	2016-03-02 15:48:05 -05:00
Aesylwinn	7fb6807e65	cell border markers	2016-03-02 15:02:06 -05:00
Marc Zinnschlag	a19ac72215	render marker	2016-03-01 15:48:34 +01:00
Marc Zinnschlag	6f619ea85f	Merge branch 'master' into move ... Conflicts: apps/opencs/view/render/object.cpp	2016-03-01 12:17:53 +01:00
Rob Cutmore	d60786b5da	Do not show cell markers for interior cells	2016-02-26 07:42:05 -05:00
scrawl	a6621626aa	Don't use multiple parent node paths in CSVRender::Object	2016-02-22 15:22:37 +01:00
scrawl	1c24cba46a	Don't use multiple parental node paths.	2016-02-22 15:13:31 +01:00
Marc Zinnschlag	22e717161a	split object base node into two node (one for position, one for everything else)	2016-02-21 15:19:31 +01:00
Marc Zinnschlag	dececf6c38	instance moving via drag in 3D scenes	2016-02-16 16:02:29 +01:00
scrawl	647a5e091f	Add osgQt to the repository ... Ensures that it will be built against the correct Qt version.	2016-02-15 15:16:48 +01:00
Marc Zinnschlag	dad38d901c	Merge remote-tracking branch 'rcutmore/feature-3043'	2016-02-14 17:38:20 +01:00
Rob Cutmore	25744aaadd	Update cell marker appearance ... - Added bounding box around marker text. Box is black when cell exists otherwise it is red. - Changed format of marker text. - Changed marker text's pivot point to be at center of text.	2016-02-14 10:28:41 -05:00
Rob Cutmore	61b6806a62	Allow toggling of cell markers	2016-02-09 20:23:00 -05:00
scrawl	e28dc3e72f	Preload instances in SceneManager	2016-02-09 18:35:26 +01:00
Rob Cutmore	a34a08c212	Render cell markers ... Adds rendering of cell markers. Markers are displayed at center of cell and contain cell's coordinates.	2016-02-07 13:52:18 -05:00
Rob Cutmore	d28e7db65c	Fix tooltip spelling errors in WorldspaceWidget	2016-01-31 08:45:05 -05:00
Marc Zinnschlag	1b7a0e5d64	Merge branch 'buttons'	2016-01-26 11:32:26 +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	d5ef40aeb7	minor improvements to wording of instance selection menu items	2016-01-26 10:51:47 +01:00
Marc Zinnschlag	39e1b06101	fixed deletion of objects that are selected (was leaving a node behind)	2016-01-25 16:18:55 +01:00
Marc Zinnschlag	790367b980	fixed object removal via setting state to delete	2016-01-25 16:12:20 +01:00
Marc Zinnschlag	c1f0aa7260	added delete selection item to selection mode button menu	2016-01-25 14:55:02 +01:00
scrawl	b0431833a1	Fix some defects reported by Coverity CI	2016-01-21 16:08:04 +01:00
Marc Zinnschlag	45e6974266	added select all and clear selection features	2016-01-19 14:25:20 +01:00
Marc Zinnschlag	4a02563708	Merge branch 'master' into buttons ... Conflicts: apps/opencs/view/render/instancemode.cpp	2016-01-19 13:59:24 +01:00
Marc Zinnschlag	0305ae3693	added selection mode UI	2016-01-19 12:17:13 +01:00
scrawl	fbf07133ea	Document usage of node masks	2016-01-15 16:31:24 +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	c1901069be	added instance mode sub-modes	2016-01-15 12:07:25 +01:00