3386 commits

Author	SHA1	Message	Date
ericrius1	407b6b8158	Fixed bug in spray paint where sometimes would not spray	2015-10-01 16:10:29 -07:00
ericrius1	0fb51a6777	got rid of unneeded light test code	2015-10-01 15:56:16 -07:00
ericrius1	cdb249c6ff	original master script	2015-10-01 15:53:28 -07:00
ericrius1	25e25726d5	only lights	2015-10-01 15:43:25 -07:00
ericrius1	55c6b9d9c4	Added collision sound to blocks	2015-10-01 14:57:03 -07:00
ericrius1	5aef7475d6	Sound position updates every frame based on new position of can	2015-10-01 14:42:51 -07:00
ericrius1	c03a9ddd58	Added fire to master script	2015-09-30 11:14:18 -07:00
ericrius1	2b84c90f9d	merged master hand controller	2015-09-30 10:18:13 -07:00
ericrius1	00cab85a11	Removed whiteboard from reset script	2015-09-29 18:33:31 -07:00
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
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
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
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	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
Seth Alves	e9dd165b1d	try calling updateMotionBehaviorFromMenu	2015-09-29 14:00:22 -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
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
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