4686 commits

Author	SHA1	Message	Date
ericrius1	1cdee11784	Merge branch 'master' into polylineOptimizations	2015-12-21 12:49:00 -08:00
ericrius1	4b4fe96b64	tweaks	2015-12-21 12:47:31 -08:00
ericrius1	b89e25f8f7	correct file	2015-12-21 11:35:57 -08:00
ericrius1	ba3633710a	name fixes	2015-12-21 11:29:59 -08:00
ericrius1	3c66e38268	test	2015-12-21 11:12:59 -08:00
ericrius1	48ab99c348	rotation fix	2015-12-21 11:00:10 -08:00
Brad Hefta-Gaub	248b3d09ac	add absolute rotation based hand reticle movement	2015-12-21 10:49:49 -08:00
ericrius1	45ba7a3d35	merged	2015-12-21 10:46:54 -08:00
ericrius1	0dd7287e61	mergedq	2015-12-21 10:46:45 -08:00
ericrius1	7a7befafb9	arc balls working	2015-12-21 10:43:59 -08:00
Brad Davis	46a4a469e9	Merge pull request #6689 from ZappoMan/rightClickMenu ... Some early work to support hand driven reticle	2015-12-20 17:49:50 -08:00
Brad Hefta-Gaub	e929e3f789	more work on angular velocity tests	2015-12-18 19:20:32 -08:00
ericrius1	1beec0dbe7	balls	2015-12-18 18:15:05 -08:00
Brad Davis	6098c4a1d6	Revert "Revert "Migrate QML based web views to Qt WebEngine"" ... This reverts commit 1f3adeb666.	2015-12-18 17:18:46 -08:00
Brad Davis	1f3adeb666	Revert "Migrate QML based web views to Qt WebEngine"	2015-12-18 17:09:38 -08:00
Brad Hefta-Gaub	a621579f17	add philips version of hand movement	2015-12-18 15:44:21 -08:00
Brad Hefta-Gaub	4075f355a3	more work on hand movement	2015-12-18 15:44:01 -08:00
ericrius1	fffe6dbb9b	relative rotation	2015-12-18 15:38:01 -08:00
ericrius1	514cb7a329	Beams arc to each other. BAM	2015-12-18 15:26:21 -08:00
ericrius1	2dbb3bd84a	Added grab offsets to createPingPongGun.js	2015-12-18 15:12:46 -08:00
Brad Hefta-Gaub	868d10651a	Merge pull request #6651 from jherico/webengine ... Migrate QML based web views to Qt WebEngine	2015-12-18 14:56:35 -08:00
ericrius1	77264b3f99	Ping pong gun lines up with hand	2015-12-18 14:52:39 -08:00
Brad Hefta-Gaub	42764426ce	Merge branch 'master' of https://github.com/highfidelity/hifi into rightClickMenu	2015-12-18 14:30:16 -08:00
Brad Hefta-Gaub	5701ad2e8c	update to new angular velocity	2015-12-18 12:38:50 -08:00
David Rowe	c3e3af7c8c	Document effect of Bezier interpolation on particle radius simulation	2015-12-18 15:11:43 +13:00
David Rowe	e2ecc388ca	Indicate particle properties that (temporarily) aren't working	2015-12-18 15:10:47 +13:00
David Rowe	5aef309b8a	Get particles in particlesTest.js emitting again	2015-12-18 15:09:36 +13:00
Brad Hefta-Gaub	762aefbbca	add hand driven reticle	2015-12-17 17:38:20 -08:00
ericrius1	aa1f77ab1c	adding ravestick to toybox demo room	2015-12-17 15:42:52 -08:00
ericrius1	3e6ae7c571	added lightball back	2015-12-17 15:02:25 -08:00
ericrius1	035ca25b48	arc ball finds other balls	2015-12-17 13:31:27 -08:00
ericrius1	6f82d680b9	removed unwanted file	2015-12-17 12:38:25 -08:00
Brad Davis	5088eec2a2	Move directory web UI into the overlay	2015-12-17 12:23:39 -08:00
Brad Davis	82c865af2c	Rename QmlWebWindow to OverlayWebWindow, move ctor registration to script engine	2015-12-17 12:20:38 -08:00
ericrius1	5b52b5e5e7	Merge branch 'master' into polylineOptimizations	2015-12-17 11:41:34 -08:00
ericrius1	8d25a666d1	fixed bug where trail would remain after user released rave stick	2015-12-17 11:40:06 -08:00
ericrius1	2aaefbcfcb	refactoring, adding headers	2015-12-17 11:32:48 -08:00
Brad Hefta-Gaub	63a63152a4	add procedural hand pose example	2015-12-17 11:10:49 -08:00
ericrius1	d4481818b2	lightsaber oriented right	2015-12-17 10:50:58 -08:00
ericrius1	57e51afd46	light stick	2015-12-17 10:35:20 -08:00
ericrius1	f7811cf5dc	light trails from rave stick	2015-12-17 10:25:51 -08:00
ericrius1	064c05e98c	light trails	2015-12-17 10:04:51 -08:00
ericrius1	b127b6a9e8	separating out rave stick	2015-12-17 08:55:57 -08:00
Brad Hefta-Gaub	24dde9ea92	Merge branch 'master' of https://github.com/highfidelity/hifi into rightClickMenu	2015-12-16 21:28:42 -08:00
Brad Hefta-Gaub	0b9bd858a7	implement support for pose ScriptEndpoints	2015-12-16 21:28:27 -08:00
ericrius1	bb67ca87e2	lightsabers	2015-12-16 17:52:39 -08:00
ericrius1	f9f496ef5a	adding beam effect	2015-12-16 17:32:30 -08:00
ericrius1	d8c8778316	rave stick in right orientation	2015-12-16 16:50:27 -08:00
Brad Davis	fa5bab08b1	Support web content inside QML	2015-12-16 16:25:38 -08:00
ericrius1	263557cc1a	setting dimensions for rave stick	2015-12-16 16:18:57 -08:00