3312 commits

Author	SHA1	Message	Date
James Pollack	09a53d553a	Add fences to Toybox master script, add gravity to bubble wand	2015-09-28 15:55:25 -07:00
James Pollack	7ce086396c	Merge branch 'master' into ericrius1-toybox	2015-09-28 15:31:03 -07:00
Brad Hefta-Gaub	ae73a7e97f	Merge pull request #5904 from imgntn/grab_updates_1 ... [Scripts] Add ability for entities to declare themselves ungrabbable	2015-09-28 12:55:51 -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
James B. Pollack	affb0253db	Update handControllerGrab.js ... added a semicolon to the end of a return statement	2015-09-28 10:26:52 -07:00
ericrius1	1b096d1573	Merge branch 'master' into toybox	2015-09-28 09:31:49 -07:00
ericrius1	bab3c6fcf2	adjust lastFrame	2015-09-28 09:31:11 -07:00
James B. Pollack	b254353b38	Update collectHifiStats.js ... Clears the current batch after we send it to the endpoint.	2015-09-26 07:09:41 -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
James Pollack	1f7914766c	Add ability to prevent an object from being grabbable by specifying a custom key grabbableKey to grabbable:false	2015-09-25 15:26:29 -07:00
James Pollack	2c0c2a0979	Merge remote-tracking branch 'upstream/master' into thoys-20672	2015-09-25 14:49:31 -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	9227676275	Merge branch 'master' into toybox	2015-09-25 11:50:34 -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
James Pollack	1051416ed7	Change stat collection to batch stats together to make fewer network calls	2015-09-25 10:33:16 -07:00
James Pollack	54419301f3	Merge branch '20672' of https://github.com/thoys/hifi into thoys-20672	2015-09-25 10:01:33 -07:00
ericrius1	baf4777750	Can now hold spray paint can without painting unless squeezing hard	2015-09-24 17:13:45 -07:00
James B. Pollack	b2bbaf4e7b	Merge pull request #5899 from ericrius1/grabAPI ... Fixed a one line bug	2015-09-24 16:52:43 -07:00
ericrius1	c2f1141d69	fix cat script	2015-09-24 16:40:20 -07:00
James Pollack	fd43956502	re add allTouchedIDs object	2015-09-24 16:35:59 -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
Brad Hefta-Gaub	8fef47a488	Merge pull request #5873 from ericrius1/grabAPI ... [Scripts] handControllerGrab.js now handles touches. Also handles grabs on non-colliding objects	2015-09-24 15:58:14 -07:00
James Pollack	bc6a0c08f9	Fix merge conflict	2015-09-24 15:29:44 -07:00
James Pollack	8dacd736df	fix weird multi line thing	2015-09-24 15:27:26 -07:00
James Pollack	49d3b7e93b	fix indentation	2015-09-24 15:26:19 -07:00
James Pollack	9eb3b56e5d	Remove space before and after function calls, add spaces btw functions	2015-09-24 15:03:02 -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
Thijs Wenker	6d4e4af0a5	ability to see Stats in JavaScript + example script which outputs the stats to the console/logviewer	2015-09-24 22:02:22 +02: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
ericrius1	f334651a57	deleted handControllerGrab	2015-09-24 10:05:27 -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