31886 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
David Rowe	812ab9b7c6	Merge branch 'master' into 20681 ... Conflicts: libraries/entities/src/EntityItemProperties.cpp	2015-09-18 16:44:04 -07:00
Eric Levin	35e38a443c	Merge pull request #5849 from sethalves/hand-controller-adjustment ... Hand controller adjustment	2015-09-18 15:22:29 -07:00
Andrew Meadows	269e3d7f23	Merge pull request #5836 from ZappoMan/getEntityPropertiesPerformance ... Entities.getEntityProperty() performance improvements	2015-09-18 15:19:06 -07:00
Seth Alves	3d18edd9d1	update detectGrabExample.js	2015-09-18 15:13:09 -07:00
Seth Alves	612e906a44	change the names of entityMethods which the grab script will call. adjust the release velocity multiplier	2015-09-18 15:09:05 -07:00
Brad Davis	2f0ba40347	Merge pull request #5844 from ZappoMan/cruftRemovalMachine ... Cruft removal machine	2015-09-18 14:59:16 -07:00
Seth Alves	d1a7aca7f0	add continue-distance-holding state. don't call callEntityMethod unless action creation works. increase distance-holding multiplier.	2015-09-18 14:45:49 -07:00
Brad Hefta-Gaub	d2a468b31d	Merge pull request #5845 from hyperlogic/tony/vive-controller-offset-fix ... Adjust controller offset from 6 inches to 3 inches	2015-09-18 14:26:27 -07:00
Brad Hefta-Gaub	020fb25ace	CR feedback	2015-09-18 14:24:01 -07:00
Seth Alves	c5716b715d	merge from upstream	2015-09-18 14:22:11 -07:00
Seth Alves	26c14ab730	Merge pull request #5847 from ZappoMan/callEntityMethods ... fix grab behavior with toys, add better mechanism for toys to detect grab	2015-09-18 14:21:59 -07:00
Seth Alves	7a8cee4cc3	fix release velocity so throwing things works reliably	2015-09-18 14:13:08 -07:00
Brad Hefta-Gaub	0d37511071	add support for scripts to call methods on entity scripts	2015-09-18 14:06:38 -07:00
Howard Stearns	868b541ca1	Merge pull request #5837 from AndrewMeadows/ik-repairs-002 ... blend rotations between distinct IK end effector solutions	2015-09-18 14:02:06 -07:00
Brad Hefta-Gaub	8f5055d212	Merge pull request #5838 from sethalves/hand-controller-adjustment ... rework handControllerGrab.js	2015-09-18 13:30:29 -07:00
David Rowe	ec146069b1	Reuse old property enum slots	2015-09-18 13:06:18 -07:00
David Rowe	03194437f5	Merge branch 'master' into 20681 ... Conflicts: examples/entityScripts/sprayPaintCan.js	2015-09-18 12:04:02 -07:00
Brad Hefta-Gaub	416acb1d4a	remove call to _entities.render() in displaySide()	2015-09-18 12:03:58 -07:00
Shared Vive Room	3c64db5c86	Adjust controller offset from 6 inches to 3 inches ... When using the vive controller the position of your wrist should match your actual wrist a bit better, unless your name is Shaquille O'Neal.	2015-09-18 12:02:05 -07:00
Andrew Meadows	07f3abfc91	fix bugs	2015-09-18 12:01:23 -07:00
Brad Hefta-Gaub	6edc817bf2	move the best zone logic out of EntityTreeRenderer::render()	2015-09-18 11:35:50 -07:00
David Rowe	68874eed96	Update particle scripts	2015-09-18 11:34:26 -07:00
Andrew Meadows	4cb2249cda	premature optimization: remove another branch	2015-09-18 10:16:19 -07:00
Andrew Meadows	a85afb5280	simplify logic of RotationAccumulator::add()	2015-09-18 10:13:21 -07:00
Andrew Meadows	6ed0a57d9f	avoid unecessary computation of last absolutePose	2015-09-18 10:09:23 -07:00
Seth Alves	b08f567999	put controller specific functions inside the controller object	2015-09-18 09:56:45 -07:00
Brad Hefta-Gaub	0ba1e8c945	remove renderingInWorldInterface signals	2015-09-18 09:49:57 -07:00
Seth Alves	b8c8ea2b53	move magic numbers to constant variables, add some comments	2015-09-18 07:20:35 -07:00
Andrew Meadows	9e94e7f1d0	less complicated RotationAccumulator	2015-09-18 07:11:36 -07:00
David Rowe	8634b59914	Make able to emit from within portion of ellipsoid volume	2015-09-17 23:49:57 -07:00
Seth Alves	6d7b129b83	rework handControllerGrab.js	2015-09-17 23:15:18 -07:00
David Rowe	9e2b5b75b6	Make able to emit in specified range of directions ... Controlled by polar and azimuth start and finish angles, around point or from specified part of spheroid surface.	2015-09-17 22:40:49 -07:00
Andrew Meadows	b6a153d926	split RotationAccumulator into its own files	2015-09-17 22:30:44 -07:00
Andrew Meadows	420acde720	blend IK effects between distinct end effectors	2015-09-17 22:11:59 -07:00
Brad Hefta-Gaub	4a34b142d1	remove render element proxies	2015-09-17 22:05:14 -07:00
Brad Hefta-Gaub	0811da14b8	use new feature for getEntityUserData	2015-09-17 21:14:07 -07:00
David Rowe	f647dcf147	Change emitter radiuses to dimensions to match sphere properties	2015-09-17 21:06:40 -07:00
Brad Hefta-Gaub	d0a4622427	removed some debug code	2015-09-17 21:01:56 -07:00
Brad Hefta-Gaub	45c34e1617	only copy properties to the script values for properties that our type actually has	2015-09-17 20:55:19 -07:00
Brad Hefta-Gaub	7f9a6d7b8e	whitespace fixes	2015-09-17 20:26:50 -07:00
Brad Hefta-Gaub	6de424237f	add support for property groups in the desired properties logic	2015-09-17 20:24:15 -07:00
Brad Hefta-Gaub	ec86394556	Merge pull request #5835 from hyperlogic/tony/vive-eye-offset-fix ... Fix for getEyePose in OpenVRDisplayPlugin	2015-09-17 20:22:10 -07:00
Brad Hefta-Gaub	08babecb75	add support for mapping EntityPropertyFlags to QScriptValues and wire in desiredProps	2015-09-17 19:51:21 -07:00
Anthony Thibault	493819c013	Merge pull request #5834 from AndrewMeadows/ik-repairs-001 ... route hand data directly to new anim system	2015-09-17 17:49:05 -07:00
Brad Hefta-Gaub	b16dfb8a9e	whitespace repair	2015-09-17 17:41:54 -07:00
Brad Hefta-Gaub	81255c8379	whitespace repair	2015-09-17 17:40:41 -07:00
Brad Hefta-Gaub	4e2cb00ec3	first cut at only returning type specific properties in getEntityProperties	2015-09-17 17:33:53 -07:00
Shared Vive Room	4459708b0e	Fix for getEyePose in OpenVRDisplayPlugin	2015-09-17 17:16:12 -07:00
David Rowe	12e2cf3ce9	Emit in all directions from a point or the surface of a spheroid	2015-09-17 17:14:35 -07:00
Brad Hefta-Gaub	3deaa68b7b	Merge pull request #5832 from samcake/HMDLightingBug ... Fix the lighting issue when the Rear View mirror is enabled	2015-09-17 16:46:56 -07:00