3258 commits

Author	SHA1	Message	Date
James Pollack	c55d627e9b	Different model, different sounds, release interval	2015-09-30 16:12:27 -07:00
James Pollack	0865f94106	magic numbers	2015-09-30 11:31:33 -07:00
James Pollack	8bdf428f41	First version of ping pong gun	2015-09-30 11:21:51 -07:00
James Pollack	ecad7f34f6	moar	2015-09-30 10:58:21 -07:00
James Pollack	99fbed6143	mostly working	2015-09-30 10:49:47 -07:00
James Pollack	c3dfea4712	initial files	2015-09-30 10:26:24 -07:00
Brad Davis	166d267022	Merge pull request #5942 from ZappoMan/flickeringLightScript ... Change the update rate of the flickering light to 30hz	2015-09-29 16:20:24 -07:00
Seth Alves	472ff89f48	rearrange when avatar collisions are adjusted	2015-09-29 15:52:38 -07:00
Brad Hefta-Gaub	67823b79d5	change additional lifetime to 60 seconds to avoid processing hiccups	2015-09-29 15:48:46 -07:00
Brad Hefta-Gaub	90afeb4ce1	more debugging	2015-09-29 15:45:29 -07:00
Seth Alves	8f2f14c9e5	keep track of state of avatar-collisions menu-item with global variables rather than per object ones	2015-09-29 15:30:24 -07:00
Seth Alves	2ba686ed89	cleanups	2015-09-29 15:11:52 -07:00
Seth Alves	d554eb8db9	avatar collisions are off during a grab	2015-09-29 15:09:25 -07:00
Brad Hefta-Gaub	f83eae4d42	more debugging	2015-09-29 14:45:24 -07:00
Seth Alves	b1a133e55c	working on disabling avatar collisions during grab	2015-09-29 14:38:47 -07:00
Brad Hefta-Gaub	07515ce710	Merge pull request #5918 from PhilipRosedale/master ... Throw held objects with velocity from fingertip	2015-09-29 14:37:44 -07:00
unknown	006650f23b	Fix for PR comments	2015-09-29 14:34:23 -07:00
James B. Pollack	bbc32cdd1e	Merge pull request #5937 from ericrius1/grabFix ... releaseGrab event now triggered for non physical entities	2015-09-29 14:25:59 -07:00
Brad Hefta-Gaub	00c32fc7cd	Merge pull request #5924 from jherico/marge ... Support for accessing IPD in scripts	2015-09-29 14:24:53 -07:00
Brad Davis	9b13aac37d	PR comments	2015-09-29 14:23:56 -07:00
ericrius1	644687f330	releaseGrab event now triggered for non physical entities	2015-09-29 14:04:03 -07:00
Seth Alves	e9dd165b1d	try calling updateMotionBehaviorFromMenu	2015-09-29 14:00:22 -07:00
Seth Alves	f7b34f63c1	try calling updateMotionBehaviorFromMenu	2015-09-29 13:40:54 -07:00
Brad Hefta-Gaub	6a01c10453	more debug	2015-09-29 13:35:16 -07:00
Brad Hefta-Gaub	9c199b23a2	more debug	2015-09-29 13:32:28 -07:00
Brad Hefta-Gaub	4abb251728	more debug	2015-09-29 13:28:45 -07:00
Seth Alves	49da3c5034	disable avatar collisions while holding something	2015-09-29 13:24:03 -07:00
James B. Pollack	3bbc809710	Merge pull request #5930 from ericrius1/grabFix ... Setting hand data for close grab of non physical objects	2015-09-29 13:17:21 -07:00
Brad Hefta-Gaub	fdb9455540	debug	2015-09-29 13:12:55 -07:00
ericrius1	06194b6088	fixed formatting	2015-09-29 12:51:01 -07:00
Brad Hefta-Gaub	3cf7553c2a	new flickering light script	2015-09-29 11:51:26 -07:00
ericrius1	35e4ec17ea	add which hand for near grab of non physical objects	2015-09-29 10:35:38 -07:00
Eric Levin	e8e9957846	Merge pull request #5911 from ZappoMan/rayIntersectionWork ... adding surface normals to ray intersection	2015-09-28 17:21:40 -07:00
unknown	56a0456f70	Adjust force multiplier and timestep	2015-09-28 16:49:55 -07:00
Brad Davis	7b1c04512a	Adding support for accessing IPD in scripts	2015-09-28 16:24:38 -07:00
Seth Alves	89ab1f626f	Merge pull request #5921 from huffman/import-export-fix ... Import/Export entities fix	2015-09-28 16:21:18 -07:00
unknown	5c7cf76035	Distance grab works with walking and turning	2015-09-28 16:13:35 -07:00
Ryan Huffman	42c33ba699	Fix edit.js import on Windows ... Forcefully prepend "file:///" to the local file url used for importing	2015-09-28 15:40:37 -07:00
unknown	5fc7965042	Throw held objects with velocity from fingertip	2015-09-28 13:04:58 -07:00
Brad Hefta-Gaub	ae73a7e97f	Merge pull request #5904 from imgntn/grab_updates_1 ... [Scripts] Add ability for entities to declare themselves ungrabbable	2015-09-28 12:55:51 -07:00
James B. Pollack	affb0253db	Update handControllerGrab.js ... added a semicolon to the end of a return statement	2015-09-28 10:26:52 -07:00
Brad Hefta-Gaub	3e758f3c6b	fix Triangle::getNormal, add normal display to rayPickExample	2015-09-28 09:05:39 -07:00
Brad Hefta-Gaub	ce3da099f6	normalize the surface normal from the triangle, coding standard fix, update example	2015-09-28 08:30:49 -07:00
James B. Pollack	b254353b38	Update collectHifiStats.js ... Clears the current batch after we send it to the endpoint.	2015-09-26 07:09:41 -07:00
James Pollack	1f7914766c	Add ability to prevent an object from being grabbable by specifying a custom key grabbableKey to grabbable:false	2015-09-25 15:26:29 -07:00
James Pollack	2c0c2a0979	Merge remote-tracking branch 'upstream/master' into thoys-20672	2015-09-25 14:49:31 -07:00
James Pollack	1051416ed7	Change stat collection to batch stats together to make fewer network calls	2015-09-25 10:33:16 -07:00
James Pollack	54419301f3	Merge branch '20672' of https://github.com/thoys/hifi into thoys-20672	2015-09-25 10:01:33 -07:00
James B. Pollack	b2bbaf4e7b	Merge pull request #5899 from ericrius1/grabAPI ... Fixed a one line bug	2015-09-24 16:52:43 -07:00
James Pollack	fd43956502	re add allTouchedIDs object	2015-09-24 16:35:59 -07:00