3148 commits

Author	SHA1	Message	Date
ericrius1	e4d630b1fc	more light toggling additions	2015-09-21 15:57:03 -07:00
ericrius1	8678e07c21	Adding in light triggering logic	2015-09-21 15:45:54 -07:00
ericrius1	13d7834902	Merge remote-tracking branch 'upstream/master' into toybox	2015-09-21 14:51:33 -07:00
Philip Rosedale	26e5f1ca48	Merge pull request #5842 from SeijiEmery/platform-js ... Platform.js	2015-09-21 14:28:34 -07:00
Seth Alves	cee296e70c	keep object from rotating during local grab	2015-09-21 13:50:42 -07:00
ericrius1	b727256377	animation of doll plays longer now to give user a chance to see it play	2015-09-21 13:05:37 -07:00
ericrius1	d24df99445	Updated block logic to sync with desired behavior (each color block maps to a different size)	2015-09-21 11:51:00 -07:00
ericrius1	4e517b78e1	dice spawning higher so they fall onto craps table	2015-09-21 11:26:56 -07:00
ericrius1	30198aa6f2	Only play animation once for screaming doll when picked up	2015-09-21 11:22:35 -07:00
ericrius1	a71f1495e9	Lowered sound volume on doll, now choose between two screams	2015-09-21 11:15:40 -07:00
David Rowe	52f6fe1d04	Clear entity list when you change domains	2015-09-21 09:59:00 -07:00
ericrius1	5cd69c4f03	Added dice to master reset script	2015-09-21 09:17:23 -07:00
Brad Hefta-Gaub	ec87502f49	Merge pull request #5840 from jherico/bart ... Instanced rendering for Box entities	2015-09-18 18:06:25 -07:00
Brad Hefta-Gaub	213cc25c75	Merge pull request #5856 from sethalves/hand-controller-adjustment ... fix releaseGrab in test script	2015-09-18 17:52:12 -07:00
ericrius1	fb98960194	Adding wand to master script	2015-09-18 17:45:28 -07:00
Seth Alves	fd1c8f6389	fix releaseGrab in test script	2015-09-18 17:39:50 -07:00
ericrius1	b62807011c	Doll screams and writhes when picked up, returns to default position when let go	2015-09-18 17:22:45 -07:00
Philip Rosedale	aebadb1ab9	Merge pull request #5854 from sethalves/hand-controller-adjustment ... tone down distance throwing	2015-09-18 17:20:22 -07:00
ericrius1	de14fc64f6	screaming on grab. Need to get release working	2015-09-18 17:17:55 -07:00
Seth Alves	cfde86a7ea	tone down distance throwing	2015-09-18 17:07:10 -07:00
Philip Rosedale	bbc1c551eb	Merge pull request #5853 from sethalves/hand-controller-adjustment ... fix when releaseGrab is called	2015-09-18 16:30:01 -07:00
Brad Davis	8a703d0363	Instanced rendering, first pass	2015-09-18 16:29:29 -07:00
Seth Alves	236831d385	fix when releaseGrab is called	2015-09-18 16:28:15 -07:00
Philip Rosedale	928a74a306	Merge pull request #5852 from sethalves/hand-controller-adjustment ... Hand controller adjustment	2015-09-18 16:21:12 -07:00
Seth Alves	5db3af3f4c	formatting	2015-09-18 15:58:47 -07:00
Seth Alves	5367de35c1	fix distance-grab throwing	2015-09-18 15:45:36 -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
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
ericrius1	dd3f1301e6	Blocks are now multi colored	2015-09-18 14:36:41 -07:00
Seth Alves	c5716b715d	merge from upstream	2015-09-18 14:22:11 -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
ericrius1	86dfa6f590	2 sizes for blocks	2015-09-18 12:35:49 -07:00
ericrius1	8ada3dec6e	Adding doll in	2015-09-18 11:29:16 -07:00
Seiji Emery	e723a5c0fd	whitespace + "waiting for entity server" ... No functionality changes, but now prints "waiting for entity server" once if waiting for more than X seconds in startup().	2015-09-18 11:18:33 -07:00
Seiji Emery	c25d8857d9	Merge branch 'master' of https://github.com/highfidelity/hifi into platform-js	2015-09-18 11:14:49 -07:00
ericrius1	65722dc870	Removed master spawner as its no longer needed	2015-09-18 11:01:33 -07:00
ericrius1	6e4b838bf9	added collision sound to bbal	2015-09-18 10:59:28 -07:00
ericrius1	d6377ee6bb	Added basketball to master reset script	2015-09-18 10:55:29 -07:00
Seth Alves	b08f567999	put controller specific functions inside the controller object	2015-09-18 09:56:45 -07:00
Seth Alves	b8c8ea2b53	move magic numbers to constant variables, add some comments	2015-09-18 07:20:35 -07:00
Seth Alves	6d7b129b83	rework handControllerGrab.js	2015-09-17 23:15:18 -07:00
Brad Hefta-Gaub	0811da14b8	use new feature for getEntityUserData	2015-09-17 21:14:07 -07:00
ericrius1	ae795a5c4f	spray paint spawner working	2015-09-17 17:15:59 -07:00
ericrius1	78642e3c79	Getting rid of managers	2015-09-17 17:04:09 -07:00
ericrius1	5f12a5c85a	Merge branch 'master' into toybox	2015-09-17 16:13:10 -07:00
ericrius1	9614a69b19	adding spray can	2015-09-17 16:12:16 -07:00