246 commits

Author	SHA1	Message	Date
James Pollack	676c02c77e	file updates	2015-09-29 10:19:39 -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	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
James B. Pollack	4c86b1ce03	ballin	2015-09-28 18:47:32 -07:00
ericrius1	04d797e964	paint can	2015-09-28 17:59:42 -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
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
James Pollack	afa179b9c4	hoop	2015-09-28 15:08:48 -07:00
James Pollack	ade78fda9e	balls	2015-09-28 12:24:21 -07:00
ericrius1	45281f8aae	modified spraypaint can to spray out particles but no paint	2015-09-28 10:34:03 -07:00
ericrius1	660490d754	removed magBalls	2015-09-28 10:29:12 -07:00
ericrius1	bab3c6fcf2	adjust lastFrame	2015-09-28 09:31:11 -07:00
James Pollack	8f25e54027	Hoop, ball, ground	2015-09-25 18:34:34 -07:00
ericrius1	bcd2171491	updated chair model	2015-09-25 16:28:12 -07:00
ericrius1	534cffcf85	fixed animation bug with doll	2015-09-25 16:23:35 -07:00
ericrius1	e94d9b39fd	made pots and chair not grabbable	2015-09-25 15:42:13 -07:00
ericrius1	c53ad3c534	combined arm chair	2015-09-25 12:34:35 -07:00
ericrius1	f5e44675bb	removed start and end frame	2015-09-25 12:11:22 -07:00
ericrius1	65169da64d	removed old doll script	2015-09-25 11:58:05 -07:00
ericrius1	ccc6a343fc	updated lights to use newly named grab events	2015-09-25 11:49:51 -07:00
ericrius1	7789d8b3a8	fixed potted plant bug	2015-09-25 11:37:04 -07:00
ericrius1	d29c337e95	moved light switches up	2015-09-25 11:32:41 -07:00
ericrius1	a629701362	couch	2015-09-25 11:15:19 -07:00
ericrius1	f4007584e1	formatted master script	2015-09-25 11:02:41 -07:00
ericrius1	0815b8e939	Added polar finish to spray paint stream	2015-09-25 10:59:20 -07:00
ericrius1	baf4777750	Can now hold spray paint can without painting unless squeezing hard	2015-09-24 17:13:45 -07:00
ericrius1	c2f1141d69	fix cat script	2015-09-24 16:40:20 -07:00
ericrius1	5ba8f15d9f	test	2015-09-24 16:32:01 -07:00
ericrius1	ce0a726eb9	Fixed spraypaint for new particles	2015-09-24 16:27:17 -07:00
Brad Hefta-Gaub	c75284ccde	Merge pull request #5891 from imgntn/doll_updates_1 ... [Scripts] Doll Updates	2015-09-24 15:58:57 -07:00
James Pollack	bc6a0c08f9	Fix merge conflict	2015-09-24 15:29:44 -07:00
James Pollack	49d3b7e93b	fix indentation	2015-09-24 15:26:19 -07:00
James Pollack	83a8636a36	Remove whitespace, batch entity edits	2015-09-24 14:49:28 -07:00
ericrius1	5da8b689c5	fix missing commas	2015-09-24 14:41:22 -07:00
ericrius1	4eb76b47a9	Merge remote-tracking branch 'origin/toybox' into toybox ... Conflicts: examples/toys/masterResetEntity.js	2015-09-24 14:40:18 -07:00
ericrius1	536adf8981	testing paintcan	2015-09-24 14:39:11 -07:00
James Pollack	c1f8cbd1a3	Remove space before function calls, add spaces before functions	2015-09-24 14:07:15 -07:00
ericrius1	16f9140a08	updated master script so objects with fewer properties are on one line	2015-09-24 14:04:37 -07:00
ericrius1	203af7cbba	Merge branch 'master' into toybox	2015-09-24 12:03:21 -07:00
ericrius1	8609769c20	cat now listens for touch event from controller	2015-09-24 11:58:54 -07:00
ericrius1	1e1cfb6aae	Flipped lights so up is lights on and vica versa	2015-09-24 10:15:50 -07:00
Brad Hefta-Gaub	ba73acf3b4	Merge pull request #5843 from ctrlaltdavid/20681 ... Replace point and vector particle emitter with spheroid emitter	2015-09-24 08:19:49 -07:00
James Pollack	7efd15c3a2	Update doll to stop screaming when released, use only one hand a a time, spatialize audio position	2015-09-23 18:01:18 -07:00
James Pollack	82f178a353	tweaks	2015-09-23 17:43:08 -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
Thijs Wenker	6bb873d327	createFlashlight.js - Close script after running ... Close the createFlashlight.js script after running once to prevent a flashlight from being created each time you start Interface	2015-09-24 00:43:50 +02: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
James Pollack	6b468ee87b	Add the doll	2015-09-23 13:10:25 -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
David Rowe	eb01ba9812	Merge branch 'master' into 20681	2015-09-23 09:42:56 -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	fa1d5be310	Reduce volume, JSLint, Coding standards	2015-09-22 18:20:23 -07:00
James Pollack	3e3d7a8bfa	JS Linting and Coding Standards	2015-09-22 18:12:51 -07:00
James Pollack	1e09c2501c	This updates the flashlight to have sounds when it turns on and off	2015-09-22 14:21:14 -07:00
James Pollack	561b4ca8e1	Remove update loop refs, remove unload method	2015-09-22 12:52:24 -07:00
James Pollack	e5c42c76a2	Remove update loop refs	2015-09-22 12:41:00 -07:00
James Pollack	0ad238a508	Enlarge flashlight	2015-09-22 12:39:48 -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	81358b7f14	wand changes	2015-09-21 17:01:31 -07:00
James B. Pollack	cd6ad306ac	start transitioning to new grab methods	2015-09-21 16:45:23 -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
James B. Pollack	f3eef9322c	Remove toybox reference in spawner script	2015-09-21 11:10:42 -07:00
James B. Pollack	c2a2abe615	Remove nested bubble entities and related code	2015-09-21 11:05:51 -07:00
James B. Pollack	ccf125c047	Cleanup comments	2015-09-18 15:40:39 -07:00
James B. Pollack	c364189bc8	Update file header	2015-09-18 15:26:34 -07:00
James B. Pollack	dc17985e29	Add some logic for turning off the flashlight when squeeze trigger pressure is low, and turning it back on when squeeze pressure goes over certain amount	2015-09-18 15:24:44 -07:00
James B. Pollack	a897c17eb2	Remove grab-frame and reset position code	2015-09-18 14:31:40 -07:00
James B. Pollack	031761fa57	added some logging while things were broken	2015-09-18 14:27:57 -07:00
David Rowe	68874eed96	Update particle scripts	2015-09-18 11:34:26 -07:00
James B. Pollack	15ea9219d6	collision timeouts	2015-09-18 10:41:44 -07:00
James B. Pollack	9a3a87eedf	improve velocity calculations for wand	2015-09-18 10:03:21 -07:00
James B. Pollack	8a7798fcd7	disable bubble particle burst until i know the right for an entity to watch and see if it is deleted.	2015-09-17 22:00:44 -07:00
James B. Pollack	5ac084ad4f	Randomize bubble gravity, code cleanup	2015-09-17 20:57:07 -07:00
James B. Pollack	df0b9e7dbb	refactor bubble wand to prevent duplicate bubbles	2015-09-17 15:59:19 -07:00
James B. Pollack	75df4e96e8	cleanup	2015-09-16 18:48:06 -07:00
James B. Pollack	a8fe3b3edd	keep the bubble with the wand, make the wand smaller	2015-09-16 18:08:56 -07:00
James B. Pollack	9aa2067e3e	cleanup unused reset stuff	2015-09-16 17:26:18 -07:00
James B. Pollack	e1e567b1b5	remove mouth mode	2015-09-16 17:09:54 -07:00
James B. Pollack	3e7cc7d6eb	remove sounds from bubble	2015-09-16 17:02:52 -07:00
James B. Pollack	5ab8f19257	fix merge leftovers	2015-09-16 16:42:23 -07:00
James B. Pollack	c2d5483da6	Merge branch 'bubblewand_hotfix_2' of https://github.com/imgntn/hifi into bubblewand_hotfix_2	2015-09-16 16:32:23 -07:00
James B. Pollack	455ed27c2b	pre-test with eric	2015-09-16 16:26:09 -07:00
James Pollack	37f45b57ff	wand updates	2015-09-15 18:40:54 -07:00
James Pollack	c3ed2d9064	fix file paths	2015-09-10 17:10:55 -07:00
James Pollack	1cec61ebba	fire particles before burst sound	2015-09-10 17:05:24 -07:00
James Pollack	387e7b74a9	Return wand to its original position if it hasnt moved for 5 seconds, better particles, wand scaled to human size	2015-09-10 16:58:39 -07:00
Sam Gateau	3bf0f388eb	Make the flashlight grab frame work correctly	2015-09-10 15:39:54 -07:00
Sam Gateau	d0592d562c	Make the flashlight grab frame work correctly	2015-09-10 15:30:50 -07:00
James Pollack	ee7e25a137	remove localhost refs	2015-09-10 11:49:12 -07:00
James Pollack	5df483b35f	ignore 0,0,0 positions so we have accurate unload for bubbles	2015-09-10 11:32:21 -07:00
James Pollack	dfa43e84bf	bubble update hook	2015-09-10 10:31:17 -07:00
James Pollack	8f77c0b61c	Update wand to use relative paths, remove some unused position tracking methods, remove cache busting from model file paths	2015-09-10 09:58:31 -07:00
Sam Gateau	38fcb80135	FIx bad relative path	2015-09-10 09:52:52 -07:00
samcake	e647bfc19b	Update flashlight.js ... modify the path to be relative	2015-09-09 22:41:09 -07:00
Sam Gateau	0a0a9805f6	Fixing the url behavior	2015-09-09 18:11:00 -07:00
Sam Gateau	8360fceadf	Fixing the url behavior	2015-09-09 18:09:52 -07:00
Sam Gateau	6aebda86f4	Creating the flashlight script files	2015-09-09 17:24:20 -07:00
Brad Hefta-Gaub	6866c288b0	Merge pull request #5754 from ZappoMan/breakdanceToy ... fix breakdance toy	2015-09-09 12:42:10 -07:00
Brad Hefta-Gaub	427ed8807b	fix breakdance toy	2015-09-09 12:41:59 -07:00
James Pollack	da90b7ff08	remove logging around bubble leave entity	2015-09-09 09:53:47 -07:00
James Pollack	0ac4da285c	Update bubblewand to not use overlays by default.	2015-09-09 09:48:39 -07:00
Brad Hefta-Gaub	ae8c3a19ed	Merge pull request #5746 from imgntn/bubblewand_hotfix_1 ... Run cleanup when createWand.js ends; Don't delete bubbles on collision (for now)	2015-09-08 18:18:36 -07:00
James Pollack	66b6d5178f	Cleanup wand when createWand.js script ends	2015-09-08 17:25:39 -07:00
Brad Davis	ec566a63fc	Merge pull request #5736 from ZappoMan/breakdanceToy ... Breakdance Toy - better positioning on puppet	2015-09-08 16:29:29 -07:00
Brad Hefta-Gaub	781f19c9e3	position the puppet on level of nearby table	2015-09-08 12:27:24 -07:00
Brad Hefta-Gaub	ebeedb5cde	work on moving dancers to center of table if it's present	2015-09-05 22:05:53 -07:00
Brad Hefta-Gaub	50e6d2f769	Merge pull request #5712 from highfidelity/bubblewand ... wand.js + bubble.js = bubblewand	2015-09-04 20:07:22 -07:00
Brad Hefta-Gaub	10585a1b30	have breakdance entity script use the model and location of the entity	2015-09-04 16:20:12 -07:00
James Pollack	5684e13400	updates for cleaner PR	2015-09-04 15:49:12 -07:00
Brad Hefta-Gaub	143376f501	Merge pull request #5718 from jherico/homer ... Magballs: Cleaning up some debugging spew and fixing UI HTML paths	2015-09-04 10:01:01 -07:00
Brad Davis	80f2ecbab6	Cleaning up some debugging spew and fixing UI HTML paths	2015-09-04 09:59:42 -07:00
Brad Davis	3573fe8d11	Merge pull request #5717 from ZappoMan/breakDanceEntityScript ... add breakdance game as entity script that works with hydra grab	2015-09-04 09:49:54 -07:00
Brad Hefta-Gaub	895028134b	add breakdance game as entity script that works with hydra grab	2015-09-04 09:40:09 -07:00
James B. Pollack	a9ad18ec80	cleanup, comments, and consolidation.	2015-09-03 20:42:56 -07:00
Brad Davis	c8069ba73c	Working on magballs polish	2015-09-03 20:09:54 -07:00
James Pollack	1e9bac8dee	add create wand script, add offset to bubble spawn point so that it is at the end of the wand	2015-09-03 17:42:41 -07:00
James Pollack	cf0d236174	silence logging statements for now	2015-09-03 16:50:37 -07:00
James Pollack	80c18c227e	Attach the wand.js script to an entity and then move it around to make bubbles. Customize bubble behavior with bubble.js - make sure to update the path reference in wand.js	2015-09-03 16:42:14 -07:00
Brad Hefta-Gaub	44c554895d	next wave of breakdance work	2015-09-03 14:33:25 -07:00
Brad Davis	5717b77837	Updating magballs to omnitool	2015-09-02 18:14:21 -07:00
Brad Davis	ea415071b4	OmniTool first pass	2015-09-02 18:14:13 -07:00
Brad Davis	849249d7fe	Fixing colors ... Conflicts: examples/toys/magBalls/handController.js	2015-09-02 15:56:38 -07:00
Brad Davis	dc7d20ff86	Working on ui	2015-08-30 23:50:02 -07:00
Brad Davis	9d07bf1585	Magballs: Removing entity scripts, using onUpdate	2015-08-30 19:20:47 -07:00
Brad Davis	a574251173	Cleaning up and moving entity script	2015-08-29 23:06:23 -07:00
Brad Davis	cffb0be384	Removing edge finding calculations	2015-08-29 22:49:14 -07:00
Brad Davis	ebb530aaac	More magball work	2015-08-29 22:30:21 -07:00
Brad Davis	38b62108af	Magnetic sticks and balls	2015-08-28 23:35:43 -07:00
Philip Rosedale	cee570d2b2	First pass at basketball, just appears in front of you with some reasonable values	2015-08-20 23:06:05 -07:00
Philip Rosedale	7284e3aa3c	added a little bit of spin, too.	2015-08-20 22:20:51 -07:00
Philip Rosedale	ef4ad3107e	First pass, grenade toy. Needs art.	2015-08-20 22:11:11 -07:00