4091 commits

Author	SHA1	Message	Date
James B. Pollack	670cca4eb7	fix sounds	2015-11-18 16:35:28 -08:00
James B. Pollack	52582e130a	add lifetime to arrows, disable arrow tracker	2015-11-18 16:32:47 -08:00
James B. Pollack	b9aa9cf980	cleanup	2015-11-18 15:53:10 -08:00
James B. Pollack	328950065f	make bow equippable and change it so you dont have to load arrows	2015-11-18 15:33:47 -08:00
James B. Pollack	ac336af9b5	start spatial key	2015-11-18 11:33:52 -08:00
James B. Pollack	9e1f030840	merge	2015-11-18 11:23:38 -08:00
Philip Rosedale	9c29ba2ca3	Merge pull request #6408 from imgntn/newbubble ... Change out bubble model	2015-11-17 20:30:59 -08:00
Philip Rosedale	5b853ddf57	Merge pull request #6402 from sethalves/grab-equip ... grab script bumper is an equip toggle	2015-11-17 20:15:26 -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
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
Seth Alves	94f18672d4	equip from a distance uses a spring to pull the object to the hand before equipping it	2015-11-17 17:18:16 -08:00
James B. Pollack	b340a99d69	Merge pull request #6290 from zzmp/examples/growth ... Add growth script to examples	2015-11-17 17:01:28 -08:00
James B. Pollack	e0a9048287	new bubble model	2015-11-17 16:59:14 -08:00
Brad Hefta-Gaub	9c4286b6ca	Merge branch 'master' of https://github.com/highfidelity/hifi into messaging	2015-11-17 15:50:54 -08:00
Seth Alves	5ae3c5aea0	adjust size of near-grab radius.	2015-11-17 14:59:06 -08:00
Seth Alves	c6051bb325	reduce size of near-grab radius. don't draw pick laser until we know we aren't going to do a near grab	2015-11-17 14:58:20 -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 Davis	6664d8d919	Merge pull request #6398 from ZappoMan/messaging ... messages-mixer	2015-11-17 14:03:03 -08:00
Brad Hefta-Gaub	2f142eb088	add a receiver example	2015-11-17 13:33:30 -08:00
Seth Alves	d21a2fee20	don't use spatial-key for normal grab, only equip. allow switching from a near or far grab to an equip.	2015-11-17 13:12:22 -08:00
Brad Hefta-Gaub	5b9791d800	add message received signal	2015-11-17 11:50:10 -08:00
Seth Alves	1d4e1eabcb	Merge branch 'master' of github.com:highfidelity/hifi into grab-equip	2015-11-17 11:01:22 -08:00
Brad Hefta-Gaub	c27a127739	add example script	2015-11-17 10:41:26 -08:00
Seth Alves	b062d23f61	bumper is now an equip toggle	2015-11-17 09:51:52 -08:00
samcake	ba952581d0	Merge pull request #6389 from AlessandroSigna/groupRecording ... added group recording feature	2015-11-16 17:57:11 -08:00
samcake	d66049f323	Merge pull request #6386 from AlessandroSigna/recorder ... added examples for messages synchronization	2015-11-16 17:55:32 -08:00
AlessandroSigna	f40ff69c75	added scripts for group recording	2015-11-16 17:27:00 -08:00
EdgarPironti	b6c27588b6	ControlledAC.js refactoring	2015-11-16 16:50:47 -08:00
Brad Davis	cb26fc67fc	Move recording interface back to float/seconds	2015-11-16 14:44:22 -08:00
James B. Pollack	da2f5c7848	work	2015-11-16 12:57:43 -08:00
James B. Pollack	cafcf446d5	Merge branch 'master' into bow	2015-11-16 11:36:09 -08:00
James B. Pollack	2d7dd2fcf2	fires	2015-11-16 11:35:31 -08:00
Seth Alves	89ed3751ae	Merge branch 'master' of github.com:highfidelity/hifi into rework-visual-physics-debug	2015-11-14 14:00:20 -08:00
James B. Pollack	cdc6394a70	moar bowwww	2015-11-13 18:22:36 -08:00
Brad Davis	7a34d4f567	Merge pull request #6387 from samcake/controllers ... Recording : Updating the recorder.js and a few fixes	2015-11-13 17:56:57 -08:00
samcake	89e5db11a0	More fixes	2015-11-13 17:41:41 -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
EdgarPironti	a80871a7a8	Fixes	2015-11-13 15:00:38 -08:00
EdgarPironti	eb0d91fc7e	Fixes to Master recording for ACs	2015-11-13 15:00:38 -08:00
Seth Alves	3746920655	allow action updates from others when we are the simulation owner	2015-11-13 13:56:30 -08:00
James B. Pollack	6129d3757e	fire code and sound code	2015-11-13 11:28:09 -08:00
Seth Alves	1d0a2ddd3d	grab debugging script	2015-11-13 11:15:57 -08:00
James B. Pollack	f3d602a6f3	things	2015-11-13 10:30:17 -08:00
Sam Gateau	89d120ab3d	Few fixes to make the recorder.js run	2015-11-12 22:24:11 -08:00
James B. Pollack	ff2b5fc8da	with child glow box	2015-11-12 19:49:52 -08:00