3947 commits

Author	SHA1	Message	Date
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	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
Seth Alves	8a434c8ab1	don't attempt to near-grab things that aren't physical	2015-11-09 14:10:26 -08: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	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
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
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