4034 commits

Author	SHA1	Message	Date
James B. Pollack	34d98cac5e	Update usertiming.js	2015-11-06 22:12:03 -08:00
James B. Pollack	369eec2abd	Update usertimingExample.js	2015-11-06 22:05:30 -08:00
James B. Pollack	4fbff5d667	Update usertimingExample.js	2015-11-06 21:39:53 -08:00
Clément Brisset	517ef7dfc8	Merge pull request #6336 from ericrius1/avatarMover ... Restores the avatar mover app after its loss in S3	2015-11-06 19:30:24 -08:00
James B. Pollack	c4318bcbd3	add easystar lib	2015-11-06 17:38:53 -08:00
James B. Pollack	f478261ed0	cleanup	2015-11-06 16:21:53 -08:00
James B. Pollack	5893bfeb06	add user timing	2015-11-06 16:19:49 -08:00
James B. Pollack	f7d4a3821f	add more methods	2015-11-06 15:42:56 -08:00
Howard Stearns	619746676b	Fix ScriptAvatar (ac agent), and provide a simple working example assignment client script.	2015-11-06 15:31:03 -08:00
ericrius1	c1690bcf32	restoring avatarMover app post S3-loss event	2015-11-06 15:19:14 -08:00
James B. Pollack	ced1a4899d	promises	2015-11-06 15:10:23 -08:00
ericrius1	c289474909	avatr mover	2015-11-06 14:25:01 -08:00
ericrius1	a432a62dee	model swapping	2015-11-06 13:53:25 -08:00
Eric Levin	7be537c49c	Merge pull request #6332 from imgntn/bubblwand_links ... Update Bubblewand Model References	2015-11-06 13:28:27 -08:00
James B. Pollack	1d41ef868b	update bubblewand model refs	2015-11-06 13:11:06 -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
samcake	63106f6991	Merge pull request #6322 from Atlante45/record ... Recording fixes from Clement.	2015-11-06 09:28:58 -08:00
James B. Pollack	2fdc9202e4	Merge pull request #6313 from AlanZimmerman/playa ... Created playaSpawner	2015-11-05 20:47:00 -08:00
AlessandroSigna	715b183a3c	unified two ways to do the mapping in a single JS	2015-11-05 19:10:06 -08:00
AlessandroSigna	f9ebbea585	Merge branch 'master' of https://github.com/highfidelity/hifi into branchJS	2015-11-05 19:09:49 -08:00
ericrius1	94c5637024	marketplace spawner	2015-11-05 17:27:30 -08:00
Thijs Wenker	de98a17ada	- rename CameraEntityItem to AnchorEntityItem	2015-11-06 01:58:08 +01:00
Anthony Thibault	b6b596b8af	Merge pull request #6284 from howard-stearns/away ... Away/Pause	2015-11-05 15:28:47 -08:00
ericrius1	f8de01a856	Fixed bug where eraser wouldn't erase	2015-11-05 14:14:49 -08:00
Atlante45	07b3597ae3	Fix recording scripts	2015-11-05 14:01:37 -08:00
Seth Alves	c4194f2359	don't try to grab polylines. set wantTrigger on various whiteboard parts	2015-11-05 13:26:23 -08:00
Howard Stearns	8f65ee87bc	Clean up script, go away when putting HMD (not just on startup), and clear stopper properly.	2015-11-05 13:19:29 -08:00
Howard Stearns	aef8b7639d	Merge branch 'master' of https://github.com/highfidelity/hifi into away	2015-11-05 11:58:08 -08:00
James B. Pollack	c898d9a474	set wantstrigger correctly on lightswitch	2015-11-05 10:48:16 -08:00
Seth Alves	4a3b434fd4	change grabbing-non-colliding to trigger. fix whiteboard and some other scripts	2015-11-05 10:35:02 -08:00
Brad Davis	86b852231e	Merge pull request #6286 from EdgarPironti/master ... Spacemouse migration	2015-11-04 19:15:35 -08:00
AlessandroSigna	eac73671e0	Added some documentation and examples for the new mapping system	2015-11-04 17:40:35 -08:00
Seth Alves	05a977e31b	get rid of code that computes release velocity	2015-11-04 16:26:30 -08:00
Seth Alves	adb9118dc1	don't set release velocity	2015-11-04 16:21:02 -08:00
ericrius1	b7840fdd6b	explosion	2015-11-04 15:01:55 -08:00
Alan Z	8b20a3c903	Created playaSpawner and fixed cleanup issue	2015-11-04 14:41:11 -08:00
Seth Alves	1cbe6c4463	don't attempt to grab particles or zones	2015-11-04 13:59:37 -08:00
Thijs Wenker	ee218faf5e	Merge branch '20724' of github.com:thoys/hifi into 20724	2015-11-04 21:21:57 +01:00
Thijs Wenker	0ebd6e47cc	fix magic number	2015-11-04 21:21:03 +01:00
Howard Stearns	4fd2027fb4	change name	2015-11-04 11:42:21 -08:00
ericrius1	3c227db08d	explode heli	2015-11-04 11:27:16 -08:00
Thijs Wenker	128a0c2397	securityCamera.js - Camera Entity example	2015-11-04 20:23:03 +01:00
Seth Alves	c2f9a49598	don't grab light	2015-11-04 11:15:57 -08:00
Howard Stearns	3fdd7ca470	obscure the code and increase the likelihood of future whitespace-only diffs	2015-11-04 10:57:03 -08:00
Howard Stearns	883f9c09bf	add gratuitous whitespace	2015-11-04 10:49:12 -08:00
Howard Stearns	fe12891f61	whitespace only	2015-11-04 10:48:02 -08:00
Seth Alves	1e498a41f0	rework search logic	2015-11-04 10:46:20 -08:00
Howard Stearns	7b9245022c	Merge branch 'away' of https://github.com/howard-stearns/hifi into away	2015-11-04 10:46:16 -08:00
EdgarPironti	ade0862948	Spacemouse fixes	2015-11-04 00:49:40 -08:00
EdgarPironti	1ab683643c	Merge branch 'master' of https://github.com/highfidelity/hifi	2015-11-04 00:36:38 -08:00
Zach Pomerantz	df4be6c0ba	Add growth script to examples	2015-11-03 23:48:05 -08:00
Brad Davis	439bdbc0e4	Merge pull request #6298 from samcake/controllers ... Controllers : Removing dead files	2015-11-03 19:57:37 -08:00
Thijs Wenker	d60661ff8a	preview camera button in edit.js script	2015-11-04 03:24:32 +01:00
EdgarPironti	7adf38f781	Spacemouse migration	2015-11-03 18:22:55 -08:00
EdgarPironti	2a84cadd5d	Merge branch 'master' of https://github.com/highfidelity/hifi	2015-11-03 18:22:29 -08:00
Thijs Wenker	d7279e4c88	Support for Camera Entities. ... - New entity type: camera, with just the basic properties of an entity (position, rotation, name etc.). - New CameraMode: CameraEntity - Example script using the new cameraEntity - Updated edit.js to use the CameraEntities (with button to preview the camera)	2015-11-04 02:51:23 +01:00
Howard Stearns	4a54f2052e	Merge branch 'master' of https://github.com/highfidelity/hifi into away	2015-11-03 17:42:38 -08:00
Atlante45	d8797ef9d7	Initialize relativePosition/Rotation	2015-11-03 16:07:37 -08:00
Brad Hefta-Gaub	d21415b00d	Merge pull request #6295 from imgntn/cleanup_tests ... Remove timers test file	2015-11-03 15:43:02 -08:00
samcake	57bc2f3093	Removing dead js files	2015-11-03 15:37:36 -08:00
howard-stearns	4bf9861350	Forgot license header.	2015-11-03 15:36:02 -08:00
ericrius1	0650280fb6	tweaks	2015-11-03 15:14:56 -08:00
ericrius1	ed2bd07585	rotating blade	2015-11-03 14:54:05 -08:00
Stephen Birarda	8346ce27b3	allow a non-colliding grab of locked entities	2015-11-03 14:22:41 -08:00
ericrius1	0846c3bef4	moving	2015-11-03 14:12:56 -08:00
James B. Pollack	b83b24b096	remove strange test file	2015-11-03 13:42:18 -08:00
ericrius1	58587a5780	spotlight	2015-11-03 13:26:39 -08:00
howard-stearns	fb4174b9a2	Control alphaVar, and deal with overlapping cycles.	2015-11-03 13:11:31 -08:00
ericrius1	443df042a4	playing with light pos/rot	2015-11-03 12:40:41 -08:00
EdgarPironti	d99838de9c	Merge branch 'master' of https://github.com/highfidelity/hifi	2015-11-03 12:25:19 -08:00
ericrius1	82dbdec78c	helicopter	2015-11-03 11:54:01 -08:00
James B. Pollack	811fd0cec7	prep for meeting	2015-11-03 10:42:15 -08:00
Seth Alves	27b239176f	fix grab	2015-11-03 10:16:56 -08:00
Howard Stearns	70b1165393	Merge branch 'master' of https://github.com/highfidelity/hifi into away	2015-11-03 10:01:36 -08:00
EdgarPironti	5d695da630	Do not merge - Spacemouse	2015-11-02 23:31:10 -08:00
Howard Stearns	1b7ed3d847	away script	2015-11-02 20:40:40 -08:00
James B. Pollack	192e4c8185	Merge pull request #6274 from ZappoMan/rightClickMenu ... add example of overriding default rightClick behavior	2015-11-02 18:58:12 -08:00
James B. Pollack	aeac31cf6a	dont delete cubes by default	2015-11-02 16:37:24 -08:00
Seth Alves	fe2c0effd0	oops left debug on	2015-11-02 16:17:46 -08:00
Seth Alves	0a5f43bba7	fix up boolean test	2015-11-02 16:16:13 -08:00
James B. Pollack	15af28337b	add color busters game for testing	2015-11-02 16:02:30 -08:00
Seth Alves	181901ed19	distance grab works better with hmd on	2015-11-02 14:42:28 -08:00
Brad Hefta-Gaub	b94258f953	add example of overriding default rightClick behavior	2015-11-02 11:55:50 -08:00
Eric Levin	7838683909	Merge pull request #6189 from imgntn/fjs ... Add functional.js library	2015-11-02 11:10:19 -08:00
James B. Pollack	e79ebdb8aa	cleanup syntax	2015-11-01 19:47:13 -08:00
Brad Hefta-Gaub	286905c20c	Merge pull request #6250 from jherico/peek ... Adding peek support for endpoints	2015-10-31 16:09:27 -07:00
Seth Alves	9346366fc5	fix grab script	2015-10-31 14:28:54 -07:00
Brad Davis	abbfe15395	Adding peek support for endpoints	2015-10-31 14:26:14 -07:00
Brad Hefta-Gaub	46f9a432ab	fix handControllerGrab.js	2015-10-31 14:21:50 -07:00
James B. Pollack	459b449a7f	rename folder	2015-10-30 20:52:19 -07:00
James B. Pollack	0a083c070f	color busters cooperative game	2015-10-30 20:21:53 -07:00
Seth Alves	896ed3927c	merge from upstream	2015-10-30 19:17:43 -07: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
Seth Alves	944f0965c0	some refactoring and a bug fix -- grab script can throw things again	2015-10-30 16:35:50 -07:00
Ryan Huffman	77e0023b43	Fix lifetime bug with first PolyLine in InfiniteLine	2015-10-30 16:31:15 -07:00
Seth Alves	cf83ca22bb	change how kinematic objects get data back to entity when an action is active	2015-10-30 15:30:54 -07:00
Seth Alves	b102081f2f	upon release, set velocity after returning entity to being dynamic	2015-10-30 11:35:51 -07:00
Brad Hefta-Gaub	b5fd3424b8	Merge pull request #6245 from EdgarPironti/controllers ... Fixed controllerExample.js parse error	2015-10-30 11:10:08 -07:00
EdgarPironti	f887bbd45c	Fixed controllerExample parse error	2015-10-30 11:06:20 -07:00
Seth Alves	93503d0a21	make kinematic grab set entities kinematic in bullet and update entity position	2015-10-30 11:03:13 -07:00
Brad Davis	49e7d42c2c	Merge remote-tracking branch 'upstream/master' into HEAD	2015-10-30 10:07:40 -07:00
James B. Pollack	846310f9fb	Merge pull request #6208 from ericrius1/closePaintModel ... Added to the whiteboard model, and some bug fixes	2015-10-29 17:05:20 -07:00
ericrius1	6bdf66534f	light tweak	2015-10-29 16:53:03 -07:00
Atlante45	8b46ed7dff	Check keyLight is defined	2015-10-29 16:42:48 -07:00
ericrius1	b6b71e7e76	increased range and intensity of light	2015-10-29 16:40:50 -07:00
Atlante45	c237072195	edit.js fix	2015-10-29 15:29:12 -07:00
ericrius1	020566b76a	no deleting	2015-10-29 14:14:15 -07:00
Atlante45	904326cd1c	edit.js fix	2015-10-29 14:11:27 -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
Brad Hefta-Gaub	1f53e425eb	Merge branch 'master' of https://github.com/highfidelity/hifi into controllers	2015-10-29 12:28:28 -07:00
Brad Davis	f21633e368	Merge pull request #6222 from ZappoMan/hardwareChanged ... Handle input plugin register/remove when activated/deactivated by menus	2015-10-29 12:24:17 -07:00
Brad Hefta-Gaub	3bbba99e2b	Merge pull request #6178 from samcake/color ... Refactor the KeyLIght properties in their own group	2015-10-29 10:44:44 -07:00
samcake	517387621a	Fixing the keyLIght Direction ui for edit.js and fix the case for D to d	2015-10-29 10:40:28 -07:00
Brad Davis	ccbae81dad	Merge branch 'master' into HEAD ... Conflicts: interface/src/avatar/SkeletonModel.cpp	2015-10-29 10:24:38 -07:00
Eric Levin	42fb683085	Merge pull request #6184 from imgntn/toybox_sounds ... Add Arcade Game Sound To Toybox	2015-10-29 10:24:23 -07:00
samcake	025422792d	Fixing the keyLIght Direction ui for edit.js	2015-10-29 10:13:28 -07:00
Brad Hefta-Gaub	a3cd032a41	register/remove devices when the input plugins are activated/deactivated	2015-10-29 10:06:21 -07:00
Andrew Meadows	f9012d5051	Merge pull request #6187 from sethalves/fix-actions-ttl ... fix actions bug	2015-10-29 09:30:21 -07:00
samcake	630cdb8a9d	Modify the html presentiong the zone enity properties to match the internal new representation	2015-10-28 17:29:06 -07:00
samcake	a5b95d7307	Fixing the entity properties view with the new properties group	2015-10-28 16:46:56 -07:00
ericrius1	1b1490bb75	added blocker so user cant get so close to whiteboard	2015-10-28 16:02:15 -07:00
ericrius1	e9bdb872bd	added light to whiteboard	2015-10-28 15:25:11 -07:00
Brad Davis	570b4a32da	Merge pull request #6206 from samcake/controllers ... Controllers : Add a new kind onf controller to expose ReadOnly state from the application	2015-10-28 13:42:15 -07:00
Brad Davis	3c1a0930da	Merge remote-tracking branch 'upstream/master' into HEAD ... Conflicts: interface/src/avatar/MyAvatar.h libraries/script-engine/src/ScriptEngine.cpp libraries/script-engine/src/ScriptEngine.h	2015-10-28 13:38:22 -07:00
ericrius1	ac2effb33c	Not erasing board, models hosted on s3	2015-10-28 13:32:10 -07:00
samcake	b90af1a1ce	Fixing typo and review comments	2015-10-28 13:21:45 -07:00
ericrius1	4027782335	Fixed issue with overlays disapearing on release grab	2015-10-28 13:18:57 -07:00
samcake	07c13f4d66	Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers	2015-10-28 12:54:46 -07:00
Brad Hefta-Gaub	30f7c44f61	emit hardwareChanged signal to scripts	2015-10-28 09:34:18 -07:00
ericrius1	2f835b19fa	surface is now a model	2015-10-27 17:17:19 -07:00
samcake	6ec87086bc	Adding the state controller	2015-10-27 16:57:06 -07:00
ericrius1	d67f4958cd	wait longer for dimensions	2015-10-27 13:44:29 -07:00
ericrius1	ed6a866ff9	ready for demo	2015-10-27 13:43:13 -07:00
ericrius1	0512da0e39	updated url	2015-10-27 13:07:11 -07:00
ericrius1	25ded2bd92	added shapetype	2015-10-27 13:03:44 -07:00
ericrius1	8fcc071026	only can draw on whiteboard	2015-10-27 12:24:29 -07:00
Atlante45	1bebdc8e70	Fix scripts syntax errors	2015-10-27 12:11:27 -07:00
ericrius1	f0a1335957	fixed paint initially showing up white	2015-10-27 12:09:07 -07:00
ericrius1	fa22249f7a	Improving model	2015-10-27 12:03:30 -07:00
ericrius1	8a85468254	changing model, repositioning	2015-10-27 10:39:44 -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
James B. Pollack	d78fe089f6	add mit license	2015-10-26 17:00:54 -07:00
Ryan Huffman	2abb6a2fd5	Clean up line.js	2015-10-26 16:45:58 -07:00
Ryan Huffman	1a1ab29978	Add lineExample.js	2015-10-26 16:45:43 -07:00
James B. Pollack	a1cd4a31cb	fix typo	2015-10-26 16:41:03 -07:00
James B. Pollack	88a312f992	add functional js library... mmm, curry	2015-10-26 16:28:18 -07:00
James B. Pollack	da5db326e8	make cat quieter	2015-10-26 16:03:10 -07:00