4096 commits

Author	SHA1	Message	Date
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
James B. Pollack	1819e20f74	Merge pull request #6367 from ericrius1/marketplace ... Dynamic loading of models from specified directory	2015-11-11 16:54:06 -08:00
ericrius1	1bf8ced2c4	kickback working	2015-11-11 16:40:44 -08:00
Brad Hefta-Gaub	a721b13e46	Merge pull request #6364 from imgntn/cleanuptoybox ... Remove Bball and Targets AC Resetter Script from Toybox	2015-11-11 16:23:33 -08:00
Brad Hefta-Gaub	c4ad1d978b	Merge pull request #6344 from imgntn/easystar ... Adapt EasyStar A* Pathfinding Library and Add Example	2015-11-11 16:22:47 -08:00
Seth Alves	cffe4551dd	merge from upstream	2015-11-11 16:15:07 -08:00
ericrius1	806d303dcd	Added header file	2015-11-11 15:55:32 -08:00
Brad Hefta-Gaub	2363ca044e	Merge pull request #6280 from imgntn/colorbuster ... Color Busters Game	2015-11-11 15:52:18 -08:00
ericrius1	56dc9092e0	added s3 server	2015-11-11 15:52:12 -08:00
ericrius1	466caffd00	trying to add ik	2015-11-11 15:48:06 -08:00
ericrius1	4fc44b0929	Updated header summary to be more specific with how the loading works	2015-11-11 15:19:36 -08:00
EdgarPironti	da2b49a1b0	Remove hardcoded url	2015-11-11 15:07:33 -08:00
EdgarPironti	55d386aaab	Fixes: Prompt and userData	2015-11-11 15:07:33 -08:00
EdgarPironti	0f057d7229	Set clip for ControlledAC	2015-11-11 15:07:32 -08:00
ericrius1	fa244f8670	updated rat model	2015-11-11 14:50:16 -08:00
ericrius1	e78a079796	tweaks to particle props	2015-11-11 14:28:30 -08:00
ericrius1	5789ca2017	particle hit against walls	2015-11-11 14:20:58 -08:00
ericrius1	1e653133b4	muzzle flashes	2015-11-11 13:30:46 -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
ericrius1	667464b493	rat moves back with force when shot	2015-11-11 11:01:34 -08:00
ericrius1	40a15a15f3	cleaning up pistol	2015-11-11 09:11:03 -08:00
ericrius1	3f5cd0237d	Added header to dynamicLoader and removed files that are not ready for merging	2015-11-10 17:29:20 -08:00
ericrius1	3346d77c44	pistol	2015-11-10 17:25:54 -08:00
Eric Levin	c2fe937a5c	Removed logging line	2015-11-10 17:07:55 -08:00
ericrius1	0aefb8747f	Dynamic loading of models from specified directory	2015-11-10 16:55:17 -08:00
ericrius1	e4b271d6d8	dynamic loading content from s3	2015-11-10 16:49:46 -08:00
Seth Alves	4df65e4c11	Merge branch 'master' of github.com:highfidelity/hifi into rework-visual-physics-debug	2015-11-10 15:02:07 -08:00
Eric Levin	a2abc11df1	Merge pull request #6351 from huffman/script-path-resolution ... Update script engine path resolution behavior to behave consistently	2015-11-10 14:10:42 -08:00
James B. Pollack	e7a2e82745	remove bball and targets resetter AC since we are doing this with hidden reset entities now	2015-11-10 13:58:07 -08:00
James B. Pollack	4ded489d23	Merge pull request #6362 from ericrius1/helicopter ... Added scripts for helicopter	2015-11-10 13:53:30 -08:00
ericrius1	bf0677a0ce	Moved helicopter scripts into drylake folder	2015-11-10 13:42:15 -08:00
Ryan Huffman	08c2759947	Remove unused include in createTargets.js	2015-11-10 11:39:50 -08:00
Ryan Huffman	031a93cb0e	Fix utils include in createPingPongGun.js	2015-11-10 11:39:31 -08:00
Ryan Huffman	5f084730d9	Remove old includes in doll.js	2015-11-10 11:39:12 -08:00
Ryan Huffman	a264ed4795	Remove old includes in bubblewand	2015-11-10 11:38:57 -08:00
Ryan Huffman	a6bc1a2b5b	Fix closePaint.js Script.include	2015-11-10 11:38:36 -08:00
Ryan Huffman	90a1fbe04e	Fix magBalls.js resolvePath calls	2015-11-10 11:38:16 -08:00
Ryan Huffman	2a349620ee	Fix walkSettings.js resolvePath calls	2015-11-10 11:37:59 -08:00
Ryan Huffman	e7e6c63c64	Fix edit.js resolvePath calls	2015-11-10 11:36:53 -08:00
Seth Alves	b9ca509f07	Merge branch 'master' of github.com:highfidelity/hifi into render-debug-fixup	2015-11-10 09:50:12 -08:00
Ryan Huffman	6577c7a13c	Fix magBalls include paths	2015-11-10 09:38:52 -08:00
Ryan Huffman	2ad4c5b9e2	Fix walkApi include paths	2015-11-10 09:38:40 -08:00
Ryan Huffman	29fd352169	Fix omniTool test module include path	2015-11-10 09:38:21 -08:00
Ryan Huffman	37d9d98594	Fix breakdance include paths	2015-11-10 09:37:53 -08:00
Ryan Huffman	b802da4fef	Fix include in satellite.js	2015-11-10 09:37:36 -08:00
ericrius1	f5308530e6	Removed commented out line	2015-11-10 09:35:35 -08:00
ericrius1	df5353dc16	Merge branch 'refs/heads/master' into helicopter	2015-11-10 09:33:04 -08:00
Ryan Huffman	53ca4c857d	Fix relative include path in entityCameraTool.js	2015-11-10 08:52:37 -08:00
James B. Pollack	789f3231e1	easier bouncing	2015-11-09 19:18:19 -08:00
James B. Pollack	1ec70e8170	add physics to the ball and make it bounce	2015-11-09 19:10:11 -08:00
James B. Pollack	17814446ca	Add example with entities, add tween.js	2015-11-09 17:11:09 -08:00
Seth Alves	8a434c8ab1	don't attempt to near-grab things that aren't physical	2015-11-09 14:10:26 -08:00
Thijs Wenker	a58bd4ff05	Merge branch 'master' of https://github.com/worklist/hifi into 20724	2015-11-09 22:37:44 +01:00
Eric Levin	7700e67734	Merge pull request #6326 from imgntn/entity_params ... Add Ability to Pass Parameters When Calling Methods on Entities	2015-11-09 12:17:58 -08:00
James B. Pollack	ef7caa8da9	Add new collision hull and sound to ping pong gun	2015-11-09 10:48:12 -08:00
Eric Levin	8e039fe465	Merge pull request #6338 from imgntn/string_polyfills ... Add More Methods to stringHelpers.js	2015-11-09 10:25:13 -08:00
Eric Levin	ceba1c4b02	Merge pull request #6340 from imgntn/usertiming ... Adapt UserTiming library and Add Example	2015-11-09 10:25:04 -08:00
Seth Alves	030bb71f19	Merge pull request #6337 from howard-stearns/fix-agent-avatar ... fix agent avatar animation	2015-11-09 09:38:27 -08:00
Seth Alves	f3d26e163d	turn _drawItemStatus into a bitfield, split out bounding boxes and network/physics-sim-ownership. hook Display-Simulation-Ownership menu item to this system	2015-11-07 07:19:27 -08:00
James B. Pollack	bf4320e5cc	re-add this example	2015-11-06 22:55:33 -08:00
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