296 commits

Author	SHA1	Message	Date
David Rowe	c3e3af7c8c	Document effect of Bezier interpolation on particle radius simulation	2015-12-18 15:11:43 +13:00
David Rowe	e2ecc388ca	Indicate particle properties that (temporarily) aren't working	2015-12-18 15:10:47 +13:00
David Rowe	5aef309b8a	Get particles in particlesTest.js emitting again	2015-12-18 15:09:36 +13:00
James B. Pollack	a9438490fe	update butterfly model	2015-12-02 12:53:19 -08:00
ericrius1	386afa272c	disable grab while attachment version of pistol script is running	2015-12-01 16:50:09 -08:00
ericrius1	b67c481726	resolved merge conflicts	2015-11-30 18:19:57 -08:00
ericrius1	90595949f1	moved exterminator game out of dry lake	2015-11-30 18:14:57 -08:00
ericrius1	8992f6bb44	moved pistol to toybox	2015-11-30 17:57:01 -08:00
James B. Pollack	23f10659b0	update to new trigger method	2015-11-24 14:00:23 -08:00
Brad Hefta-Gaub	e6db72c887	Merge pull request #6437 from imgntn/grasp_equip ... Grasp hands when equipping entities	2015-11-19 18:28:44 -08:00
Brad Hefta-Gaub	f80a765a29	add Assets.uploadData() and Assets.downloadData()	2015-11-19 17:28:20 -08:00
James B. Pollack	3f89d73fc6	add grasp to equip and example	2015-11-19 16:15:34 -08:00
Brad Hefta-Gaub	a1e10a9f04	Merge pull request #6309 from thoys/20724 ... CR for Job #20724 - Camera entity mode	2015-11-17 20:05:22 -08:00
Brad Hefta-Gaub	d8a3927311	debug the late connect case	2015-11-17 14:43:06 -08:00
Brad Hefta-Gaub	85aa3b3f83	handle subscribe when messages mixer is not available	2015-11-17 14:28:51 -08:00
Brad Hefta-Gaub	8112b3b57e	add senderUUID to the messageReceived signal	2015-11-17 14:16:22 -08:00
Brad Hefta-Gaub	2f142eb088	add a receiver example	2015-11-17 13:33:30 -08:00
Brad Hefta-Gaub	5b9791d800	add message received signal	2015-11-17 11:50:10 -08:00
Brad Hefta-Gaub	c27a127739	add example script	2015-11-17 10:41:26 -08:00
Thijs Wenker	4c2c37acce	Merge branch 'master' of https://github.com/worklist/hifi into 20724	2015-11-12 02:19:35 +01:00
Thijs Wenker	764af63ea9	remove Anchor entity from example and edit script, replace with invisible Box in example	2015-11-12 02:19:08 +01:00
Brad Hefta-Gaub	2363ca044e	Merge pull request #6280 from imgntn/colorbuster ... Color Busters Game	2015-11-11 15:52:18 -08:00
AlessandroSigna	e4b1b54e00	added header	2015-11-11 12:07:54 -08:00
AlessandroSigna	f40e46957b	handControlledHead.js added	2015-11-11 12:06:51 -08:00
Ryan Huffman	b802da4fef	Fix include in satellite.js	2015-11-10 09:37:36 -08:00
Thijs Wenker	de98a17ada	- rename CameraEntityItem to AnchorEntityItem	2015-11-06 01:58:08 +01:00
Thijs Wenker	0ebd6e47cc	fix magic number	2015-11-04 21:21:03 +01:00
Thijs Wenker	128a0c2397	securityCamera.js - Camera Entity example	2015-11-04 20:23:03 +01:00
James B. Pollack	811fd0cec7	prep for meeting	2015-11-03 10:42:15 -08:00
James B. Pollack	aeac31cf6a	dont delete cubes by default	2015-11-02 16:37:24 -08:00
James B. Pollack	15af28337b	add color busters game for testing	2015-11-02 16:02:30 -08:00
James B. Pollack	c67bfc8883	Merge pull request #6180 from huffman/line-js ... Add js line library for drawing infinite poly lines	2015-10-30 17:47:31 -07:00
EdgarPironti	f887bbd45c	Fixed controllerExample parse error	2015-10-30 11:06:20 -07:00
Brad Davis	036ae62dd3	Merge remote-tracking branch 'upstream/master' into HEAD	2015-10-29 14:00:52 -07:00
Brad Hefta-Gaub	1c2973f17d	removed old metavoxel example, since the api is no longer available	2015-10-29 12:34:24 -07:00
Ryan Huffman	2cd2af2b13	Add headers to line.js and lineExample.js	2015-10-27 09:49:52 -07:00
Ryan Huffman	983c551ce3	Clean up line.js and make lifetime settable	2015-10-27 09:13:16 -07:00
Ryan Huffman	1a1ab29978	Add lineExample.js	2015-10-26 16:45:43 -07:00
Brad Hefta-Gaub	3a2328a887	Merge pull request #6173 from EdgarPironti/controllers ... Fixed sword.js	2015-10-23 20:07:52 -07:00
EdgarPironti	0d15182adb	Fixed sword.js	2015-10-23 18:09:43 -07:00
Brad Hefta-Gaub	9aaef9aabd	fix hydraPaint.js to use new API	2015-10-23 17:32:06 -07:00
Brad Hefta-Gaub	9285cf8e2c	fix hydraGrabHockey.js to use new API	2015-10-23 17:12:26 -07:00
EdgarPironti	eaaec516c2	fix controllerExample	2015-10-22 18:41:57 -07:00
Brad Davis	0e419e3fbb	Merge remote-tracking branch 'upstream/master' into HEAD	2015-10-20 17:47:37 -07:00
Andrew Meadows	4ff05e8c2a	fix lin endings of some JS files	2015-10-20 13:26:19 -07:00
Brad Hefta-Gaub	8578b40236	get JS source functions working across threads	2015-10-17 14:14:45 -07:00
Brad Hefta-Gaub	7956d737ab	fix thread safety issue on JS based fliters	2015-10-17 14:08:21 -07:00
Brad Davis	e39219c2b5	Fixes and PR comments	2015-10-14 16:51:52 -07:00
Ryan Huffman	9a9bdbbc44	hack in mappings to interface	2015-10-12 17:59:58 -07:00
Brad Hefta-Gaub	0986f86c34	implement StandardController and expose it to JS as Controller.Standard.*	2015-10-11 14:55:07 -07:00