3238 commits

Author	SHA1	Message	Date
ericrius1	1e1cfb6aae	Flipped lights so up is lights on and vica versa	2015-09-24 10:15:50 -07:00
ericrius1	f334651a57	deleted handControllerGrab	2015-09-24 10:05:27 -07:00
ericrius1	81c175eabf	toggle light switch	2015-09-23 17:34:37 -07:00
ericrius1	153a30de0d	flip	2015-09-23 17:24:56 -07:00
ericrius1	d0b5d62bb7	Updated master script to make jslint happy	2015-09-23 16:21:36 -07:00
ericrius1	a1dccc2a92	Changed cat position	2015-09-23 16:13:31 -07:00
ericrius1	276b0b71cb	Added tin can to master script and changed its position	2015-09-23 14:52:59 -07:00
ericrius1	a2b0e66e13	Sound working for spraypaint	2015-09-23 13:36:00 -07:00
ericrius1	2c20a12f13	refactoring spraypaint to use new events	2015-09-23 13:34:21 -07:00
ericrius1	b0923acc2f	Reorg for pathing	2015-09-23 12:34:10 -07:00
ericrius1	6bd89f9689	Toys re-org	2015-09-23 12:22:18 -07:00
ericrius1	4f96f2406b	Merge branch 'master' into toybox	2015-09-23 12:14:23 -07:00
ericrius1	c7cb77a6ab	moved spraycan into toybox folder, and added spraypaint sound	2015-09-23 12:08:28 -07:00
ericrius1	9818e2549c	handControllerscript is now on par with master	2015-09-23 11:38:30 -07:00
ericrius1	cc69f51882	Cat meows when hand is close	2015-09-23 11:30:14 -07:00
ericrius1	a7facc9f3c	Adding a mew sound to cat when user moves hand close	2015-09-23 11:10:27 -07:00
ericrius1	8feabdb518	adding cat, modified dice positions	2015-09-23 10:54:56 -07:00
ericrius1	573cdc5271	Added another light switch- the garage light switch controls the three lights closest to it, and hallway light controls the two near hall	2015-09-23 10:07:59 -07:00
ericrius1	9d9de61afa	updated die starting positions	2015-09-23 09:36:30 -07:00
ericrius1	cf701095c4	updated light switch sound volume to be 50% of what it was	2015-09-23 09:33:02 -07:00
Brad Hefta-Gaub	8d8035a418	Merge branch 'master' of https://github.com/highfidelity/hifi into fixWarning ... Conflicts: libraries/render-utils/src/Model.cpp libraries/render-utils/src/Model.h	2015-09-22 20:54:25 -07:00
Brad Hefta-Gaub	3fe4de4511	Merge pull request #5751 from imgntn/bubblewand_hotfix_2 ... Bubble Wand	2015-09-22 20:35:58 -07:00
James Pollack	3e3d7a8bfa	JS Linting and Coding Standards	2015-09-22 18:12:51 -07:00
Brad Hefta-Gaub	efda121619	fix a bunch of warnings on windows	2015-09-22 16:40:17 -07:00
ericrius1	99dc5a5127	updated doll's sound when picked up	2015-09-22 15:55:35 -07:00
ericrius1	f2afd66615	v2?	2015-09-22 15:50:46 -07:00
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
Brad Hefta-Gaub	5bcce50b98	Merge pull request #5846 from bob-long/master ... Display the face blend coefficients and update the value in real time.	2015-09-22 14:56:56 -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
James Pollack	561b4ca8e1	Remove update loop refs, remove unload method	2015-09-22 12:52:24 -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
BOB LONG	a23a90bf5f	Code simplification ... Simplify the code a bit as suggested: 1) Use unsigned int instead of signed int, so we can avoid checking the negative case 2) Merge two lines into a single line so we can inline the implementation Correct the js sample file header. testing done: - Build locally - Pass -1 as index from js and the code still can correctly handle the input.	2015-09-21 19:11:13 -07:00
James B. Pollack	bf22d5a942	dont delete wand at cleanup from createWand.js	2015-09-21 17:43:05 -07:00
James B. Pollack	f8d743aff0	Update to use new grab methods, only specifically request properties that we are actually using	2015-09-21 17:38:49 -07:00
James B. Pollack	92152b250a	Merge remote-tracking branch 'highfidelity/master' into bubblewand_hotfix_2	2015-09-21 17:37:23 -07:00