36402 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
ericrius1	ba993eccd4	cleanup	2015-12-21 18:32:07 -08:00
ericrius1	8d80c06f02	updated ravestick model	2015-12-21 18:26:28 -08:00
ericrius1	f19d1a3067	cleanup	2015-12-21 15:20:36 -08:00
ericrius1	876d8ab6b2	far grabbing arc balls	2015-12-21 13:59:00 -08:00
ericrius1	cabc47e7a9	lightsaber immediately turns off on release	2015-12-21 13:30:52 -08:00
ericrius1	4110630d1f	fixed ravestick fargrab	2015-12-21 13:15:37 -08:00
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
Brad Davis	491d2fe95e	Merge pull request #6713 from ZappoMan/rightClickMenu ... add absolute rotation based hand reticle movement	2015-12-21 12:45:50 -08:00
Brad Hefta-Gaub	b69892eb9b	Merge pull request #6714 from jherico/qml_dep_fix ... Remove script -> qt::webchannel dependency	2015-12-21 12:10:38 -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
Brad Davis	05b7fcc957	Remove script -> qt::webchannel dependency	2015-12-21 11:19:05 -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
Seth Alves	d71cecbc61	Merge pull request #6675 from AndrewMeadows/crash-fix ... fix crash when visiting new domain with gun in hand	2015-12-20 06:24:44 -08:00
Brad Hefta-Gaub	ae04556f45	Merge pull request #6708 from sethalves/fix-entity-server-crash ... fix entity-server crash	2015-12-19 16:13:24 -08:00
Seth Alves	9271209d89	another	2015-12-19 08:13:53 -08:00
Seth Alves	8b9de716f1	fix bad pointer juju	2015-12-19 08:08:10 -08:00
Brad Hefta-Gaub	e929e3f789	more work on angular velocity tests	2015-12-18 19:20:32 -08:00
Brad Hefta-Gaub	f55445bb88	Merge pull request #6707 from jherico/webengine ... Fixing QML based web view crash.	2015-12-18 18:19:36 -08:00
ericrius1	1beec0dbe7	balls	2015-12-18 18:15:05 -08:00
Brad Davis	ae6cf131f5	Fixing crash bug	2015-12-18 17:19:06 -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	baf2d5acb7	Merge pull request #6705 from highfidelity/revert-6651-webengine ... Revert "Migrate QML based web views to Qt WebEngine"	2015-12-18 17:09:44 -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	2c02e7ad63	grabbing works with left hand for ping pong gun now	2015-12-18 15:22:23 -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 Davis	88b88a3306	Fixing warnings	2015-12-18 14:32:35 -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	bfa0652100	Merge pull request #6700 from AndrewMeadows/angular-velocity-is-a-vector ... protect against NaN in measure of hydra angularVelocity	2015-12-18 14:29:23 -08:00
Andrew Meadows	aa3d1c6e4c	Merge pull request #6680 from hyperlogic/tony/windmill-anim-fix ... ModelEntityItem: Fix for incorrect animations with preTranslations	2015-12-18 14:16:35 -08:00
Andrew Meadows	eb3210071e	Merge pull request #6664 from hyperlogic/tony/idle-to-walk-transition ... Improved idle to walk forward transition	2015-12-18 13:59:03 -08:00
Andrew Meadows	4e76e9e50b	prevent nan values in measure of angularVelocity	2015-12-18 13:51:14 -08:00
Eric Levin	2e4df5f859	Merge pull request #6692 from ctrlaltdavid/20758 ... Update particlesTest.js per current particles implementation	2015-12-18 13:35:19 -08:00
Brad Davis	16dd24f3d8	Removing unused LGPL JS file	2015-12-18 13:02:45 -08:00
Brad Hefta-Gaub	5701ad2e8c	update to new angular velocity	2015-12-18 12:38:50 -08:00
Brad Hefta-Gaub	fff567d854	Merge branch 'master' of https://github.com/highfidelity/hifi into rightClickMenu	2015-12-18 12:31:24 -08:00
Brad Hefta-Gaub	bfecf68a2e	Merge pull request #6696 from AndrewMeadows/angular-velocity-is-a-vector ... angular velocity is a vector	2015-12-18 12:29:56 -08:00