14721 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
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
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
samcake	d2f3b48637	Merge branch 'master' of https://github.com/highfidelity/hifi into controllers	2015-11-17 17:36:38 -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
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 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	32bf81ef0d	move MessagesClient to agent	2015-11-17 12:59:12 -08:00
Brad Hefta-Gaub	e7a8df306c	fix warnings	2015-11-17 11:18:36 -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
samcake	8553033d59	Refactoring the mess for the Agent	2015-11-16 19:27:28 -08:00
Brad Hefta-Gaub	1e0b66a68f	more work	2015-11-16 19:23:39 -08:00
samcake	71cc36fdd8	removing ms to seconds conversion in MyAvatar	2015-11-16 18:31:24 -08:00
Brad Hefta-Gaub	12f206e2f0	more work on messages	2015-11-16 17:00:03 -08:00
Brad Davis	8a27a2fba5	Fixing recording interface times	2015-11-16 16:29:10 -08: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
U-GAPOS\andrew	df05a9c8aa	fix bug: bodySensorMatrix constantly reset when walking	2015-11-16 12:02:16 -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
Seth Alves	b567a4846d	Merge branch 'master' of github.com:highfidelity/hifi into average-near-holds	2015-11-16 10:08:01 -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
U-GAPOS\andrew	049fe4abee	minor cleanup	2015-11-13 17:42:12 -08:00
samcake	8c21ac144e	Fixing review comments	2015-11-13 16:45:19 -08:00
U-GAPOS\andrew	6733767d8b	use animation state to compute bodyInSensorFrame	2015-11-13 16:39:40 -08:00
Seth Alves	b0d24be58f	add a way to get a list of all actions of a certain type from an entity. hold actions average their positional targets.	2015-11-13 16:02:39 -08:00
Seth Alves	ac635336b7	split AvatarActionHold's finding of its location target into a new function	2015-11-13 14:58:17 -08:00
U-GAPOS\andrew	91bc7ca062	cleanup start/stop logic for HMD follow	2015-11-13 14:04:36 -08:00
Stephen Birarda	ea38c4cc49	don't allow domain check-ins while shutting down	2015-11-12 18:04:15 -08:00
Stephen Birarda	d932ba74fd	remove the avatar kill packet from Interface	2015-11-12 17:58:12 -08:00
samcake	1fd37b51a2	trying to get somewhere....	2015-11-12 17:54:35 -08:00
Stephen Birarda	6b2987eef8	handle domain server node removal in NodeList	2015-11-12 17:47:51 -08:00
Seth Alves	d7be1699a7	adjust how the decision to send action changes over the wire is made	2015-11-12 15:27:10 -08:00
Seth Alves	a78b1619be	Merge branch 'master' of github.com:highfidelity/hifi into rework-visual-physics-debug	2015-11-12 14:20:23 -08:00
Seth Alves	a8cd891e48	adjust how the decision to send action changes over the wire is made	2015-11-12 14:19:23 -08:00
Brad Davis	ee1545f649	Cleaning up clip and transform	2015-11-12 11:48:47 -08:00
Seth Alves	3519dd248b	Merge branch 'master' of github.com:highfidelity/hifi into rework-visual-physics-debug	2015-11-12 09:53:11 -08:00
Brad Davis	f521be10fe	Avatar recording work in progress	2015-11-12 00:33:38 -08:00
Thijs Wenker	4c2c37acce	Merge branch 'master' of https://github.com/worklist/hifi into 20724	2015-11-12 02:19:35 +01:00
Seth Alves	715a46ee82	show actions in status icons	2015-11-11 16:35:04 -08:00
Seth Alves	b38c1cb30f	add icons	2015-11-11 08:01:21 -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
samcake	d3d5d3a19e	Removing useless code	2015-11-10 12:02:20 -08:00
Thijs Wenker	27495b99f2	Merge branch 'master' of https://github.com/worklist/hifi into 20724	2015-11-10 19:17:33 +01:00
Seth Alves	b9ca509f07	Merge branch 'master' of github.com:highfidelity/hifi into render-debug-fixup	2015-11-10 09:50:12 -08:00
samcake	d1df6854ac	Merge branch 'master' of https://github.com/highfidelity/hifi into controllers	2015-11-10 09:16:28 -08:00
Atlante45	767a7a7f1e	Fix warnings on OS X	2015-11-09 14:26:23 -08:00