3326 commits

Author	SHA1	Message	Date
ericrius1	d07c93ef8f	adds hand setting when grabbing near non physical objects	2015-09-29 10:22:03 -07:00
ericrius1	1662471583	whiteboard changes	2015-09-29 10:16:44 -07:00
ericrius1	c4be6e2fb2	Merge branch 'master' into toybox	2015-09-29 09:47:13 -07:00
ericrius1	8857042363	whiteboard	2015-09-29 09:46:49 -07:00
ericrius1	80405450ce	Paint can now just sprays out stream	2015-09-29 09:00:12 -07:00
ericrius1	04d797e964	paint can	2015-09-28 17:59:42 -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
ericrius1	3f83d5a99a	Animation playing for doll, but looping	2015-09-28 17:14:35 -07:00
ericrius1	d47f938f8d	blocks	2015-09-28 17:05:58 -07:00
ericrius1	afcd59a549	Moved cat to stool	2015-09-28 17:04:03 -07:00
ericrius1	a21530282b	logging frame	2015-09-28 16:56:46 -07:00
ericrius1	5e28462e2a	testing doll animation	2015-09-28 16:51:23 -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
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
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
ericrius1	45281f8aae	modified spraypaint can to spray out particles but no paint	2015-09-28 10:34:03 -07:00
ericrius1	660490d754	removed magBalls	2015-09-28 10:29:12 -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
ericrius1	1b096d1573	Merge branch 'master' into toybox	2015-09-28 09:31:49 -07:00
ericrius1	bab3c6fcf2	adjust lastFrame	2015-09-28 09:31:11 -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
ericrius1	bcd2171491	updated chair model	2015-09-25 16:28:12 -07:00
ericrius1	534cffcf85	fixed animation bug with doll	2015-09-25 16:23:35 -07:00
ericrius1	e94d9b39fd	made pots and chair not grabbable	2015-09-25 15:42:13 -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
ericrius1	c53ad3c534	combined arm chair	2015-09-25 12:34:35 -07:00
ericrius1	f5e44675bb	removed start and end frame	2015-09-25 12:11:22 -07:00
ericrius1	65169da64d	removed old doll script	2015-09-25 11:58:05 -07:00
ericrius1	9227676275	Merge branch 'master' into toybox	2015-09-25 11:50:34 -07:00
ericrius1	ccc6a343fc	updated lights to use newly named grab events	2015-09-25 11:49:51 -07:00
ericrius1	7789d8b3a8	fixed potted plant bug	2015-09-25 11:37:04 -07:00
ericrius1	d29c337e95	moved light switches up	2015-09-25 11:32:41 -07:00
ericrius1	a629701362	couch	2015-09-25 11:15:19 -07:00
ericrius1	f4007584e1	formatted master script	2015-09-25 11:02:41 -07:00
ericrius1	0815b8e939	Added polar finish to spray paint stream	2015-09-25 10:59:20 -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
ericrius1	baf4777750	Can now hold spray paint can without painting unless squeezing hard	2015-09-24 17:13:45 -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
ericrius1	c2f1141d69	fix cat script	2015-09-24 16:40:20 -07:00
James Pollack	fd43956502	re add allTouchedIDs object	2015-09-24 16:35:59 -07:00
ericrius1	5ba8f15d9f	test	2015-09-24 16:32:01 -07:00
ericrius1	ce0a726eb9	Fixed spraypaint for new particles	2015-09-24 16:27:17 -07:00
Brad Hefta-Gaub	c75284ccde	Merge pull request #5891 from imgntn/doll_updates_1 ... [Scripts] Doll Updates	2015-09-24 15:58:57 -07:00
Brad Hefta-Gaub	8fef47a488	Merge pull request #5873 from ericrius1/grabAPI ... [Scripts] handControllerGrab.js now handles touches. Also handles grabs on non-colliding objects	2015-09-24 15:58:14 -07:00
James Pollack	bc6a0c08f9	Fix merge conflict	2015-09-24 15:29:44 -07:00
James Pollack	8dacd736df	fix weird multi line thing	2015-09-24 15:27:26 -07:00