3176 commits

Author	SHA1	Message	Date
ericrius1	ad0c0d3b2b	no v1 to avoid caching	2015-09-22 15:50:06 -07:00
ericrius1	55f76a4296	Added more sconce lights to lightSwitch.js	2015-09-22 15:45:18 -07:00
ericrius1	5546a04f4d	Added flashlight to master script	2015-09-22 13:48:10 -07:00
ericrius1	135b34d82a	Merge branch 'master' into toybox	2015-09-22 13:32:08 -07:00
ericrius1	a28cf5ce8b	updated grab script	2015-09-22 13:29:16 -07:00
ericrius1	a0bf7b6529	doll animation fixes	2015-09-22 13:20:17 -07:00
ericrius1	6298dcb2fc	attempt fix for doll animation	2015-09-22 13:03:44 -07:00
Eric Levin	00e0523872	Merge pull request #5851 from imgntn/flashlight_updates_1 ... Flashlight updates	2015-09-22 13:01:26 -07:00
ericrius1	d273852bf9	New wand script	2015-09-22 12:56:01 -07:00
ericrius1	a266e8d65a	updated reset script to use new wand script	2015-09-22 12:49:45 -07:00
James Pollack	e5c42c76a2	Remove update loop refs	2015-09-22 12:41:00 -07:00
ericrius1	2557b32e1a	Updated switch model to be fbx	2015-09-22 12:40:09 -07:00
James Pollack	0ad238a508	Enlarge flashlight	2015-09-22 12:39:48 -07:00
ericrius1	b704ebd934	modified dice starting position	2015-09-22 09:55:24 -07:00
ericrius1	98faf3d712	Added light switch sound	2015-09-22 09:53:22 -07:00
ericrius1	703545bac3	Modified lightSwitch entity to use new incoming grab API	2015-09-22 09:34:54 -07:00
ericrius1	e984afa1dd	Merge branch 'master' into toybox	2015-09-22 08:56:39 -07:00
ericrius1	68bee8228b	abstracted toggle logic to work with mouse click as well	2015-09-22 08:53:46 -07:00
James B. Pollack	bf22d5a942	dont delete wand at cleanup from createWand.js	2015-09-21 17:43:05 -07:00
Brad Hefta-Gaub	ea141aae92	Merge pull request #5865 from jherico/bart ... Instancing work, second pass	2015-09-21 16:51:08 -07:00
ericrius1	a4e5f707cc	Toggling lights	2015-09-21 16:35:30 -07:00
James B. Pollack	d79c1bec95	remove query string	2015-09-21 16:13:24 -07:00
James B. Pollack	fd67a2b86f	Add on/off by pressure; add point bulb to end of flashlight	2015-09-21 16:10:08 -07:00
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
Bradley Austin Davis	e024d23366	Instancing work, second pass	2015-09-21 13:27:02 -07:00
James B. Pollack	71e668470f	Merge remote-tracking branch 'highfidelity/master' into flashlight_updates_1	2015-09-21 13:23:38 -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