14006 commits

Author	SHA1	Message	Date
Brad Davis	2636e43fab	Merge pull request #6413 from samcake/controllers ... Recording: Moving the Recording js interface to the Script engine	2015-11-18 10:22:55 -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
Philip Rosedale	450608bf5b	Merge pull request #6390 from sethalves/average-near-holds ... Average near holds	2015-11-17 20:01:46 -08:00
samcake	368f19b4e2	Merging with todays upstream and checking	2015-11-17 18:58:10 -08:00
Brad Hefta-Gaub	ba922290a4	Merge pull request #6407 from jherico/dargo ... Exclude avatar scales out of the permissable range	2015-11-17 18:41:15 -08:00
Brad Hefta-Gaub	733d93039f	Merge pull request #6403 from jherico/rec3 ... Recording fixes	2015-11-17 17:52:15 -08:00
samcake	d2f3b48637	Merge branch 'master' of https://github.com/highfidelity/hifi into controllers	2015-11-17 17:36:38 -08:00
Brad Davis	4e57c9114c	Avatar has no dependency on audio or recording anymore	2015-11-17 17:13:53 -08:00
Brad Davis	0ad1d08041	Exclude avatar scales out of the permissable range	2015-11-17 16:46:25 -08:00
Brad Hefta-Gaub	293914b84f	added NodeActivated signal to make it easier for users to know when a recently added node has an active socket	2015-11-17 16:31:34 -08:00
Brad Hefta-Gaub	073215d067	handle socketActivated	2015-11-17 15:55:41 -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
Stephen Birarda	f5ec458a5e	make activeSocket checks more consistent	2015-11-17 15:38:03 -08:00
Stephen Birarda	3906a747b8	fix a couple of bad checks	2015-11-17 15:33:57 -08:00
Brad Davis	48b0465e56	Fixing race condition on seek, correcting some issues with frame timing	2015-11-17 15:18:32 -08:00
Brad Davis	900f425f35	Recording fixes	2015-11-17 15:18:31 -08:00
Stephen Birarda	34b8fca83b	add socketActivated signal to NetworkPeer for punch success	2015-11-17 15:04:31 -08:00
Stephen Birarda	7dfdb3c72e	protect LNL packet sending without active socket	2015-11-17 15:04:14 -08:00
Brad Hefta-Gaub	3efbcb7062	debug the late connect case	2015-11-17 14:47:59 -08:00
Brad Hefta-Gaub	d8a3927311	debug the late connect case	2015-11-17 14:43:06 -08:00
Andrew Meadows	2b07daa976	Merge pull request #6404 from hyperlogic/tony/bugfixes-for-avatars-with-no-eyes ... Bug fixes for avatars with no eyes	2015-11-17 14:29:20 -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
Anthony J. Thibault	e93b5c5838	Bug fixes for avatars with no eyes ... Changed default eye position to 1.9 meters because the hifi_team avatars are 2.0 meters tall. Also, prevent array access with negative indices when eye bones are missing. ಠ_ಠ	2015-11-17 14:02:27 -08:00
Brad Hefta-Gaub	2f142eb088	add a receiver example	2015-11-17 13:33:30 -08:00
Brad Hefta-Gaub	2d3fe497e4	fix typo	2015-11-17 13:29:28 -08:00
Brad Hefta-Gaub	32bf81ef0d	move MessagesClient to agent	2015-11-17 12:59:12 -08:00
Brad Hefta-Gaub	5b9791d800	add message received signal	2015-11-17 11:50:10 -08:00
Brad Hefta-Gaub	e7a8df306c	fix warnings	2015-11-17 11:18:36 -08:00
Brad Hefta-Gaub	60ae1259fa	more cleanup work	2015-11-17 11:06:27 -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	034debc483	cleanup	2015-11-17 10:59:53 -08:00
Clément Brisset	198f1452cf	Merge pull request #6396 from ctrlaltdavid/20738 ... Fix particle aging	2015-11-17 10:47:41 -08:00
Brad Hefta-Gaub	f9a674bca5	implement subscribe/unsubscribe in MessagesClient	2015-11-17 10:01:31 -08:00
Seth Alves	b062d23f61	bumper is now an equip toggle	2015-11-17 09:51:52 -08:00
Brad Hefta-Gaub	6b61ec569c	more work on channels	2015-11-17 09:47:50 -08:00
Sam Gateau	5b92929833	Moving the REcordingScriptingInterface into the script-engine and wiiring up in the assignment-client	2015-11-17 09:32:22 -08:00
ZappoMan	f712fae4d2	more hacking	2015-11-17 08:56:21 -08:00
Brad Hefta-Gaub	12f206e2f0	more work on messages	2015-11-16 17:00:03 -08:00
Brad Hefta-Gaub	40e69f6946	Merge branch 'master' of https://github.com/highfidelity/hifi into messaging	2015-11-16 15:31:06 -08:00
Brad Hefta-Gaub	d42a1a721f	first cut at messages-mixer	2015-11-16 15:26:17 -08:00
David Rowe	b3b73e8cd1	Fix particle aging	2015-11-17 12:02:35 +13:00
Brad Davis	d099f61170	Updating audio record/playback mechanism to more closely match actual audio input	2015-11-16 14:57:24 -08:00
Brad Davis	cb26fc67fc	Move recording interface back to float/seconds	2015-11-16 14:44:22 -08:00
Howard Stearns	35f7a1cf10	Merge pull request #6391 from AndrewMeadows/sisyphus7 ... simplify MyAvatar::deriveBodyFromHMDSensor() take 2	2015-11-16 13:55:22 -08:00
Seth Alves	36af315e5d	Merge pull request #6383 from birarda/goodbye-packet ... send a hopeful disconnect packet from ACs and Interface	2015-11-16 11:28:48 -08:00
Stephen Birarda	584e35e4ab	have killNodeWithUUID return success to avoid double lookup	2015-11-16 10:58:11 -08:00
Stephen Birarda	789290f540	Merge pull request #6370 from Atlante45/locker ... QTryRead/WriteLocker	2015-11-16 10:22:45 -08:00
Seth Alves	b567a4846d	Merge branch 'master' of github.com:highfidelity/hifi into average-near-holds	2015-11-16 10:08:01 -08:00