147 commits

Author	SHA1	Message	Date
AlessandroSigna	05d311cff3	remove Windows.prompt cause of crash	2015-11-20 18:58:49 -08:00
AlessandroSigna	a1053ee5a0	pop up a prompt with url	2015-11-20 18:58:47 -08:00
AlessandroSigna	7069f7d6ab	added clip load to asset + clean code	2015-11-20 18:58:46 -08:00
AlessandroSigna	a306e8d5b1	master can upload performance file on asset	2015-11-20 18:58:45 -08:00
Brad Hefta-Gaub	ce9c3f1969	Merge pull request #6433 from AlessandroSigna/groupRecording ... cleanup directory + recording bug fix	2015-11-19 18:26:33 -08:00
Seth Alves	2c1ca526df	Merge pull request #6423 from ZappoMan/messaging ... add an example of an entityScript that subscribes to messages	2015-11-19 10:32:36 -08:00
AlessandroSigna	b4f9c4158f	cleanup directory + bug fix	2015-11-19 09:45:28 -08:00
AlessandroSigna	1f854784e1	not load the last recording	2015-11-18 15:17:06 -08:00
Brad Hefta-Gaub	6719092094	add an example of an entityScript that subscribes to messages	2015-11-18 15:03:07 -08:00
AlessandroSigna	5400381583	improved the structure	2015-11-17 18:03:26 -08:00
AlessandroSigna	8566d84709	fixed cleanup - unload	2015-11-17 18:03:25 -08:00
samcake	ba952581d0	Merge pull request #6389 from AlessandroSigna/groupRecording ... added group recording feature	2015-11-16 17:57:11 -08:00
AlessandroSigna	f40ff69c75	added scripts for group recording	2015-11-16 17:27:00 -08:00
AlessandroSigna	5e395713a6	fix script url	2015-11-13 16:33:54 -08:00
AlessandroSigna	5b66416b8c	added cleanup before delete	2015-11-13 16:32:22 -08:00
AlessandroSigna	c8349dda6e	added examples for messages synchronization	2015-11-13 16:32:20 -08:00
James B. Pollack	cf86d27417	cleanup headers	2015-11-06 11:50:34 -08:00
James B. Pollack	e928c8278b	overload a single function and cleanup, add examples	2015-11-06 11:48:51 -08:00
James B. Pollack	6392b7080b	move scripts no longer in toybox to better locations	2015-10-23 10:36:32 -07:00
James B. Pollack	384a6a8154	rename /toys to /toybox, remove non toybox scripts, update master refs	2015-10-21 11:36:49 -07:00
Brad Hefta-Gaub	7a85e5b7a7	rename frameIndex to currentFrame	2015-10-07 13:02:58 -07:00
Brad Hefta-Gaub	02536a5ab9	remove animationSettings from particles, add isEmitting	2015-10-02 14:17:01 -07:00
ericrius1	5ba8f15d9f	test	2015-09-24 16:32:01 -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	9eb3b56e5d	Remove space before and after function calls, add spaces btw functions	2015-09-24 15:03:02 -07:00
James Pollack	381a24951e	Update grab script to handle touching, better naming for non colliding grab functions	2015-09-23 16:56:46 -07:00
ericrius1	c7cb77a6ab	moved spraycan into toybox folder, and added spraypaint sound	2015-09-23 12:08:28 -07:00
David Rowe	eb01ba9812	Merge branch 'master' into 20681	2015-09-23 09:42:56 -07:00
ericrius1	13d7834902	Merge remote-tracking branch 'upstream/master' into toybox	2015-09-21 14:51:33 -07:00
Seth Alves	fd1c8f6389	fix releaseGrab in test script	2015-09-18 17:39:50 -07:00
David Rowe	812ab9b7c6	Merge branch 'master' into 20681 ... Conflicts: libraries/entities/src/EntityItemProperties.cpp	2015-09-18 16:44:04 -07:00
Seth Alves	3d18edd9d1	update detectGrabExample.js	2015-09-18 15:13:09 -07:00
Brad Hefta-Gaub	0d37511071	add support for scripts to call methods on entity scripts	2015-09-18 14:06:38 -07:00
David Rowe	03194437f5	Merge branch 'master' into 20681 ... Conflicts: examples/entityScripts/sprayPaintCan.js	2015-09-18 12:04:02 -07:00
David Rowe	68874eed96	Update particle scripts	2015-09-18 11:34:26 -07:00
ericrius1	ae795a5c4f	spray paint spawner working	2015-09-17 17:15:59 -07:00
ericrius1	bbf6e8b599	using relative paths for entity scripts	2015-09-16 13:52:29 -07:00
ericrius1	0b21cc1777	paint can tweaks	2015-09-16 09:59:35 -07:00
ericrius1	da208526cc	spray can tweaks	2015-09-15 16:48:28 -07:00
ericrius1	9648f56062	some fixups to spray paint script	2015-09-15 15:48:21 -07:00
ericrius1	0a46db60ac	spawning particles on grab and deleting on release, with a lifetime, for better cleanup of particles	2015-09-11 12:01:01 -07:00
ericrius1	eabdd1f4d9	quick fix for particles hanging around	2015-09-11 11:33:21 -07:00
ericrius1	6e46e3d3b6	cleanup for paintcan	2015-09-11 11:24:53 -07:00
ericrius1	1991ba0eba	absolute path for now- just for testing purposes before merge	2015-09-11 09:37:03 -07:00
ericrius1	7969fb64ce	tweaking distance threshold	2015-09-10 17:08:52 -07:00
ericrius1	a1fd867c09	timer fix for reset	2015-09-10 16:46:25 -07:00
ericrius1	510e253575	switching to hosted script for testing	2015-09-10 16:26:57 -07:00
ericrius1	66e4acf651	trying to move to instant reset	2015-09-10 16:21:57 -07:00
Brad Hefta-Gaub	edf889a4c8	Merge pull request #5756 from ericrius1/grabChanges ... added lifetime to pointer, default grab behavior now honors objects i…	2015-09-10 09:14:11 -07:00
Brad Hefta-Gaub	0023016447	Merge pull request #5757 from ZappoMan/breakdanceToy ... added some debugging to breakdance toy	2015-09-09 14:56:08 -07:00