3361 commits

Author	SHA1	Message	Date
ericrius1	259391a40b	Merge branch 'toybox' of https://github.com/ericrius1/hifi into toybox	2015-09-29 18:32:56 -07:00
ericrius1	ba17225c19	Remove hand control script from PR	2015-09-29 18:32:52 -07:00
Eric Levin	68615e171a	Update masterResetEntity.js	2015-09-29 17:40:05 -07:00
ericrius1	d8e7da7b73	added painting to whiteboard	2015-09-29 15:43:59 -07:00
ericrius1	648fb7cb8c	Merge branch 'master' into toybox	2015-09-29 15:40:46 -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	7681d8d77d	fixed commenting	2015-09-29 14:05:57 -07:00
ericrius1	644687f330	releaseGrab event now triggered for non physical entities	2015-09-29 14:04:03 -07:00
ericrius1	a1f922721a	Merge branch 'toybox' of https://github.com/ericrius1/hifi into toybox	2015-09-29 13:57:20 -07:00
ericrius1	81c5d0c388	more whiteboard work	2015-09-29 13:57:17 -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
James B. Pollack	23c9ffa1aa	Merge pull request #8 from imgntn/ericrius1-toybox ... Add fences to master script	2015-09-29 13:06:45 -07:00
ericrius1	da16a6f55b	fixed merge	2015-09-29 13:02:00 -07:00
James Pollack	c52cd30843	Merge branch 'master' into ericrius1-toybox	2015-09-29 13:01:59 -07:00
James Pollack	66ef92b659	thicker, heavier gates, wand collision shape	2015-09-29 12:52:34 -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
James Pollack	a58cf66f2e	wand adjustments	2015-09-29 11:07:21 -07:00
James Pollack	63c02712c1	add shape types	2015-09-29 10:52:54 -07:00
James Pollack	337909b539	actual model url	2015-09-29 10:47:32 -07:00
James Pollack	48290a5275	Merge remote-tracking branch 'upstream/master' into ericrius1-toybox	2015-09-29 10:42:32 -07:00
ericrius1	932f7ce92c	up to date	2015-09-29 10:39:07 -07:00
ericrius1	35e4ec17ea	add which hand for near grab of non physical objects	2015-09-29 10:35:38 -07:00
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
James Pollack	1ceefc3c63	add model key and url	2015-09-29 10:00:45 -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
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
James Pollack	f79414649e	add gravity to fences	2015-09-28 15:57:53 -07:00
James Pollack	09a53d553a	Add fences to Toybox master script, add gravity to bubble wand	2015-09-28 15:55:25 -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
James Pollack	7ce086396c	Merge branch 'master' into ericrius1-toybox	2015-09-28 15:31:03 -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