overte

mirror of https://github.com/overte-org/overte.git synced 2025-04-21 14:04:01 +02:00

Author	SHA1	Message	Date
Seth Alves	b57803057d	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-01-18 06:38:44 -08:00
ZappoMan	6e5e9d3492	more work	2017-01-16 18:28:01 -08:00
Zach Fox	e98a40c30e	Does this work?	2017-01-16 14:43:30 -08:00
Zach Fox	3b56f46206	Style changes	2017-01-16 13:18:24 -08:00
Zach Fox	32e330320e	Cleanup after rebase	2017-01-16 11:26:57 -08:00
Zach Fox	2f176f50fa	Another checkpoint	2017-01-16 10:44:54 -08:00
ZappoMan	c9c311e275	checkpoint for distance joints	2017-01-15 11:47:48 -08:00
ZappoMan	3a9a6e8283	local position tweaks	2017-01-13 09:09:29 -08:00
ZappoMan	ee4df20df3	duh	2017-01-12 19:27:28 -08:00
ZappoMan	2e48444422	hack	2017-01-12 19:03:58 -08:00
ZappoMan	aed1b69ee0	make the avatar bounding box be avatar local and only change when it actually changes	2017-01-12 17:19:06 -08:00
ZappoMan	dd85cd9558	one more shot at kens way	2017-01-12 08:48:33 -08:00
ZappoMan	0e600fc8fd	more audio loudness tweaks	2017-01-12 07:56:09 -08:00
ZappoMan	fe06dfdca7	tweak audioLoudness packing	2017-01-11 18:58:43 -08:00
ZappoMan	0661531e3a	try another version of an 8bit audio loudness	2017-01-11 17:51:12 -08:00
ZappoMan	407ad633e0	more cleanup use kens 1 byte audio gain	2017-01-11 11:01:49 -08:00
Anthony J. Thibault	9db6806026	In desktop mode, tablet is in front of camera. * added a new fauxJointIndex for the camera. CAMERA_MATRIX_INDEX = -7 this can be used to attach objects to the camera. * WebTablet.js has been changed to detect when entering and exiting HMD mode to move the tablet appropriately. There's a known bug with the tablet entity position lagging the camera by one frame.	2017-01-10 11:31:45 -08:00
ZappoMan	182edf0e9a	change avatarOrientation to use SixByteQuat packing	2017-01-10 09:41:11 -08:00
ZappoMan	8bbfb51419	some cleanup	2017-01-10 08:37:01 -08:00
ZappoMan	eadb1758f9	adding some rate debugging	2017-01-09 17:07:47 -08:00
ZappoMan	13198fd949	add datarate	2017-01-09 13:57:59 -08:00
Brad Hefta-Gaub	ef7b9bfde0	Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo	2017-01-09 10:07:05 -08:00
Brad Hefta-Gaub	785582057e	more comments	2017-01-08 20:35:52 -08:00
Brad Hefta-Gaub	251495978c	more work on delta sending	2017-01-05 19:46:19 -08:00
Zach Fox	495925a017	This behavior was harder to change than expected...	2017-01-05 16:58:32 -08:00
Brad Hefta-Gaub	5acae04420	fix some warnings	2017-01-04 19:40:03 -08:00
Brad Hefta-Gaub	acca9dbe87	Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo Conflicts: libraries/networking/src/udt/PacketHeaders.cpp libraries/networking/src/udt/PacketHeaders.h	2017-01-04 18:07:22 -08:00
Brad Hefta-Gaub	99f180f945	more hacking	2016-12-29 08:16:19 -08:00
Zach Fox	800389cf20	Remove HRS logging	2016-12-28 14:37:19 -08:00
Brad Hefta-Gaub	c7a5e873df	debug by sending all	2016-12-27 18:34:47 -08:00
Brad Hefta-Gaub	73bfc069da	more work on only sending changes	2016-12-27 17:19:55 -08:00
howard-stearns	0ad9786f6b	requestsDomainsListData	2016-12-27 10:14:20 -08:00
Brad Hefta-Gaub	be61052368	check point	2016-12-26 12:12:23 -08:00
Brad Hefta-Gaub	474cb604f1	fix unix error, don't send all all the time	2016-12-23 10:43:34 -08:00
Brad Hefta-Gaub	01d48a5e27	grrr	2016-12-23 10:18:48 -08:00
Brad Hefta-Gaub	62b4a132a0	more hacking	2016-12-23 09:02:13 -08:00
Brad Hefta-Gaub	02a6060b5e	hacking on new format	2016-12-22 16:16:44 -08:00
Brad Hefta-Gaub	977cda3d2e	adjust audio loudness radix so we can support the entire range	2016-12-21 19:10:19 -08:00
Brad Hefta-Gaub	82dd9412ab	tweaks, using packed scalar for audio loudness	2016-12-21 17:21:28 -08:00
Brad Hefta-Gaub	8e7b062aa2	cleanup avatar data to include better documentation	2016-12-21 11:52:24 -08:00
Brad Hefta-Gaub	be62df2001	Merge branch 'master' of https://github.com/highfidelity/hifi into addViewFrustumToAvatarMixer	2016-12-21 08:59:29 -08:00
Brad Hefta-Gaub	5e65e3991c	CR feedback	2016-12-20 21:03:10 -08:00
howard-stearns	a6e353d75f	read lock, not write	2016-12-20 16:25:23 -08:00
Brad Hefta-Gaub	d09afa9454	Merge branch 'master' of https://github.com/highfidelity/hifi into addViewFrustumToAvatarMixer Conflicts: assignment-client/src/avatars/AvatarMixer.h assignment-client/src/avatars/AvatarMixerClientData.h libraries/avatars/src/AvatarData.cpp libraries/networking/src/udt/PacketHeaders.h	2016-12-20 16:25:12 -08:00
howard-stearns	3f4faec15f	Fix idententity packet in AC	2016-12-20 16:14:59 -08:00
Brad Hefta-Gaub	9b11c7cc9c	Merge branch 'master' of https://github.com/highfidelity/hifi into removeLogSpam Conflicts: libraries/networking/src/NodeList.cpp	2016-12-20 10:46:57 -08:00
Brad Hefta-Gaub	dbbed462b4	cleanup naked qDebug() calls	2016-12-19 22:24:25 -08:00
howard-stearns	a45e4da75f	Initialize AvatarMixerClientData with the proper node id (should not be zeros for everyone). Then, in interface, check identity packets for self and make sure they're handled.	2016-12-19 15:22:42 -08:00
howard-stearns	3adc78fecc	Merge branch 'master' of https://github.com/highfidelity/hifi into sessionDisplayNames	2016-12-16 14:16:06 -08:00
howard-stearns	49fd4216de	sessionDisplayName set at server and passed to all clients (including oneself)	2016-12-16 14:15:20 -08:00
Andrew Meadows	ee6a9f4506	adding profile stats relating to avatar CPU costs	2016-12-16 13:41:31 -08:00
Brad Hefta-Gaub	6d7d3551d9	added some stats to the mixer fixed debug logging, improved timer precision	2016-12-15 18:32:11 -08:00
Brad Hefta-Gaub	ed19b4b592	remove compression at the per avatar data buffer for now, since it gave no benefit	2016-12-15 14:13:38 -08:00
Brad Hefta-Gaub	439434b300	fixes	2016-12-14 20:24:52 -08:00
Brad Hefta-Gaub	c8fb467579	send minimum data for out of view avatars	2016-12-14 18:17:11 -08:00
Brad Hefta-Gaub	2443b2d6d9	duh	2016-12-14 17:35:02 -08:00
Brad Hefta-Gaub	daccb70819	disable compression by default	2016-12-14 13:18:09 -08:00
Brad Hefta-Gaub	e57774f630	fix unix/mac build	2016-12-14 12:19:50 -08:00
Brad Hefta-Gaub	2290179281	add compression and minimal data flags to AvatarData	2016-12-14 11:47:45 -08:00
Zach Fox	7030c7b0a6	Space bubble improvements (#9142 ) * The space bubble around a player's avatar is now visualized. When another avatar enters a player's bubble, The bubble visualization will appear, a soft tone will play, and the "Bubble" HUD button will flash. * The space bubble radius setting has been removed. Space bubble size now scales based on avatar scale. * Space bubble collision detection is now more accurate and reliable. * CTRL + N toggles the bubble. * The "Bubble" HUD button has been moved to the proper location.	2016-12-12 14:22:54 -08:00
Anthony J. Thibault	38ac6fff03	Hand Controller rendering is camera relative Basically, when using the third person camera in HMD mode. If the controllers are shown. They should be shown in front of the users camera, not in front of the users avatar. To accomplish this, two new faux joint indices are introduced. CAMERA_RELATIVE_CONTROLLER_RIGHTHAND_INDEX and CAMERA_RELATIVE_CONTROLLER_LEFTHAND_INDEX. These joint indices can be used for Overlay parenting. (But not for entity parenting because they are not transmitted over the network). They can also be queried for by using the MyAvatar.getAbsoluteJointRotationInObjectFrame() call. These new indices are now used by the controllerDisplay.js for the hand controller rendering. They are also used by system/libraries/controllers.js as the origin for hand controller grabbing and interaction lasers.	2016-11-17 11:33:12 -08:00
Stephen Birarda	64d9fa0f39	clamp avatar scale to domain limit in avatar mixer	2016-11-10 14:19:32 -08:00
Stephen Birarda	77ede81fc9	limit MyAvatar scale to limits from domain settings	2016-11-10 13:27:13 -08:00
Zach Pomerantz	301f3ced98	fix typoed threaded call	2016-10-17 15:30:49 -07:00
howard-stearns	dc7a9f253c	kill agents in avatar mixer when they stop being avatars	2016-10-05 13:06:11 -07:00
Ryan Huffman	5e8c8f84b5	Handle edge cases of AVATAR_SELF_ID being used with entities	2016-09-13 16:34:05 -07:00
SamGondelman	9d447d4dcc	enabled qnetworkrequest redirects everywhere I could find them	2016-09-06 17:35:06 -07:00
Seth Alves	1a9f43cb67	fix AvatarActionHold's idea of where the controllers are when the avatar has been scaled	2016-09-01 12:17:34 -07:00
Seth Alves	7c5b8cb75d	send faux joints to the avatar-mixer	2016-08-25 15:21:29 -07:00
Seth Alves	39f52b3682	start on faux avatar joint that represent hand controllers	2016-08-25 10:58:23 -07:00
Anthony J. Thibault	6be737993e	bug fix for sensorToWorld translation transmission	2016-08-23 10:13:07 -07:00
Anthony J. Thibault	c6ea64926c	Sensor space entity support You can do this by parenting an entity to an avatar's -2 joint index. This will mean that the entity will follow the avatar as it moves in the world, but will not follow the avatar's position as it moves in sensor space. Essentially, this gives you the ability to place objects in the user's physical room. WebTablets now are located in this feature and no longer jitter.	2016-08-23 10:13:06 -07:00
David Rowe	afe76c69d2	Fix crash when adding new attachment	2016-08-10 10:41:16 +12:00
Andrew Meadows	1df3b59aa1	change BUG to FIXME	2016-07-24 19:19:35 -07:00
Andrew Meadows	7280992806	add mutex lock around AvatarData joint data	2016-07-23 10:30:44 -07:00
Stephen Birarda	39c7805ca2	don't process packets for ignored avatars	2016-07-13 15:06:31 -07:00
Stephen Birarda	609900f246	move ignore set handling to NodeList	2016-07-13 15:06:31 -07:00
Seth Alves	4e70e8ed42	js call to ray-pick against avatars	2016-06-28 09:55:49 -07:00
Ryan Huffman	70be7b3273	Merge branch 'master' of https://github.com/highfidelity/hifi into feat/user-actions	2016-06-21 16:39:25 -07:00
Brad Hefta-Gaub	d5c6296db5	Merge pull request #8095 from SamGondelman/skeletonFix Fix skeleton switching bug	2016-06-20 15:52:40 -07:00
SamGondelman	5f7e49b087	possible fix, needs testing	2016-06-17 11:50:56 -07:00
Ryan Huffman	c7955900ab	Add new user activity events	2016-06-16 13:17:18 -07:00
SamGondelman	f02ffa92fd	undo debugging	2016-06-15 18:00:08 -07:00
SamGondelman	59b785a33b	trying to debug	2016-06-15 16:55:34 -07:00
SamGondelman	dc9121433d	trying to fix skeleton switching bug	2016-06-13 16:37:34 -07:00
Chris Collins	b14f9cd312	Merge pull request #8041 from sethalves/fix-avatar-entity-locking Fix avatar entity locking	2016-06-13 13:10:32 -07:00
Brad Hefta-Gaub	3c5af56421	Merge pull request #8010 from hyperlogic/feature/hmd-lean-recenter-property Added MyAvatar.hmdLeanRecenterEnabled property	2016-06-09 12:17:51 -07:00
Seth Alves	f070708b4a	_avatarEntityData is accessed by more than one thread.	2016-06-08 15:53:54 -07:00
Brad Hefta-Gaub	11effb6feb	Merge pull request #8007 from hyperlogic/feature/avatar-recording-version Add version number to avatar recording frame	2016-06-06 12:02:49 -07:00
Anthony J. Thibault	3a5d5aab01	Removed innocuous "AvatarData packet size mismatch" warning This should not have been a warning, it is expected behavior when a BulkAvatarData packet is filled with data from more then one avatar.	2016-06-03 14:33:50 -07:00
Anthony J. Thibault	9292a9ce0b	Added MyAvatar.hmdLeanRecenterEnabled property Used to disable the 'room-scale' avatar re-centering code. Disabling this can prevent sliding when the avatar is supposed to be sitting or mounted on a stationary object. Also, removed a bunch of old, unused leaning and torso twisting code.	2016-06-03 13:56:32 -07:00
Anthony J. Thibault	8f9fc08226	Add version number to avatar recording frame New recordings will have a version number of 1. A missing version field indicates the initial version of 0. Warn when playing back version 0 files which are no longer fully supported and fall back to default pose. Playback of version 1 files should work as expected.	2016-06-03 11:08:05 -07:00
Anthony J. Thibault	ea8ba7e2d1	Fixes based on code review feedback. * Use isNaN instead of glm::isnan * prefer abort() over writing to a nullptr, in release assert. * warn if packet size does not match expectations	2016-05-24 18:12:40 -07:00
Anthony J. Thibault	4342a07108	Updated AvatarDataPacket section with sequence number info.	2016-05-23 11:11:37 -07:00
Anthony J. Thibault	9aad38b2c2	merge fix	2016-05-23 10:39:39 -07:00
Anthony J. Thibault	a1c32f8c44	Merge branch 'master' into tony/improved-avatar-mixer-precision	2016-05-23 10:24:52 -07:00
Anthony J. Thibault	5fe01acaa8	Added more comments to AvatarDataPacket section.	2016-05-23 10:03:13 -07:00
Anthony J. Thibault	c73943ee19	macosx warning fixes	2016-05-19 20:32:08 -07:00
Anthony J. Thibault	b95ba8141c	AvatarData packet overhaul, uses a structure instead of raw memcpy	2016-05-19 20:26:00 -07:00
Anthony J. Thibault	13a057513a	Removed jointIndices transmission experiment	2016-05-19 16:46:17 -07:00
Seth Alves	419c744bd4	Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3	2016-05-19 09:49:18 -07:00
Anthony J. Thibault	de1204c42d	Enable transmission of jointIndices	2016-05-18 18:19:28 -07:00
Anthony J. Thibault	0294066668	Removed pupilData and translationRadix from AvatarData packet.	2016-05-18 16:41:50 -07:00
Anthony J. Thibault	eb80990c10	Another fix for avatarIdentity pong	2016-05-18 16:08:56 -07:00
Anthony J. Thibault	e792e8eecf	Fix for identity packet pong	2016-05-18 16:05:16 -07:00
Anthony J. Thibault	135fa8c2aa	Moved jointIndices transmission behind #ifdef	2016-05-18 15:41:21 -07:00
Anthony J. Thibault	c48fce4f5a	WIP commit, socket errors when AvatarIdentity is larger then MTU	2016-05-18 15:24:10 -07:00
Anthony J. Thibault	b48134e30c	WIP commit testing for joint mapping transmission	2016-05-18 11:40:45 -07:00
Seth Alves	3380b2a668	Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3	2016-05-17 19:10:33 -07:00
Andrew Meadows	c64612c42b	namechange keyboardMotor --> actionMotor	2016-05-17 14:46:50 -07:00
Anthony J. Thibault	424517e3de	Fix for Malformed packet errors	2016-05-16 19:11:50 -07:00
Anthony J. Thibault	3d91c5b54d	AvatarData.cpp: hooked up 6 byte quat compression	2016-05-16 17:48:55 -07:00
Anthony J. Thibault	55b0060df9	Convert JointData from relative frame to absolute.	2016-05-16 17:48:52 -07:00
Brad Hefta-Gaub	06d1bd5728	Merge pull request #7799 from birarda/remove-avatar-billboard remove the last of the avatar billboard code	2016-05-16 10:23:42 -07:00
Seth Alves	3876a8037c	Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3	2016-05-16 09:51:20 -07:00
Seth Alves	6277bf8603	if avatar is set to the default avatar file that came with the distribution, don't save that url to settings. never send a file url to the avatar-mixer.	2016-05-13 16:37:43 -07:00
Stephen Birarda	2cf943b2b1	remove billboard code from AvatarData	2016-05-12 16:41:44 -07:00
Seth Alves	1e849956c9	get rid of _avatarEntityChangedTime	2016-05-10 14:48:19 -07:00
Seth Alves	46c1049a35	bump protocol version	2016-05-07 17:48:06 -07:00
Seth Alves	0e6d9a1eec	avatar mixer can relay "client-only" entities between interfaces -- the entity server wont know about them.	2016-05-07 14:48:31 -07:00
Seth Alves	96174468b3	use reliable and ordered packets for avatar identity	2016-05-05 15:27:30 -07:00
Atlante45	eb21b9c5d7	OSX warnings	2016-05-02 17:18:57 -07:00
Brad Hefta-Gaub	691ee87c73	fix to default avatar model	2016-03-22 11:32:38 -07:00
Anthony J. Thibault	7cab8f63fb	Merge branch 'master' of github.com:highfidelity/hifi into tony/no-locks-no-problem	2016-03-21 16:03:33 -07:00
Brad Hefta-Gaub	5f3c29d3e2	Merge pull request #7416 from zzmp/fix/static-cast-network Static cast avatar network reply	2016-03-21 15:31:20 -07:00
Anthony J. Thibault	ce47f83288	Prevent deadlock if idle is called during rendering This extraordinary event can occur if a MessageBox is popped up by the opengl driver. * removed AvatarData::avatarLock * removed AvatarUpdate This code was left over from an earlier avatar threading experiment. Removed AvatarData avatarLock and AvatarUpdate class	2016-03-21 15:11:15 -07:00
Zach Pomerantz	1750b973e0	Static cast avatar network reply	2016-03-21 14:28:15 -07:00
Brad Hefta-Gaub	492e71345a	Revert "Revert "Fix ModelBlender crash"" This reverts commit `f274cdcc7f`.	2016-03-21 11:42:25 -07:00
Brad Hefta-Gaub	f274cdcc7f	Revert "Fix ModelBlender crash"	2016-03-21 10:47:31 -07:00
Brad Hefta-Gaub	0474be59c9	remove invalid.com url	2016-03-17 19:49:45 -07:00
Brad Hefta-Gaub	7483b8546b	remove FaceModel, make Model support shared_from_this() so we can ave shared and weak pointers to it	2016-03-17 17:05:35 -07:00
Anthony Thibault	54cc49283c	libraries/avatars: cppcheck warning fixes	2016-03-13 18:19:42 -07:00
Anthony J. Thibault	807d31743c	Removed Hand, HandData & PalmData Instead, we just store two controller::Poses in MyAvatar. Existing behavior and scripting APIs have been preserved. The hand controller debug drawing is slightly different, but still works.	2016-03-10 19:33:31 -08:00
Anthony Thibault	3b87cd0ea8	Improve hold action by using controller velocity The AvatarHoldAction now derives the body velocity by using data from the controller::Pose. Rather then trying to derive it based on previous positions. This results in more acurate motion of the held object when the hold is released. OpenVR input plugin: pass the velocity and angularVelocity directly from the controller pose to the controller::Pose.	2016-02-22 19:15:22 -08:00
Anthony J. Thibault	072172b1a2	SpatiallyNestable: now with velocity support! Moved velocity and angularVelocity into the SpatiallyNestable base class. Entity velocity and angularVelocity properties are now relative to their parent, similar to the way position and orientation work for entities. MyAvatar rig animations now use SpatiallyNestable to convert velocity into local frame to drive the animation state machine.	2016-02-08 19:43:23 -08:00
Stephen Birarda	816fe52c5b	mark getAvatarBySessionID as virtual	2016-02-03 17:31:38 -08:00
Stephen Birarda	058bba7b55	move avatar invokables from AvatarManager to AvatarHashMap	2016-02-03 17:13:35 -08:00
Brad Davis	664100b9b1	Attachment dialog	2016-01-26 21:55:40 -08:00
Seth Alves	90847dc49c	oops	2016-01-19 15:00:33 -08:00
Seth Alves	09dd3e2a56	merge from upstream, respond to code review	2016-01-19 14:38:22 -08:00
Seth Alves	135f25bde7	changes so that avatar-mixer wont attempt to resolve a parentID	2016-01-18 15:35:54 -08:00
Anthony J. Thibault	7bef1ebdac	Merge remote-tracking branch 'upstream/master' into tony/soft-avatar-attachment-script	2016-01-07 16:14:52 -08:00
Anthony J. Thibault	031f59b7b5	Support for adding soft attachments from script. Also, bug fixes for setting MyAvatar.attachmentData property.	2016-01-07 16:12:36 -08:00
Andrew Meadows	6eb177091b	overhaul of MotionState cleanup Moved MotionState deletes out of PhysicsEngine. EntityMotionStates are deleted by the PhysicsEntitySimulation. AvatarMotionStates are deleted in the Avatar dtor.	2016-01-07 10:19:46 -08:00
Anthony Thibault	95f821d61a	Merge pull request #6732 from sethalves/set-model-entity-joints hook up a way for scripts to set model-entity joint state	2016-01-05 17:31:18 -08:00
Andrew Meadows	9ab5ef358a	remove dangling whitespace	2016-01-05 16:44:36 -08:00
Seth Alves	b222c12857	unmangle merge	2016-01-05 12:21:50 -08:00
Seth Alves	96f506a98d	code review	2016-01-05 07:27:27 -08:00
Seth Alves	ce1b8ae6f0	Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting	2016-01-04 19:35:36 -08:00
Anthony J. Thibault	c2dd00375d	Merge branch 'master' into tony/soft-attachments	2015-12-29 13:21:37 -08:00
Anthony J. Thibault	098a455b67	AttachmentData operator== bug fix This was causing some changes to not be reflected across the network.	2015-12-18 14:49:33 -08:00
Seth Alves	1a534ff645	Merge branch 'hdr' of github.com:samcake/hifi into near-grab-via-parenting	2015-12-18 13:43:33 -08:00
Anthony J. Thibault	1618e0a92f	Network, Preferences and UI support for soft attachments Added an isSoft field to the AttachmentData which is edited by the Attachment Dialog Menu, sent over the network via AvatarData identity packets and saved in the Interface.ini preferences. AvatarData and AvatarBulkData version number has been bumped. Changed Avatar attachment collections to use smart pointers to models instead of raw ones. Removed _unusedAttachmentModels. I don't think the caching was worth the added code complexity.	2015-12-18 13:32:09 -08:00
Andrew Meadows	d6541e9ee7	angular velocity is a vector, not a quaternion	2015-12-18 11:06:58 -08:00
Seth Alves	b83579e6e5	include queryAABox in physics-induced sends	2015-12-16 17:25:49 -08:00
Seth Alves	0500c21e00	unmangle merge	2015-12-16 16:09:52 -08:00
Seth Alves	9e5116bf4f	Merge branch 'dejitter-hold-action' of github.com:sethalves/hifi into near-grab-via-parenting	2015-12-16 15:56:31 -08:00
Andrew Meadows	7baee8c391	use glm::clamp() instead of std::min() and max()	2015-12-15 18:18:08 -08:00
Andrew Meadows	c3823de353	setClampedTargetScale()-->setTargetScaleVerbose()	2015-12-15 18:18:08 -08:00
Andrew Meadows	33634cdaa1	properly delete departing avatars	2015-12-15 18:18:08 -08:00
Andrew Meadows	e9f52b1211	properly scale avatar collision shape	2015-12-15 18:18:08 -08:00
Seth Alves	c74f8bca49	location getters also return a success boolean so that callers can know if the value they are receiving is bad due to lack of information about an object's parent	2015-12-14 09:13:36 -08:00
Atlante45	6f29d9e7b8	Use strongly typed enum instead of nested alias	2015-12-10 11:10:09 -08:00
Seth Alves	0bf276efa5	adjust method names to fit convention	2015-12-07 14:37:35 -08:00
Seth Alves	f99812a903	adjust method names to fit convention	2015-12-07 14:31:08 -08:00
Seth Alves	fff4e3e831	make SpatiallyNestable setters take values by reference	2015-12-06 12:01:30 -08:00
Ryan Huffman	89c412c324	Merge branch 'master' of https://github.com/highfidelity/hifi into proto-received-message	2015-12-04 11:38:28 -08:00
Seth Alves	0595ef0938	merge from upstream	2015-12-02 09:30:19 -08:00
Brad Davis	9b6ec34f09	Fixing avatar orientation in recordings	2015-12-01 20:51:07 -08:00
Howard Stearns	ef32853d46	When AvatarData parses the .fst, store the (merged) .fbx filename. (Interface gets the .fbx by a separate path, but agents don't have that chance.)	2015-12-01 11:51:22 -08:00
Seth Alves	b7ebe5b92b	merge from upstream	2015-11-30 16:59:52 -08:00
Seth Alves	3402585d1a	fix a crash from previous commit	2015-11-30 16:54:29 -08:00
Seth Alves	5c327edd5a	keep AvatarHashMap::findAvatar from creating bogus avatar entries. remove some more stray consts	2015-11-30 14:08:07 -08:00
Seth Alves	89b78986d5	remove some more stray const	2015-11-30 14:01:17 -08:00
Ryan Huffman	99dd9646bc	Merge branch 'master' of https://github.com/highfidelity/hifi into proto-received-message	2015-11-30 10:20:13 -08:00
Seth Alves	cf39cac7fc	attempt to make SpatiallyNestable data access thread-safe	2015-11-29 12:50:33 -08:00
Seth Alves	facf91faac	minimize diff vs master	2015-11-26 07:13:43 -08:00
Seth Alves	ca75802b9c	unmangle merge	2015-11-26 06:43:28 -08:00
Anthony J. Thibault	f120e10ff4	Merge branch 'master' into tony/remove-joint-states	2015-11-24 15:00:05 -08:00
Ryan Huffman	dac491ef41	Merge branch 'master' of https://github.com/highfidelity/hifi into proto-received-message	2015-11-24 09:59:22 -08:00
Brad Davis	5c2b980a45	Fixing avatar facial blendshapes and attachments in recordings	2015-11-23 22:36:07 -08:00
Seth Alves	ba30e01664	include global position in avatar-mixer protocol so server knows where avatars are in world-space	2015-11-23 14:12:49 -08:00
Brad Davis	64ba5b4f14	Cleaning up old recording files	2015-11-23 09:42:34 -08:00
Anthony J. Thibault	821264a031	Merge branch 'master' of github.com:highfidelity/hifi into tony/remove-joint-states	2015-11-22 16:15:03 -08:00
Seth Alves	abfc3e994a	AvatarData::toFrame expects a scaled transform	2015-11-22 07:18:12 -08:00
Seth Alves	4646c0c103	unmangle merge	2015-11-21 10:49:31 -08:00
Seth Alves	f013f95e9b	merge from upstream	2015-11-21 08:43:00 -08:00
samcake	0dc551409d	Fixing a comment	2015-11-20 15:22:01 -08:00
samcake	e97e864de7	Getting the animation playback to work	2015-11-20 15:05:17 -08:00
Stephen Birarda	19d3d80ff9	fixes for some incorrect assumptions	2015-11-20 11:03:52 -08:00
Anthony J. Thibault	ad4b8e0001	Avatar transmission fixes, moved JointData into shared * Moved JointData into shared library * added methods to the rig to copy into and out of JointData * JointData translations must be in meters this is so the fixed point compression wont overflow, also, it's a consistent wire format.	2015-11-20 10:24:24 -08:00
Stephen Birarda	22f5d4df6d	change signature of copy return	2015-11-19 16:25:33 -08:00
Stephen Birarda	430cb7876d	remove a couple of read lockers for AvatarHashMap	2015-11-19 16:22:56 -08:00
Stephen Birarda	40397add43	fix for extra adds in AvatarManager	2015-11-19 16:15:21 -08:00
Stephen Birarda	6398a922c6	leverage COW for AvatarHash	2015-11-19 15:43:29 -08:00
Stephen Birarda	2a05ec650b	fix locking in AvatarHashMap/AvatarManager	2015-11-19 14:17:48 -08:00
Ryan Huffman	2a416ebc61	Merge branch 'master' of https://github.com/highfidelity/hifi into received-message	2015-11-18 16:52:23 -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 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 Davis	900f425f35	Recording fixes	2015-11-17 15:18:31 -08:00
Brad Davis	cb26fc67fc	Move recording interface back to float/seconds	2015-11-16 14:44:22 -08:00
samcake	89e5db11a0	More fixes	2015-11-13 17:41:41 -08:00
samcake	8c21ac144e	Fixing review comments	2015-11-13 16:45:19 -08:00
Sam Gateau	89d120ab3d	Few fixes to make the recorder.js run	2015-11-12 22:24:11 -08:00
samcake	1fd37b51a2	trying to get somewhere....	2015-11-12 17:54:35 -08:00
Brad Davis	ee1545f649	Cleaning up clip and transform	2015-11-12 11:48:47 -08:00
Brad Davis	f521be10fe	Avatar recording work in progress	2015-11-12 00:33:38 -08:00
samcake	d3d5d3a19e	Removing useless code	2015-11-10 12:02:20 -08:00
samcake	2cf2257783	Fix warning	2015-11-10 09:20:43 -08:00
Sam Gateau	06a87012ad	Removing the setJointTranslations which is not helping...	2015-11-09 23:38:51 -08:00
Sam Gateau	b47c5dbff2	Cleaning the code to remove the old rec format and the use of separate joint Rotationns/Translations arrays	2015-11-09 23:12:04 -08:00
samcake	77e21b7190	Trying to fix the animation recording and playback, but still not good	2015-11-09 18:18:30 -08:00
samcake	2078c753ae	Merge branch 'master' of https://github.com/highfidelity/hifi into controllers	2015-11-09 09:23:59 -08:00
samcake	cbeb56aba4	using the frameInterpolatorCOrrectly	2015-11-06 17:25:50 -08:00
Howard Stearns	314c11e8d4	Make life easier for Sam.	2015-11-06 16:59:46 -08:00
samcake	4dbca68767	Updating the legacy file format to support the joint translation and also fix the replay problem oof the joints going to the moon	2015-11-06 16:24:19 -08:00
samcake	2f9c33dbfb	Merge branch 'master' of https://github.com/highfidelity/hifi into controllers	2015-11-06 09:35:48 -08:00
samcake	46d9a14951	Work in progress, fixing the animation playback	2015-11-06 09:35:20 -08:00
Atlante45	ffafd3194e	Recording audio fixes	2015-11-05 16:46:59 -08:00
Atlante45	07b3597ae3	Fix recording scripts	2015-11-05 14:01:37 -08:00
Seth Alves	fbaa86426c	re-remove the _nextPosition stuff	2015-11-03 16:52:46 -08:00
Seth Alves	60824a1fb0	back out some off-brand changes. add parentChanged call	2015-11-03 16:07:28 -08:00
Seth Alves	3ac0fef1ea	merge from upstream	2015-11-01 15:22:57 -08:00
Brad Davis	49e7d42c2c	Merge remote-tracking branch 'upstream/master' into HEAD	2015-10-30 10:07:40 -07:00
Howard Stearns	96900dab25	Merge pull request #6195 from CrackerHax/master Added AvatarList features for creating userlists in AC scripts	2015-10-29 22:11:57 -07:00
Brad Davis	ccbae81dad	Merge branch 'master' into HEAD Conflicts: interface/src/avatar/SkeletonModel.cpp	2015-10-29 10:24:38 -07:00
Brad Hefta-Gaub	65eae35433	a little more cleanup	2015-10-27 17:09:43 -07:00
Brad Hefta-Gaub	d86f1b50a7	more cleanup	2015-10-27 16:37:43 -07:00
Brad Hefta-Gaub	19743c1f39	gak, build busters and more CR feedback	2015-10-27 16:16:03 -07:00
Brad Hefta-Gaub	133d48ebee	CR feedback	2015-10-27 15:53:48 -07:00
Brad Hefta-Gaub	5a42991e0c	first pass at cleaning up MyAvatars use of PalmData	2015-10-27 13:51:42 -07:00
black plastick	d34fc35544	added AvatarList.avatarSessionChanged(sessionUUID, oldUUID) for AC scripts.	2015-10-27 08:11:20 -04:00
black plastick	f5d12ee2c6	Added AvatarList script events for assigment client scripts: AvatarList.avatarAddedEvent(sessionUUID); AvatarList.avatarRemovedEvent(sessionUUID);	2015-10-26 17:46:08 -04:00
Howard Stearns	7b0b77f4d1	getAvatarHash => withAvatarHash	2015-10-23 16:57:27 -07:00
Seth Alves	61269c3ce8	fix up entity constructors so that setProperties isn't called during the constructor	2015-10-23 13:52:50 -07:00
Brad Hefta-Gaub	f90844449d	fix angular velocity	2015-10-23 13:16:05 -07:00
Seth Alves	22af5b27ab	avoid shared_from_this while constructing	2015-10-23 12:55:48 -07:00
Brad Hefta-Gaub	4a58eeb810	expose deltaRotation as part of MyAvatar.xxxHandPose	2015-10-23 12:14:33 -07:00
Brad Hefta-Gaub	71dfff7c35	first cut at adding MyAvatar.xxxHandPose	2015-10-23 12:00:40 -07:00
Seth Alves	7b08d047b1	when EntityTree::updateEntityWithElement is called on an entity, call it on all the children of that entity	2015-10-22 16:59:56 -07:00
Seth Alves	d86d69aeba	keep track of children. use local position and orientation on the wire.	2015-10-22 15:36:03 -07:00
Seth Alves	f6fe503c51	pass avatar parent information through avatar-mixer	2015-10-22 13:44:04 -07:00
Howard Stearns	624ed7c711	fix comment	2015-10-22 13:14:38 -07:00
Howard Stearns	0d514ad645	Thread-safe avatar list access	2015-10-22 13:02:08 -07:00
Seth Alves	bc99ef778c	change how render engine is told about model position changes	2015-10-20 12:04:29 -07:00
Seth Alves	a78f2a9577	have avatar make use of SpatiallyNestable	2015-10-18 09:48:46 -07:00
Seth Alves	275e77d29e	remove old-style avatar referentials	2015-10-18 07:51:00 -07:00
Ryan Huffman	9ddcfdf94d	Cleanup PacketReceier and ReceivedMessage	2015-10-16 09:21:10 -07:00
Ryan Huffman	7682ab00e3	Add ReceivedMessage and receive progress	2015-10-15 14:09:53 -07:00
Thijs Wenker	c99573ea64	Fixed support for calling setJointMumblers with joint name. Walk.js runs smooth now!	2015-10-15 15:35:35 +02:00
Brad Davis	6f5f6450df	Cleanup CMake files	2015-10-11 00:01:03 -07:00
Seth Alves	14ad1ed6be	fix bug in AvatarData::toByteArray related code. this was causing a few joint translations that hadn't changed to be sent	2015-10-08 18:37:09 -07:00
Anthony J. Thibault	fa864d29f9	Merge branch 'master' into transmit-joint-translation	2015-10-01 16:55:24 -07:00
Anthony J. Thibault	83c3f65b1f	Prevent taking a reference to a QUrl rvalue.	2015-09-30 11:34:38 -07:00
Howard Stearns	96e3c722ed	Quiet once/second logging/updating of other people's default avatars.	2015-09-29 13:04:59 -07:00
Seth Alves	ddeed8b4ee	code review	2015-09-29 06:51:24 -07:00
Seth Alves	874bded236	remove horizontal line-break comments	2015-09-28 18:14:12 -07:00
Seth Alves	50dd8eba45	Relay joint translations across network. Apply animation's root-joint translation to avatar.	2015-09-26 11:40:39 -07:00
Howard Stearns	4d2048c6f6	Let other users see your default avatar. Fixes https://app.asana.com/0/26225263936266/51001490412567	2015-09-20 13:12:13 -07:00
Andrew Meadows	8d5106b072	improved debug render of hand coordinates also cleaned up includes in Hand.h	2015-09-11 13:22:11 -07:00
Howard Stearns	83d14d3380	Protect avatarLock.	2015-09-09 11:11:06 -07:00
Howard Stearns	24f1387579	Consistently use brace initialization in class headers.	2015-09-09 10:34:08 -07:00
Howard Stearns	eb67254e54	Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates	2015-09-08 16:54:14 -07:00
Howard Stearns	26f63a44fc	Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates	2015-09-08 15:30:22 -07:00
Howard Stearns	27f4bca0a4	Cleanup: This appears to be complete and working -- EXCEPT for loading animations on the update thread! Until I figure that out, the answer is to turn off Developer->Avatar->"Enable Avatar Update Threading", run through forward/back/left/right/strafeLeft/strafeRight, and then turn "Enable Avatar Update Threading" back on.	2015-09-08 14:49:58 -07:00
Stephen Birarda	25aeda2e18	Merge branch 'master' of https://github.com/highfidelity/hifi into protocol	2015-09-08 08:40:51 -07:00
Stephen Birarda	c49088846f	add an alias for AvatarDataSequenceNumber	2015-09-08 08:26:14 -07:00
Howard Stearns	d472fd66ff	Cleanup.	2015-09-07 17:26:22 -07:00
Howard Stearns	efeaf21305	Checkpoint smoother.	2015-09-07 16:32:51 -07:00
Howard Stearns	0065c64b31	Snapshot of no-judder, before cleanup.	2015-09-07 09:57:05 -07:00
David Rowe	16346dd717	Fix some build warnings	2015-09-06 16:20:46 -07:00
Howard Stearns	d3106de7c1	Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates	2015-09-04 14:32:58 -07:00
Stephen Birarda	ed19987b7d	resolve conflicts on merge with upstream/master	2015-09-04 12:31:46 -06:00
Seth Alves	218521fc02	put AVATAR_MIN_ROTATION_DOT back to previous value	2015-09-03 16:08:46 -07:00
Seth Alves	0c8848a463	don't update _lastSendJointData if we didn't send	2015-09-03 15:41:40 -07:00
Seth Alves	1071b98260	fix differential avatar-joint sending to work if more than 2 avatars are in the domain	2015-09-03 14:38:46 -07:00
Seth Alves	36ca789d92	fix differential avatar-joint sending to work if more than 2 avatars are in the domain	2015-09-03 14:08:04 -07:00
Howard Stearns	32eb51d0fa	Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates	2015-09-03 13:55:57 -07:00
Andrew Meadows	c61bc190de	fix finger and palm-normal directions for JS	2015-09-02 14:16:02 -07:00
Andrew Meadows	992bd5c9d2	fix sixense and vive rotation readings for palms	2015-09-02 11:37:36 -07:00
Stephen Birarda	e5a10e3174	resolve conflicts on merge with upstream/master	2015-09-01 17:07:32 -06:00
Howard Stearns	8cf71f285d	Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates	2015-09-01 16:03:40 -07:00
Seth Alves	6f80c484b4	cleanups	2015-09-01 13:33:19 -07:00
Seth Alves	76923583ee	Interface only sends joint data to avatar-mixer if they have changed enough since the last send	2015-09-01 13:31:34 -07:00
Stephen Birarda	80cf7b6c76	resolve conflicts on merge with upstream/master	2015-08-27 14:50:04 -07:00
Howard Stearns	8e3d8cd31c	Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates	2015-08-26 16:08:42 -07:00
Howard Stearns	475331a97d	Sprinkle locks everywhere.	2015-08-26 16:08:07 -07:00
Seth Alves	695ffa29c7	call setup_memory_debugger from common macros rather than from every CMakeLists.txt file	2015-08-26 11:09:59 -07:00
Atlante45	179ee73e26	Merge branch 'master' of https://github.com/highfidelity/hifi into update_protocol	2015-08-26 16:50:33 +02:00
Brad Davis	380b0cb23c	Removing tabs from our javascript and C++	2015-08-24 15:26:46 -07:00
Brad Davis	8c7711168c	Merge pull request #5603 from sethalves/linux-memory-debugger memory debugging on linux	2015-08-20 19:19:24 -07:00
Stephen Birarda	e93b360908	expose options property to AI script interface	2015-08-20 12:12:43 -07:00
Seth Alves	c25082d86f	use -fsanitize=address in all code rather than just the top-level links	2015-08-20 10:14:16 -07:00
Stephen Birarda	c8fbb64bbf	fix AvatarHashMap read due to COW	2015-08-19 14:36:16 -07:00
Stephen Birarda	6860f3d126	add readWithoutCopy for clarity in Packet read	2015-08-19 14:32:26 -07:00
Stephen Birarda	0f77ab8611	resolve conflicts on merge with upstream/master	2015-08-18 11:45:55 -07:00
Howard Stearns	0f6c0a3117	Merge branch 'master' of https://github.com/highfidelity/hifi into recapitate	2015-08-13 15:56:13 -07:00
Howard Stearns	2756a00638	Get default avatar url from resources.	2015-08-13 14:23:34 -07:00
Howard Stearns	62941c0914	Remove dead code.	2015-08-13 12:39:30 -07:00
David Rowe	c0439f123b	Merge branch 'master' into 20639	2015-08-12 16:34:53 -07:00
Howard Stearns	a5d8125aa7	Remove obsolete AvatarMixer wire data. (Was duplicated in joint states that are also sent.)	2015-08-11 17:53:49 -07:00
David Rowe	e6473fc8b9	Merge branch 'master' into 20639 Conflicts: interface/CMakeLists.txt interface/src/Application.cpp interface/src/Menu.h tests/ui/src/main.cpp	2015-08-11 12:34:28 -07:00
Bradley Austin Davis	7e60aee1bf	Merge branch 'master' into plugins Conflicts: interface/src/Application.cpp interface/src/Application.h interface/src/avatar/Head.cpp interface/src/avatar/MyAvatar.cpp interface/src/avatar/MyAvatar.h interface/src/avatar/SkeletonModel.cpp interface/src/avatar/SkeletonModel.h interface/src/devices/3DConnexionClient.cpp interface/src/ui/overlays/Overlays.cpp	2015-08-06 11:03:37 -07:00
Stephen Birarda	052978898e	resolve conflicts on merge with upstream master	2015-08-05 11:16:20 -07:00
David Rowe	0c174e27c3	Merge branch 'master' into 20639	2015-08-04 18:36:53 -07:00
David Rowe	f2ae7bfac0	Don't apply saccades to tracked eyes	2015-07-29 15:14:43 -07:00
Andrew Meadows	2c66af67e9	Merge howard/rig into andrew/caesium	2015-07-29 09:04:32 -07:00
Andrew Meadows	0a5ada3c09	remove legacy shapes	2015-07-29 09:02:24 -07:00
Howard Stearns	146ddd2240	Cleanup false starts.	2015-07-27 13:42:18 -07:00
Stephen Birarda	82def6e15f	resolve conflicts on merge with upstream/master	2015-07-24 15:40:35 -07:00
Howard Stearns	1663d095a1	Merge branch 'master' of https://github.com/highfidelity/hifi into rig	2015-07-24 14:08:51 -07:00
Bradley Austin Davis	a60e669d3d	Merge branch 'master' into plugins	2015-07-24 13:38:18 -04:00
Stephen Birarda	974108734a	add a comment for size guard	2015-07-23 17:17:59 -07:00
Stephen Birarda	f919d2985b	don't attempt to send the avatar billboard if too large	2015-07-23 17:17:15 -07:00
Stephen Birarda	df47f1dd0b	add a BasePacket class for headerless packets	2015-07-23 15:20:37 -07:00
Howard Stearns	81e0a1e629	Better name for signal.	2015-07-23 15:09:06 -07:00
Stephen Birarda	aa08bee69f	initial work to make sequence # and bitfield lead all packets	2015-07-23 11:59:37 -07:00
Howard Stearns	5a0c1a9402	Checkpoint testing stuff.	2015-07-22 21:03:48 -07:00
Bradley Austin Davis	114ab9e47f	Merge branch 'master' into plugins	2015-07-22 11:47:56 -04:00
Brad Davis	5744200f64	Merge remote-tracking branch 'upstream/master' into plugins Conflicts: interface/CMakeLists.txt interface/src/Application.cpp interface/src/Application.h interface/src/avatar/MyAvatar.h	2015-07-20 19:21:02 -07:00
Atlante45	8d6ff2d9f9	Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers	2015-07-20 14:50:44 -07:00
Atlante45	256c786e28	Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers	2015-07-17 17:59:19 -07:00
Stephen Birarda	35c8a60f3b	seek to correct place for bulk avatar data	2015-07-17 15:57:52 -07:00
Stephen Birarda	0f534b9f7b	fixes for new read and NLPacketList	2015-07-17 15:43:20 -07:00
Stephen Birarda	fe0cdc0529	put AvatarHashMap slots back to private	2015-07-17 14:35:38 -07:00
Stephen Birarda	eaeaa23f03	resolve conflicts on merge with origin/protocol	2015-07-17 11:10:30 -07:00
Stephen Birarda	357963b6e0	fix reference to packet that is now buffer	2015-07-17 11:06:39 -07:00
Stephen Birarda	e5722098f6	resolve conflicts on merge with upstream/master	2015-07-17 11:06:01 -07:00
Stephen Birarda	7d60b86f52	kill the PacketLister (AKA Huffman 1 : PacketListener 0)	2015-07-17 09:07:39 -07:00
Anthony J. Thibault	e8da4b9586	merge with plugins, needs testing	2015-07-16 18:47:39 -07:00
Stephen Birarda	040c7557da	fix double register for Agent avatar packets	2015-07-16 17:51:06 -07:00
Stephen Birarda	ce6585ccc8	fix AC monitor and AM double register	2015-07-16 17:44:43 -07:00
Atlante45	56886e479d	Use BulkAvatarData packet type for AvatarMixer upstrea	2015-07-16 15:28:53 -07:00
Ryan Huffman	b561014d77	Add head-lean reading back into AvatarData	2015-07-16 14:11:36 -07:00
Ryan Huffman	3429f0f57c	Merge branch 'protocol' of github.com:Atlante45/hifi into protocol	2015-07-16 14:06:21 -07:00
Ryan Huffman	f8f47f99c6	Temporarily disable body lean in avatar	2015-07-16 14:03:36 -07:00
Atlante45	00fbff112f	Process avatar data	2015-07-16 14:03:11 -07:00
Atlante45	c6f6dbd845	Fix QByteArray from rqw data	2015-07-16 09:59:15 -07:00
Stephen Birarda	05dde9d8f5	resolve conflicts on merge with upstream/master	2015-07-15 16:18:47 -07:00
Ryan Huffman	44c99ef89a	Replace bytesAvailable with bytesLefToRead	2015-07-15 10:44:51 -07:00
Atlante45	fbb6a94579	Merge branch 'receive_packets' of https://github.com/huffman/hifi into protocol	2015-07-14 16:36:28 -07:00
Ryan Huffman	38591a8edb	Update avatar billboard loading to use packet.readAll()	2015-07-14 15:43:15 -07:00
David Rowe	bfad3ee02a	Fix eye directions so that they're correct when avatar leans backwards	2015-07-14 14:07:32 -07:00
Stephen Birarda	fa9372875e	fix headers in AvatarHashMap	2015-07-14 13:54:10 -07:00
Stephen Birarda	0637f589b5	add PacketListener to help unregister for packets	2015-07-14 13:52:38 -07:00
Atlante45	c80df94b06	Update includes for moved files	2015-07-13 15:28:55 -07:00
Stephen Birarda	775c1b7310	Merge branch 'receive_packets' of https://github.com/huffman/hifi into atp	2015-07-13 14:26:23 -07:00
Stephen Birarda	859122db5d	update signature of callbacks for avatar packets	2015-07-13 13:32:46 -07:00
Ryan Huffman	6a7cd7417c	Update AvatarData packet processing to work with NLPacket	2015-07-13 12:07:01 -07:00
Brad Davis	29333d0cad	Qt5.5 fixes	2015-07-12 18:52:15 -07:00
Ryan Huffman	d74ce12098	Remove declaration processAvatarMixerDatagram from AvatarHashMap	2015-07-10 15:01:21 -07:00
Ryan Huffman	5a862739aa	Fix shared ptr call in AvatarHashMap	2015-07-10 12:24:17 -07:00
Ryan Huffman	4db3b309b5	Update AvatarHashMap to use QSharedPointer<NLPacket>	2015-07-10 08:45:54 -07:00
Ryan Huffman	5737b3b770	Fix call to size() in AvatarHashMap	2015-07-09 15:32:19 -07:00
Ryan Huffman	dd9dea7a97	Merge remote-tracking branch 'birarda/protocol' into receive_packets Conflicts: interface/src/DatagramProcessor.cpp interface/src/octree/OctreePacketProcessor.cpp libraries/entities/src/EntityEditPacketSender.cpp libraries/networking/src/LimitedNodeList.h libraries/networking/src/NLPacket.h	2015-07-09 14:08:35 -07:00
Ryan Huffman	32b232c87a	Update AvatarHashMap to use packet callbacks	2015-07-09 09:24:28 -07:00
Stephen Birarda	964041d8d3	missed API fixes in AudioClient and AvatarData	2015-07-08 16:53:04 -07:00
Stephen Birarda	4d3659b627	update packet creation in AvatarData to new API	2015-07-08 16:50:35 -07:00
Ryan Huffman	1b5d526444	Add new packet processing to AvatarManager	2015-07-08 15:06:50 -07:00
Stephen Birarda	74940a2132	replace lingering PacketTypes in old format	2015-07-08 10:18:13 -07:00
Anthony J. Thibault	834b75f4c4	work in progress room scale tracking work. sensor to world matrix stored in MyAvatar override setPosition and setOrientation to move sensor to world matrix.	2015-07-06 18:25:42 -07:00
Atlante45	7b5a5a339a	Use make_shared/create to make shared pointers	2015-07-01 19:46:06 -07:00
Atlante45	47634a48a6	Make renderDisplayName const	2015-06-18 15:22:49 +02:00
ZappoMan	a0e51469d3	Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching	2015-05-28 12:36:34 -07:00
Ryan Huffman	8002014dcd	Add <memory> to AvatarData for _ptr	2015-05-27 15:13:25 -07:00
Ryan Huffman	21b5e26dc9	Move AvatarData typedefs to AvatarData.h	2015-05-27 14:52:48 -07:00
Seth Alves	bfa0e9c234	recreate PR #4973 with some additional changes -- removed const keyword from qinvokables for avatar getter methods such as getVelocity	2015-05-27 14:44:23 -07:00
Seth Alves	ba0467aafe	Revert "removed const keyword from Q_INVOKABLE for avatar getter methods such…"	2015-05-27 14:10:45 -07:00
Ryan Huffman	389d5556f5	Update AvatarPointers to use std::_ptr instead of Q*Pointer	2015-05-27 12:36:55 -07:00
Eric Levin	eb0f35e041	removed const keyword from qinvokables for avatar getter methods such as getVelocity	2015-05-27 11:44:37 -07:00
Andrew Meadows	2f4162f447	cleanup of AvatarManger API	2015-05-19 16:53:30 -07:00
Andrew Meadows	f86c419988	stubbery for collidable avatars	2015-05-19 14:15:26 -07:00
Stephen Birarda	6b3cf1ba4a	remove dependency of PacketHeaders on NodeList	2015-05-05 12:19:42 -07:00
Stephen Birarda	94739cf8d3	move number constants out of SharedUtil to NumericalConstants	2015-05-01 10:26:53 -07:00
Andrew Meadows	5a388a0c14	Merge pull request #4722 from birarda/avatar-mixer-debug add option to display AvatarData receive stats with display name	2015-04-29 10:00:24 -07:00
Stephen Birarda	61b4025526	remove the uneeded curly braces for default ctor	2015-04-29 09:33:23 -07:00
Stephen Birarda	c52426385d	code review comments for #4713	2015-04-28 18:28:05 -07:00
Stephen Birarda	f2dcacffd0	show avatar data receive rate by default with display name	2015-04-28 18:27:42 -07:00
Eric Levin	342d3576c9	Added ability to check if an avatar is within specified range of a position from javascript	2015-04-28 14:46:39 -07:00
ZappoMan	37928dcd6d	fix default avatars on first run	2015-04-24 11:30:18 -07:00
Andrew Meadows	4bef5b7b73	Merge pull request #4638 from Triplelexx/myavatar-targetvelocity Myavatar targetvelocity	2015-04-15 14:22:02 -07:00
ZappoMan	ae16bab7c2	Merge branch 'master' of https://github.com/highfidelity/hifi into avatarUI Conflicts: interface/src/Application.cpp interface/src/Application.h	2015-04-14 13:13:15 -07:00
Triplelexx	d2b643d389	Add targetVelocity into MyAvatar simulation MyAvatar sets a target velocity to achieve, this is parsed in the preSimulation controller step.	2015-04-13 23:57:08 +01:00
Seth Alves	9014397167	try again without macro	2015-04-07 09:59:04 -07:00
Seth Alves	d4461f1ecb	put avatars and embedded-webserver and entities logging into their own QLoggingCategory	2015-04-06 16:22:54 -07:00
ZappoMan	1a463a0256	more work on improved avatar UI adding model names and backward compatible support	2015-04-03 17:03:22 -07:00
Philip Rosedale	53970cb530	Merge pull request #4525 from ZappoMan/defaultAvatarBodyFix fix bug in default avatars	2015-03-27 14:54:35 -07:00
ZappoMan	1821683453	fix bug in default avatars	2015-03-27 14:44:35 -07:00
Andrew Meadows	be5fdbf217	enable avatar collisions by default also remove old gravity features	2015-03-27 13:36:20 -07:00
Andrew Meadows	44eca08fa4	PhysicsEngine doesn't need AvatarData MyAvatar now owns its CharacterController fix for bug of phantom collision obj when avatar's physics are disabled	2015-03-24 17:38:35 -07:00
Atlante45	3a11ed0574	Account for stereo audio in recorder	2015-03-17 16:40:26 +01:00
Atlante45	b0fd28beeb	Typo	2015-03-17 16:40:25 +01:00
Andrew Meadows	924ebe1e54	propagate skeleton's bounding box into AvatarData	2015-03-13 09:39:47 -07:00
Andrew Meadows	a1a12465da	able to update avatar controller in PhysicsEngine	2015-03-12 16:36:41 -07:00
Andrew Meadows	feafa0a60b	remove old Ragdoll and avatar interactions	2015-03-11 14:29:03 -07:00
Seth Alves	99300a5bc8	merge from master	2015-03-09 13:39:51 -07:00
Seth Alves	3604fd639a	formatting	2015-03-08 20:03:10 -07:00
Seth Alves	a8b688d540	move _velocity into base class. walking on a cube works	2015-03-04 15:26:02 -08:00
Seth Alves	8eec66c066	merge upstream, avatar can now fall onto a cube	2015-03-03 18:37:16 -08:00
Andrew Meadows	9ad88c3793	Referentials do math using meters	2015-02-26 13:42:08 -08:00
Leonardo Murillo	006b3ed0ac	Merge pull request #4300 from birarda/dependencies NOT MERGEABLE - add some externals as cmake external projects	2015-02-25 13:22:49 -08:00
Philip Rosedale	d74856e01b	add angularVelocity to controller	2015-02-24 11:21:04 -08:00
Stephen Birarda	b2e587dbbd	remove use of include_dependency_includes and use cmake	2015-02-18 14:12:05 -08:00
David Rowe	d704af21ac	Generalize "faceshift" data handling to "facetracker" DDE face tracking data is now broadcast to other avatars.	2015-02-18 12:41:54 -08:00
Stephen Birarda	e99012efbb	updates to build guides to remove soxr	2015-02-17 10:33:12 -08:00
Stephen Birarda	8c998a65ee	use the glm find_package and check externals	2015-02-13 12:50:32 -08:00
Stephen Birarda	a4752aaab0	use external project glm in avatars	2015-02-13 10:22:09 -08:00
Stephen Birarda	e47333a808	specify QScriptable include under QtScript	2015-02-04 11:08:26 -08:00
Stephen Birarda	11f3161029	resolve conflicts on merge with upstream/master	2015-02-04 10:38:05 -08:00
Stephen Birarda	bd0552618f	resolve conflicts on merge with upstream/master	2015-02-02 17:10:13 -08:00
Atlante45	1cfd98b2d7	Name threads	2015-01-31 00:50:12 -08:00
David Rowe	5474c0634e	Merge branch 'master' into 20277 Conflicts: libraries/script-engine/src/ScriptEngine.cpp	2015-01-30 13:49:45 -08:00
Atlante45	19ea9724ab	Re-add accidentally removed int size()	2015-01-30 11:41:14 -08:00
Atlante45	2d973e5288	Move updateMyAvatar to AvatarManager	2015-01-29 16:55:32 -08:00
Atlante45	6b7a391885	move a couple avatar initialisations outside avatar maanger	2015-01-29 16:00:57 -08:00
Atlante45	9095eeeeb9	Return WeakPointer in avatarHashMap	2015-01-29 15:50:59 -08:00
Atlante45	c25ae9d506	Merge branch 'android' of git://github.com/birarda/hifi into android Conflicts: interface/src/Application.cpp libraries/entities/src/EntityCollisionSystem.cpp libraries/entities/src/EntityCollisionSystem.h	2015-01-27 15:04:17 -08:00
Stephen Birarda	54660dd1a2	resolve conflicts on merge with upstream master	2015-01-27 14:24:48 -08:00
Atlante45	4278407137	Account for avatar scale in Hand(Data) get/set When using localToWorld/WorldToLocal type functions	2015-01-26 16:48:33 -08:00
David Rowe	812fbc58fb	Use custom User-Agent string	2015-01-23 19:13:29 -08:00
Atlante45	4eac6cd410	Moved IDENTITY_FRONT/UP/RIGHT to GLMHelpers	2015-01-23 13:19:03 -08:00
Atlante45	ee9f183e14	Update static flag	2015-01-23 12:14:54 -08:00
Atlante45	a616edbb55	Remove avatars dependency on model,gpu,fbx (OpenGL)	2015-01-23 12:14:13 -08:00
Atlante45	6d9deffdaa	Remove avatars dependency to octree	2015-01-23 11:58:22 -08:00
Atlante45	9f58865937	Add AvatarHashMap and AvatarManager to DM	2015-01-23 11:46:11 -08:00
Stephen Birarda	343b09c855	remove AudioClient dependency on Recorder	2015-01-21 13:21:37 -08:00
Stephen Birarda	0eced09f1d	intial removal of Audio to audio-client	2015-01-21 11:49:06 -08:00
Brad Hefta-Gaub	9d45bed0e2	Merge pull request #4103 from Atlante45/applications_diet_cpp11 DependencyManager update	2015-01-14 17:17:07 -08:00
Atlante45	b922b028e9	Fixes body not rotating for other avatars	2015-01-14 16:47:20 -08:00
Atlante45	2a82ff9768	Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11 Conflicts: assignment-client/src/voxels/VoxelServer.cpp interface/src/Application.cpp interface/src/Audio.cpp interface/src/DatagramProcessor.cpp interface/src/Menu.cpp interface/src/Util.cpp interface/src/avatar/MyAvatar.cpp interface/src/ui/ApplicationOverlay.cpp interface/src/ui/PreferencesDialog.cpp libraries/networking/src/NodeList.cpp libraries/shared/src/DependencyManager.h	2015-01-13 11:03:14 -08:00
Atlante45	063e95bd79	Clement doesn't know how to use radians	2015-01-09 14:31:34 -08:00
Atlante45	f2b7cb005a	Removed leans/Changed Head rotation in avatardata packets	2015-01-09 11:16:49 -08:00
Atlante45	16e1fc8c3a	Added isMyAvatar to AvatarData too	2015-01-09 11:16:05 -08:00
Atlante45	05d2887c94	Move Torso twist to HeadData with Lean	2015-01-09 11:15:01 -08:00
Atlante45	6fc3e1cf81	change message size	2015-01-08 11:51:14 -08:00
Atlante45	0bae05b924	Remove chat message	2015-01-08 11:25:53 -08:00
Atlante45	b8a3bdb6bd	Cleanup headers	2015-01-08 11:25:35 -08:00
Stephen Birarda	51bba4884f	resolve conflicts on merge with upstream master	2015-01-05 14:40:48 -08:00
Stephen Birarda	dfb02aea0c	resolve conflicts on merge, add cstring inc	2015-01-05 09:25:30 -08:00
ZappoMan	9630279459	Merge branch 'master' of https://github.com/highfidelity/hifi into voxelEctomy Conflicts: examples/editVoxels.js examples/fallingSand.js examples/growTrees.js interface/src/Application.cpp interface/src/Application.h libraries/avatars/CMakeLists.txt libraries/entities/src/EntityItem.h	2014-12-31 10:50:53 -08:00
Brad Hefta-Gaub	43e6ba77fa	Merge pull request #4007 from AndrewMeadows/inertia Bullet physics part 1	2014-12-31 10:33:00 -08:00
ZappoMan	27d8ccb51e	more voxelEctomy	2014-12-30 19:58:04 -08:00
ZappoMan	49d8f2b2f5	more work on voxelEctomy	2014-12-30 18:52:33 -08:00
Philip Rosedale	dc9937e11a	only twist own body, remove unused head functions	2014-12-30 17:02:53 -08:00
Stephen Birarda	c7a5f3c86c	resolve conflicts and merge with upstream master	2014-12-29 10:59:42 -07:00
Andrew Meadows	9b7e50858a	merge upstream/master into andrew/inertia Conflicts: libraries/avatars/CMakeLists.txt libraries/entities/CMakeLists.txt	2014-12-29 09:15:49 -08:00
Atlante45	327daacecd	Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11 Conflicts: interface/src/Application.cpp interface/src/devices/OculusManager.cpp libraries/networking/src/NodeList.cpp	2014-12-22 13:34:18 -08:00
Sam Gateau	4c670ac17a	merging with upstream master and origin temp0	2014-12-22 10:38:11 -08:00
Sam Gateau	967c6dbc4b	Add the Model library	2014-12-19 16:19:06 -08:00
Stephen Birarda	08581b4dac	Merge branch 'master' of https://github.com/highfidelity/hifi	2014-12-19 12:50:32 -08:00
Stephen Birarda	bc363dbf3b	Merge branch 'master' of https://github.com/highfidelity/hifi	2014-12-19 10:32:41 -08:00
Andrew Meadows	a141ce37e4	merge upstream/master into andrew/inertia	2014-12-19 10:25:03 -08:00
ZappoMan	dd06d1f4a9	added comments to explain hand state	2014-12-19 10:01:14 -08:00
Stephen Birarda	114e3bb2ff	rename cmake macro to represent actual purpose	2014-12-18 16:51:20 -08:00
Stephen Birarda	4f4ffc42d3	add missing link to fbx from avatars	2014-12-18 14:52:16 -08:00
Atlante45	0bd9ed469e	Changed NodeList::getInstance() calls to use the DM	2014-12-17 15:28:25 -08:00
Stephen Birarda	4077a76e46	remove AudioRingBuffer include where not needed	2014-12-16 11:58:12 -08:00
Stephen Birarda	c734bc89a3	move the audio scope into its own class	2014-12-16 11:54:59 -08:00
David Rowe	20b880ca09	Fix avatar hand state decoding for finger laser	2014-12-11 23:07:05 -08:00
David Rowe	fe8937e37e	Make lasers able to emanate from index finger tips	2014-12-11 21:31:08 -08:00
Andrew Meadows	1df6c32a4e	moving Shape* back into shared lib removing dependency of entities lib on physics lib physics lib now depends on entities lib	2014-12-01 16:03:14 -08:00
Atlante45	ae3bcc8f06	No more .f	2014-11-19 16:53:39 -08:00
Andrzej Kapolka	779f5f7614	Default avatar fixes.	2014-11-14 13:02:02 -08:00
Stephen Birarda	e10d132f75	avoid Qt QTimer thread bug by putting SoundCache on same thread	2014-11-13 14:47:28 -08:00
Stephen Birarda	fd6b9c3550	changes to sound class to allow caching of sounds	2014-11-13 10:16:42 -08:00
Stephen Birarda	b7b371ba61	resolve conflicts on merge with upstream master	2014-11-11 20:53:24 -08:00
Stephen Birarda	a8681cd5b6	changes to allow AudioInjectorOptions to operate as a hash from js	2014-11-11 10:24:21 -08:00
Andrzej Kapolka	6445b3aa5d	Linux warnings fixes.	2014-11-07 15:59:16 -08:00
Andrew Meadows	4c3cdf5b7a	move stuff out of shared and into physics library	2014-10-28 13:51:45 -07:00
Andrew Meadows	c1728c0296	Merge upstream/master into andrew/experimental	2014-10-27 10:08:48 -07:00
Atlante45	20c862d199	Fix player loop	2014-10-23 14:35:24 -07:00
Stephen Birarda	8e67c5f534	don't erase from the AvatarHashMap on the wrong thread	2014-10-22 17:35:28 -07:00
Stephen Birarda	7b0f1477a1	expose AvatarList to Interface SE, add avatarWithDisplayName method	2014-10-22 15:28:04 -07:00
Stephen Birarda	f19c5c9850	repair NetworkAccessManager returns, handle custom AS port in assignment-client	2014-10-06 14:57:38 -07:00
Andrew Meadows	01a3eaa26b	added experimental MyAvatar.setSkeletonOffset() for improved walk animations	2014-10-05 19:10:55 -07:00
Sam Gateau	738369e21f	Replacing glutSolidSphere by a cached Geometry Instead of calling glutSolidSphere, just call Application::getInstance()->getGeometryCache()->renderSphere(...) - replaced all the instances of "glutSolidSphere" - Changed the atmosphere shaders so instead of drawing a sphere of the size of the atmosphere, we draw a unit sphere, the vertices get scaled at the right radius in th vertex shader using fOuterRadius	2014-10-03 16:55:58 -07:00
Atlante45	56acc86f4f	Missed some qints	2014-09-30 21:20:37 -07:00
Atlante45	68c25e805a	Switch int64 to int	2014-09-30 14:31:40 -07:00
Atlante45	5f95cbc101	JS hooks	2014-09-30 11:23:33 -07:00
Atlante45	1afdd34577	Added custom audio offset and volume to Player	2014-09-30 11:23:25 -07:00
Atlante45	c99047677f	Members initialisation	2014-09-29 14:49:55 -07:00
Atlante45	6d15728283	frame interpolation for recordings	2014-09-29 12:30:10 -07:00
Atlante45	cf453a8953	removed _isPaused	2014-09-25 19:32:57 -07:00
Atlante45	cf925120ca	Merge branch 'master' of https://github.com/highfidelity/hifi into fix_attachment_bug_with_recording	2014-09-25 19:23:46 -07:00
Brad Hefta-Gaub	0775e9dde4	Merge pull request #3479 from PhilipRosedale/master Improved eye contact, audio driven mouth and brows, linear audio scope	2014-09-25 09:32:37 -07:00
Atlante45	75dc26c9ff	Slider can moved when recording paused or stoped	2014-09-24 16:19:47 -07:00
Atlante45	11e60c864a	Changed recording file format	2014-09-24 15:17:23 -07:00
Philip Rosedale	75e536235c	Avatars look at your camera, not your avatar. Improvements to lookAt code	2014-09-24 14:38:44 -07:00
Atlante45	f536e33d13	Merge branch 'master' of https://github.com/highfidelity/hifi into fix_attachment_bug_with_recording	2014-09-23 14:54:49 -07:00
Atlante45	7ab8c7750c	Extra spaces	2014-09-23 14:37:43 -07:00
Atlante45	3b33db9a6b	Added pause/setCurrentTime/setCurrentFrame JShooks	2014-09-23 14:19:16 -07:00
Atlante45	95c00b1d4e	Added pause behavior + change frame computation	2014-09-23 14:18:54 -07:00
Atlante45	13a5dbf489	Added frame computation and JS hooks	2014-09-23 11:01:21 -07:00
Andrew Meadows	ab53202003	remove warning about signed/unsigned comparison	2014-09-23 09:07:05 -07:00
Atlante45	8393fcc6eb	Frame computation + timerOffset member When jumping inside a recording	2014-09-22 14:01:02 -07:00
Atlante45	58b1db4f09	Added JS hooks for new Player options	2014-09-18 16:49:13 -07:00
Atlante45	29ff8c09d9	Fix LookAtPosition	2014-09-18 15:23:58 -07:00
Stephen Birarda	1a5149af02	add another missing const to readRecordingFromRecFile	2014-09-18 11:29:51 -07:00
Stephen Birarda	b1abdc05a0	add the last missing consts in Recording.h	2014-09-18 11:25:50 -07:00
Stephen Birarda	93d83b707d	use a copy of filename in Recording.cpp to make changes to filename	2014-09-18 11:21:09 -07:00
Stephen Birarda	2ee367fa44	add a couple of missing consts	2014-09-18 11:14:17 -07:00
Stephen Birarda	ac588a569e	add const to recording methods where arguments are passed by reference	2014-09-18 11:12:11 -07:00
Stephen Birarda	6e39f049c8	Merge remote-tracking branch 'clement/rec_file_format_tweaks' into clement-recording-changes	2014-09-18 11:08:59 -07:00
Atlante45	72d8522adc	Fixed typo + removed MesageBoxes	2014-09-18 10:45:12 -07:00
Atlante45	397be962f4	CR fixes	2014-09-18 10:37:36 -07:00
Stephen Birarda	c9c8a1c194	handle another casing issue for Nodelist include	2014-09-18 10:11:34 -07:00
Stephen Birarda	6d335a8634	fix capitalization in NodeList include	2014-09-18 10:02:54 -07:00
Stephen Birarda	1ac6c8a568	Merge remote-tracking branch 'clement/rec_file_format_tweaks' into clement-recording-changes	2014-09-18 10:02:29 -07:00
Atlante45	e0739e4aa8	PreCR fixes	2014-09-18 00:03:02 -07:00
Atlante45	06dd9d0376	Moved Player and Recording to their own files	2014-09-17 23:52:21 -07:00
Atlante45	d27134a7ac	Added getters for the different Player options	2014-09-17 17:06:47 -07:00
Atlante45	34c16b8a74	Convert .rec to new format if necessary	2014-09-17 16:25:48 -07:00
Atlante45	6e55c66d09	Fix radix bug	2014-09-17 16:24:54 -07:00
Andrew Meadows	489871d0d6	added MyAvatar.setMotorVelocity() & friends for JS	2014-09-16 17:09:32 -07:00
Atlante45	c699726ae8	Fixed URLs not read properly	2014-09-16 16:32:14 -07:00
Atlante45	81fc0d3696	Added options to use recording context	2014-09-16 14:50:20 -07:00
Atlante45	f649cd1a6e	Changed how looping occurs in recordings	2014-09-16 14:49:47 -07:00
Atlante45	96995e3aed	Enforce checksums equality	2014-09-16 13:59:30 -07:00
Atlante45	1c5c9cb31b	Fix bug adding first samples twice	2014-09-16 13:57:46 -07:00
Atlante45	72481999df	Compute actual checksum	2014-09-16 12:46:42 -07:00
Atlante45	8573130f07	Write correct Offset ad Length of the data	2014-09-16 12:34:22 -07:00
Atlante45	59637390a2	Add global timestamp to recordings	2014-09-16 12:26:55 -07:00
Atlante45	f5b53a77ab	Merge branch 'master' of https://github.com/highfidelity/hifi into rec_file_format_tweaks	2014-09-16 12:14:11 -07:00
Atlante45	d80a42b800	New recording file format Added header containing: - Magic number - Version number - Data Offset - Data Length - CRC-32 Planned space for metadata Added context block (domain, models, transform, display name, attachments) Improved glm types packing (SHould take about half the space it used to))	2014-09-15 19:19:10 -07:00
Atlante45	ffba243a4f	Added methods to read/write glm types	2014-09-15 19:17:16 -07:00
Atlante45	b28e7e4562	Added RecordingContext support to Player/Recorder Changed meaning of certain values stored in recordings	2014-09-15 19:14:47 -07:00
Atlante45	29f85ecca4	Introduced RecordingContext class	2014-09-15 19:09:40 -07:00
Atlante45	8f65f036dd	Remove deprecated getters	2014-09-15 19:06:09 -07:00
Atlante45	145e11a478	Move one-line method to .h Moved method to .h f line less than 120 characters Added _lookAtPosition to RecordingFrame	2014-09-15 19:01:50 -07:00
Atlante45	9b87e31739	Fixed typo	2014-09-15 18:47:55 -07:00
Andrew Meadows	b2432876ce	More reliable floor detection for avatar movement. Also tweaked max walking speed.	2014-09-15 13:53:37 -07:00
Andrew Meadows	15025bf8d8	fix for flickering avatars	2014-09-08 13:08:08 -07:00
Andrew Meadows	bd8fc75305	fix bug: zero velocity when teleporting to new locations	2014-09-05 17:51:18 -07:00
Andrew Meadows	7be411b4ca	expose _measured_ MyAvatar velocity to JS	2014-09-05 11:44:13 -07:00
AndrewMeadows	bd55da4a83	Merge pull request #3335 from ZappoMan/virtualEntities Model Server to Entity Server Refactoring	2014-09-03 15:48:58 -07:00
Atlante45	a1e6d9e7a1	Protections against null pointers	2014-09-02 12:56:12 -07:00
ZappoMan	0f2a14a359	Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities	2014-09-02 07:52:51 -07:00
Atlante45	9b5b83117f	CR	2014-08-29 14:25:05 -07:00
ZappoMan	2bcad6ab2b	Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities Conflicts: assignment-client/src/Agent.cpp examples/editModels.js	2014-08-28 21:19:56 -07:00
Atlante45	a6bf9d7b90	Handle URL recordings + some safety checks	2014-08-28 11:42:39 -07:00
Atlante45	9df68dc2f1	CR	2014-08-28 10:58:07 -07:00
Atlante45	691ace7cc6	Looping option	2014-08-27 19:05:39 -07:00
Atlante45	465b076998	Removed debug + ignore frame 0	2014-08-26 18:19:26 -07:00
Atlante45	056cd0a4d1	extra line	2014-08-26 18:06:10 -07:00
Atlante45	41461cd322	Added option to playback from current location	2014-08-26 17:23:50 -07:00
Atlante45	dda02b5dcf	Fake faceshift connection while playing back	2014-08-26 15:54:16 -07:00
Atlante45	3826ed0d69	Added setFinalPitch/Yaw/Roll to HeadData	2014-08-26 15:36:08 -07:00
Atlante45	9e686b4096	Moved lean and head rotation inside Player class	2014-08-26 14:36:46 -07:00
Atlante45	b92ae53753	Merge branch 'master' of https://github.com/highfidelity/hifi	2014-08-26 14:34:39 -07:00
ZappoMan	ef8feec91a	fix referentials corruption and removed some debugging	2014-08-26 10:42:46 -07:00
ZappoMan	74585bc593	fix bug in referentials	2014-08-26 10:14:28 -07:00
ZappoMan	4e38cb7c68	more debugging of referentials	2014-08-25 15:12:29 -07:00
Atlante45	f207abdd98	Move Player over to AvatarData for ACs to use	2014-08-21 15:24:19 -07:00
Atlante45	b13604f968	JS API for recording	2014-08-19 16:43:26 -07:00
Atlante45	52640c8482	Various tweaks and code cleanup	2014-08-18 14:23:29 -07:00
Atlante45	73a3a13c59	More recording work	2014-08-12 18:15:48 -07:00
Atlante45	ff0a5df2d6	Joint rotations manipulation helper	2014-08-12 16:12:34 -07:00
AndrewMeadows	e5c2a099b8	Merge pull request #3268 from birarda/take-out-the-trash cmake (in)sanity	2014-08-11 09:15:38 -07:00
Stephen Birarda	b1310c065c	remove TARGET_NAME from cmake macros where it is not required	2014-08-08 13:17:54 -07:00
Stephen Birarda	26f7b1ba62	add macro to link shared dependencies to target	2014-08-08 13:17:54 -07:00
Stephen Birarda	c9f8433a2d	tweak setup_hifi_library to bubble up full path of Qt modules	2014-08-08 13:17:54 -07:00
Stephen Birarda	17df6484d4	remove ssize_t and replace with size_t or int where appropriate	2014-08-08 13:17:53 -07:00
Stephen Birarda	c63e886444	don't look backwards for fbx header from avatars library	2014-08-08 13:17:53 -07:00
Stephen Birarda	93b6f167f5	change more CMakeLists to use simplified hifi library linker	2014-08-08 13:17:53 -07:00
Stephen Birarda	31488e72fe	repairs for interface build to succeed	2014-08-08 13:17:53 -07:00
Stephen Birarda	892e30c5e1	get past assignment-client build after cmake auditing	2014-08-08 13:17:53 -07:00
Stephen Birarda	2bb37f2d64	more Qt module dependencies sorted out for libraries	2014-08-08 13:17:53 -07:00
Stephen Birarda	1059e9a635	add back more required Qt modules	2014-08-08 13:17:52 -07:00
Stephen Birarda	fa26957b23	more CMakeLists cleanup for sub-dependencies	2014-08-08 13:17:52 -07:00
Stephen Birarda	45afce48f7	remember old session UUID in AvatarHashMap to work around ghosting	2014-08-08 13:14:03 -07:00
Atlante45	fe8839b4b8	CR	2014-08-06 10:40:55 -07:00
Atlante45	110b034bcb	Changed updates locations	2014-08-05 18:41:48 -07:00
Atlante45	b360b6c55d	PR cleanup + JS API	2014-08-05 17:07:03 -07:00
Atlante45	39a74cbc28	Few modifications to how avatars update their positions	2014-08-05 12:03:53 -07:00
Atlante45	9999c88d84	Added Referential getters + fixed stupid unpacking bug	2014-08-05 12:01:47 -07:00
Atlante45	f0af2f022e	Pack/Unpack asymetry fix + added forgotten consts	2014-08-04 17:53:21 -07:00
Atlante45	d9dde06c14	Various tweaks to referentials	2014-08-04 14:59:15 -07:00
Atlante45	ee4b7664b0	Merge branch 'master' of https://github.com/highfidelity/hifi into referentials	2014-07-31 13:39:23 -07:00
Atlante45	490dad6bbd	Work on network streaming of referentials	2014-07-31 11:52:03 -07:00
Brad Hefta-Gaub	d4d4069f11	Merge pull request #3225 from birarda/master cmake file cleanup to suppress warnings on cmake 3.0	2014-07-30 19:20:18 -07:00
Atlante45	1138a3a275	Added referentials to AvatarData	2014-07-30 16:50:25 -07:00
barnold1953	66c1aba7f7	Animation improvements, exposed roll/yaw head control.	2014-07-30 15:23:03 -07:00
Stephen Birarda	2796f71419	library cleanup to suppress warnings on cmake 3.0	2014-07-30 15:06:15 -07:00
Atlante45	92b75d29cf	Added referentials base class	2014-07-30 14:18:55 -07:00
AndrewMeadows	361ec5d1ee	Merge pull request #3204 from Barnold1953/jsBlendShapes Exposed Avatar Blendshape control to JS	2014-07-25 09:40:48 -07:00
barnold1953	9ac8b732f0	FIxed error on ubuntu	2014-07-24 10:32:34 -07:00
barnold1953	aba031a125	Proper blendshape JS api.	2014-07-23 16:25:45 -07:00
barnold1953	7c89201ce8	Revert "Moved some FaceShift stuff to FacialAnimationData. Made use of" This reverts commit `f3ae228030`.	2014-07-23 15:54:45 -07:00
barnold1953	6aa9e6b736	Revert "Ability to modify AC avatar blendshapes from JS" This reverts commit `512034fd7c`.	2014-07-23 15:54:40 -07:00
barnold1953	512034fd7c	Ability to modify AC avatar blendshapes from JS	2014-07-23 15:23:27 -07:00
barnold1953	f3ae228030	Moved some FaceShift stuff to FacialAnimationData. Made use of FacialAnimationData	2014-07-22 13:46:29 -07:00
Atlante45	35caef1882	Added pointing behaviour	2014-07-18 15:39:12 -07:00
barnold1953	18c5ebce9e	Merge branch 'master' of https://github.com/highfidelity/hifi into OculusSDK	2014-07-10 16:42:36 -07:00
barnold1953	fc21f7bbac	Removed outdated and incorrect getFingerTipPosition()	2014-07-10 14:21:17 -07:00
Andrew Meadows	0be70063c5	only set hasNewJointRotations true for valid rotation	2014-07-10 11:39:49 -07:00
Atlante45	30644c750d	Switched AvatarData to NetworkAccessManager	2014-07-01 17:46:23 -07:00
Andrew Meadows	ca77eb9d1e	cleanup of avatar collisions, prep for more ragdoll collisions removal of paddle hands particles use general sphere collision path against avatars temp removal of skeleton self collision	2014-06-06 10:51:22 -07:00
Philip Rosedale	d17eeaf35b	remove old oculus yaw offset, expand limit on head yaw	2014-05-29 16:50:13 -07:00
Andrew Meadows	d1a8c18d10	simplified hand index constants	2014-05-27 16:32:29 -07:00
Andrew Meadows	d425b5b322	Enable local gravity when there is a floor nearby.	2014-05-23 15:59:27 -07:00
Stephen Birarda	a9c2e3fe71	put back ssize_t definition	2014-05-20 11:56:06 -07:00
Stephen Birarda	0e7615391c	don't look for GnuTLS from cmake	2014-05-20 10:35:04 -07:00
Andrew Meadows	aad9d0441e	merge upstream/master to andrew/bispinor Conflicts: interface/src/avatar/Hand.cpp interface/src/avatar/SkeletonModel.cpp libraries/avatars/src/HandData.cpp libraries/avatars/src/HandData.h	2014-05-14 09:38:31 -07:00
Andrew Meadows	366e9c7d34	PalmDataA::getPalmDirection --> getNormal()	2014-05-14 09:05:54 -07:00
Andrew Meadows	607094075c	Revert "Merge pull request #2834 from andrew/thermonuclear" This reverts commit `e088c3d115`, reversing changes made to `d124c0319d`.	2014-05-13 10:38:56 -07:00
Brad Hefta-Gaub	e088c3d115	Merge pull request #2834 from AndrewMeadows/thermonuclear remove leap fingers	2014-05-13 08:04:40 -07:00
Andrzej Kapolka	8541df9c32	Remember attachment parameters per joint (as well as the last joint used) so that the gun script correctly allows both guns' positions to be tweaked.	2014-05-12 12:16:30 -07:00
Andrew Meadows	e983be4013	fix typo (finger length = 0.3m, not 0.03m)	2014-05-12 11:52:16 -07:00
Andrew Meadows	cea472b730	remove the last of Leap specific cruft	2014-05-12 11:48:56 -07:00
Andrew Meadows	efb3edf400	Store sixense data in meters not millimeters	2014-05-12 11:39:21 -07:00
Andrew Meadows	49dedb72c9	remove FingerData class and related cleanup	2014-05-12 11:09:12 -07:00
Andrzej Kapolka	c424f6ce69	Save attachment data for attachment model/skeleton model combinations, let scripts use those saved parameters so that you can tweak the location of (for example) the gun and have it saved appropriately.	2014-05-08 18:00:41 -07:00
Andrzej Kapolka	c02b708ee5	Provide the option to avoid making duplicate attachments.	2014-05-08 15:54:30 -07:00
Andrzej Kapolka	f866828db2	Avatar attachment scripting bits.	2014-05-08 15:20:14 -07:00
Andrew Meadows	6c289b682d	move #include <StreamUtils.h> to cpp file	2014-05-07 11:18:50 -07:00
Andrzej Kapolka	2a32700a30	Merge branch 'master' of https://github.com/highfidelity/hifi	2014-05-05 17:03:31 -07:00
Andrzej Kapolka	0021c77789	Missed a spot for decoding avatar identity data.	2014-05-05 16:29:11 -07:00
Andrew Meadows	5ffd307926	Merge upstream/master into andrew/inertia Conflicts: interface/src/avatar/MyAvatar.h	2014-05-05 13:54:25 -07:00
Andrzej Kapolka	65e34f9697	More work on attachment interface.	2014-05-05 13:41:50 -07:00
Andrzej Kapolka	53a2760905	More attachment bits.	2014-05-04 16:24:23 -07:00
Andrzej Kapolka	e0400dbd9c	Working on allowing attachment models to be uploaded.	2014-05-04 15:23:31 -07:00
Andrew Meadows	d8cb84080c	stop avatar integration when standing at rest	2014-05-02 10:43:10 -07:00
Andrzej Kapolka	5e1f18635f	Need to initialize this to an invalid URL, too.	2014-05-01 18:05:01 -07:00
Andrzej Kapolka	322e12b9de	Allow users to clear the head URL and have no separate head model.	2014-05-01 17:55:16 -07:00
Andrew Meadows	8d4dca31c5	add velocity model for controlling avatar motion	2014-05-01 12:05:34 -07:00
Andrew Meadows	c7dbc5984f	add local gravity option parameter for MyAvatar	2014-04-28 16:40:22 -07:00
Andrew Meadows	c2f1507df1	move AVATAR_MOTION_OBEY_GRAVITY to libs	2014-04-25 14:16:42 -07:00
Stephen Birarda	1a895b9342	add property for display name to JS	2014-04-18 14:24:50 -07:00
Stephen Birarda	77202af20d	add debug for erase from AvatarHashMap, repair check for display name	2014-04-17 18:05:22 -07:00
Stephen Birarda	f8106e5063	add an AvatarHashMap to the Agent	2014-04-17 17:49:55 -07:00
Stephen Birarda	47d4ef0b2d	add a method to determine if avatar with display name exists	2014-04-17 17:44:41 -07:00
Stephen Birarda	e75d14139f	fix avatar kill behaviour	2014-04-17 17:21:38 -07:00
Stephen Birarda	3e4369f2ff	kill avatars in hash map after a timeout threshold	2014-04-17 16:57:00 -07:00
Stephen Birarda	69d3360675	add a convenience method to AvatarHashMap to check for avatar removal	2014-04-17 16:48:24 -07:00
Stephen Birarda	e303ce1a12	move some Avatar management to AvatarHashMap	2014-04-17 16:37:40 -07:00
Andrzej Kapolka	0f69bbe23f	More work on animation loading.	2014-04-16 20:39:55 -07:00
Stephen Birarda	54647f0f08	make sure gnutls define for ssize_t comes before gnutls include	2014-04-10 10:27:08 -07:00
Stephen Birarda	2518d314ac	add ssize_t definition for gnutls.h include on Windows	2014-04-10 10:19:45 -07:00
Stephen Birarda	16bb28a4fa	make GnuTLS a system include to suppress warnings	2014-04-10 10:04:02 -07:00
Stephen Birarda	68c445e718	link GnuTLS to targets linking the networking library	2014-04-10 10:00:10 -07:00
Stephen Birarda	d5d52f804f	add a networking library and link from appropriate targets	2014-04-10 09:32:17 -07:00
Stephen Birarda	c208af2246	Merge branch 'master' of https://github.com/highfidelity/hifi	2014-04-09 15:10:48 -07:00
Stephen Birarda	ae4b8348a2	fix header include guards via regex	2014-04-09 12:03:17 -07:00
Andrew Meadows	4b306401af	use slot to change AvatarData::_sessionUUID	2014-04-09 11:32:52 -07:00
Stephen Birarda	684c6b5372	run regex header replacement on all cpp files	2014-04-09 09:35:42 -07:00
Andrew Meadows	229d6cefa2	merge upstream/master into andrew/scripting	2014-04-09 08:17:33 -07:00
Andrew Meadows	b8232b5dfd	AvatarData now stores sessionUUID	2014-04-09 08:11:15 -07:00
Stephen Birarda	6a51df9e38	initial regex replacement of headers	2014-04-08 17:30:36 -07:00
Andrzej Kapolka	fa05a48270	Provide a means of supplying the joint mappings in the FST file so that agent scripts can address joints by name. Closes #2526.	2014-04-07 17:55:36 -07:00
Andrew Meadows	79670563d4	AvatarData stores its sessionID	2014-04-07 14:42:49 -07:00
Andrew Meadows	97ba5250a5	Only simulate() Avatar Models when necessary Also: rebuild collision shapes when Model scale changes	2014-04-02 12:01:18 -07:00
Andrew Meadows	796d20168e	splitting lean input from lean perturbations	2014-03-27 15:30:30 -07:00
Andrew Meadows	7949be0319	PitchTweak and friends become DeltaPitch	2014-03-27 11:14:26 -07:00
Andrew Meadows	b6f2150d2e	HeadData::_yaw and friends change to _baseYaw	2014-03-27 10:37:07 -07:00
Andrew Meadows	fff7a36b54	merge upstream/master into physics project Conflicts: interface/src/avatar/Hand.cpp interface/src/avatar/Hand.h interface/src/avatar/SkeletonModel.cpp interface/src/avatar/SkeletonModel.h interface/src/renderer/Model.h	2014-03-25 15:55:26 -07:00
Andrew Meadows	17d878bc94	sanitiy checking when unpacking AvatarData update	2014-03-25 09:55:43 -07:00
Brad Hefta-Gaub	5abe044c30	Merge pull request #2412 from AndrewMeadows/emergency-fixes datalength sanity checking for AvatarData packet	2014-03-21 14:48:07 -07:00
Andrew Meadows	1214794f05	QMap is not used by AvatarData	2014-03-20 17:03:28 -07:00
Andrew Meadows	22aa9b075d	datalength sanity checking for AvatarData packet	2014-03-20 16:52:40 -07:00
Philip Rosedale	03381c3df8	Merge branch 'master' of https://github.com/worklist/hifi	2014-03-20 15:34:28 -07:00
Andrew Meadows	6440dd1b5f	explicitly send neck angles in avatar data	2014-03-20 11:05:14 -07:00
Philip Rosedale	3ab0288c4f	testing numbered joint movement	2014-03-20 08:54:12 -07:00
Philip Rosedale	c26ed77931	merge fix	2014-03-19 09:16:52 -07:00
Philip Rosedale	9c8a4828f2	remove unused variable, function	2014-03-18 22:41:09 -07:00
Andrzej Kapolka	f9fd0d432f	Fix for reading aggregate avatar packets.	2014-03-18 17:48:57 -07:00
Andrew Meadows	6340024daa	fix bad startPosition in datagram unpack The startPosition was wrong (too far back) and the bytesRead return value was too big and the unpacking of the second chunk of the datagram would start in the middle of the chunk.	2014-03-18 17:42:58 -07:00
Andrzej Kapolka	f8c14a5717	Remove unused variable, reorder includes.	2014-03-18 17:06:01 -07:00
Andrzej Kapolka	635f3b6dc3	Perform the mesh blending in worker threads and only when we've actually received new data. Closes #2075. Closes #2348.	2014-03-18 16:38:05 -07:00
Andrew Meadows	4a1a7898ea	Merge branch 'cleanup' into 'shapes'	2014-03-18 12:53:45 -07:00
Andrew Meadows	02c58447df	merge upstream/master into "shapes" project Conflicts: interface/src/avatar/MyAvatar.cpp interface/src/avatar/SkeletonModel.cpp interface/src/avatar/SkeletonModel.h libraries/avatars/src/HandData.h libraries/shared/src/SharedUtil.h	2014-03-18 12:41:20 -07:00
Andrew Meadows	b69c339279	don't send redundant head rot and hand pos info	2014-03-18 09:39:05 -07:00
Andrew Meadows	3296447af6	remove dupe hand data from avatar updates partial progress toward issue #2256	2014-03-17 18:23:55 -07:00
Andrew Meadows	ed3cf36045	cleanup: AvatarData doesn't derive from NodeData Cleaner Interface since the AvatarData is already not the NodeList. Reduces overhead/confusing code when parsing packets from AvatarMixer.	2014-03-17 14:10:42 -07:00
ZappoMan	851764a705	more warning fixes	2014-03-15 22:36:43 -07:00
Andrew Meadows	a045a87cca	Remove arm stretching, add sixense calibration	2014-03-14 11:11:00 -07:00
Andrew Meadows	e68241d2a9	using glm::degrees() instead of DEGREES_PER_RADIAN	2014-03-12 12:08:27 -07:00
Andrew Meadows	793a760272	merge upstream master into "radians" project	2014-03-11 17:28:36 -07:00
Andrew Meadows	aa8c2fc8cb	use radians instead of degrees (almost) everywhere	2014-03-11 17:26:58 -07:00
Stephen Birarda	d1623e6e4d	fixes for warnings produced by Xcode 5.1	2014-03-11 11:45:13 -07:00
Andrew Meadows	3a0a3f484a	Merge upstream master into "shapes" project	2014-03-10 08:39:55 -07:00
ZappoMan	1ceb05bf09	click harder	2014-03-08 18:22:30 -08:00
Andrew Meadows	47e340dafe	Merge upstream/master Conflicts: interface/src/avatar/MyAvatar.cpp	2014-03-07 09:16:33 -08:00
Andrzej Kapolka	44374732fa	Further joint bits.	2014-03-06 19:30:24 -08:00
Andrzej Kapolka	c5ab32235f	Merge branch 'master' of https://github.com/highfidelity/hifi into joints	2014-03-06 17:09:24 -08:00
Andrzej Kapolka	3adea84b81	Basic joint data sending. Closes #2166 .	2014-03-06 17:07:29 -08:00
Stephen Birarda	ac66f09157	Merge pull request #2194 from AndrewMeadows/cleanup g++ warnings	2014-03-06 15:49:22 -08:00
Andrew Meadows	868e92c0fa	Merge upstream/master' into shapes branch	2014-03-06 12:45:43 -08:00
Andrew Meadows	bca0ea1502	Adding per-palm penetration accumulator	2014-03-06 12:36:52 -08:00
Stephen Birarda	90d4bbee78	Merge branch 'master' of https://github.com/highfidelity/hifi into external-glm	2014-03-06 09:16:22 -08:00
Philip Rosedale	c2a63c4206	Merge pull request #2190 from AndrewMeadows/shapes Collision Shapes	2014-03-05 17:59:42 -08:00
Stephen Birarda	ede32b5f1a	resolve conflicts on merge with upstream master	2014-03-05 15:31:00 -08:00
Andrew Meadows	a014d7883e	minor whitespace formatting	2014-03-05 07:05:27 -08:00
Stephen Birarda	7451cfe130	remove glm so it is referenced only externally	2014-03-04 15:19:47 -08:00
Stephen Birarda	231dc624ff	replace deprecated qt5 macros in cmake with target_link_libraries	2014-03-04 12:41:24 -08:00
Andrew Meadows	5252f22d82	fix warning about signed/unsigned comparison	2014-03-04 10:42:10 -08:00
Stephen Birarda	628f91cd73	complete quoting of varous Cmake commands, closes #1999	2014-03-03 12:15:05 -08:00
ZappoMan	64a3fb950b	fix warning	2014-03-01 11:54:24 -08:00
Andrzej Kapolka	d157428704	When we send data to the avatar mixer, send the tweaked head rotation. Closes	2014-02-28 16:58:22 -08:00
Stephen Birarda	ee70c93a3e	have scripted avatars send billboard, if they have one	2014-02-25 13:42:07 -08:00
Stephen Birarda	f2a70bf275	add support for billboard setting from URL	2014-02-25 13:38:20 -08:00
Philip Rosedale	b0f3ab3ccd	Merge pull request #2057 from ey6es/master I believe this is what was intended for the voxel edit orbit behavior. Yaw the body, pitch the head.	2014-02-23 17:22:07 -08:00
Andrzej Kapolka	6f8f15018c	Allow setting the combined head orientation, which changes the body yaw and applies the rest to the head. Closes #2050.	2014-02-21 17:52:20 -08:00
Andrzej Kapolka	ac02609bc2	The basic billboard behavior, closes #1864 .	2014-02-21 15:38:49 -08:00
Andrzej Kapolka	10ce2cb3f0	Working on sending the billboards over the network.	2014-02-21 11:49:29 -08:00
Andrzej Kapolka	d8321bd419	Merge pull request #2034 from birarda/master fixes for scripted avatars	2014-02-21 10:14:41 -08:00
Jose Carlos	354c9bff09	Correct text position for default and non default meshes Bounding box for text background is now text dependent, much nicer now	2014-02-21 00:29:52 +01:00
Stephen Birarda	4fbe8acd1e	fix face and skeleton model URL Q_PROPERTY macros	2014-02-20 11:12:53 -08:00
Stephen Birarda	ee9f8937e3	fix a silly typo	2014-02-19 18:03:34 -08:00
Stephen Birarda	4ee416ba96	fixes for scripted avatars, closes #2033	2014-02-19 16:55:24 -08:00
Jose Carlos	828508bbf1	merged from master	2014-02-19 23:01:13 +01:00
Andrew Meadows	07a12c1bd4	Removing unused declaration of static method	2014-02-19 09:28:34 -08:00
Andrew Meadows	c134b8de5b	Remove Avatar::_hand, use AvatarData::_handData	2014-02-18 17:08:12 -08:00
Andrew Meadows	4565599fb3	Removing unused cruft: setHeadData() and friend	2014-02-18 15:40:38 -08:00
Jose Carlos	59f8851b50	Merge remote-tracking branch 'upstream/master' into 19489	2014-02-19 00:05:16 +01:00
ZappoMan	5cf0ad46e7	Merge pull request #2000 from gaitat/master Worklist Job #19503	2014-02-18 09:47:26 -08:00
Jose Carlos	0ec554ec82	Added fadein and fadeout animations for display name	2014-02-18 00:49:26 +01:00
Jose Carlos	e7b54a9ef4	merged from master	2014-02-17 21:59:53 +01:00
Andrew Meadows	4848aa1d16	Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interaction	2014-02-17 09:14:06 -08:00
Jose Carlos	a8f1f9a00a	Added animation for fade out	2014-02-16 14:25:41 +01:00
gaitat	e30cf33a03	Fix for Worklist Job #19503 Formatting errors	2014-02-15 23:04:58 -05:00
Jose Carlos	af48998cc7	Fixed position of display name: we take into account skeleton and head's height Saved opengl state in renderDisplayName Moved display data to AvatarData Unified static chat function for chat and display name	2014-02-15 18:40:36 +01:00
gaitat	fcd44f5817	Fix for Worklist Job #19503	2014-02-15 08:16:05 -05:00
gaitat	eee839f423	Merge branch 'master' of github.com:highfidelity/hifi	2014-02-14 20:12:39 -05:00
Andrew Meadows	335141049c	Cleaning up collision check API's and re-enabling collisions with particles.	2014-02-14 16:33:19 -08:00
Jose Carlos	19cb20f0cd	Added rect around the display name with proper size, paying attention to QFontMetrics data Fully wired up the message sending and receiving from server	2014-02-15 01:05:21 +01:00
Jose Carlos	04c59b825e	merged from master	2014-02-14 20:52:22 +01:00
gaitat	58e773340a	Worklist Job #19503 Exposing the average audio intensity to javascript through the MyAvatar object.	2014-02-14 09:40:59 -05:00
Andrzej Kapolka	91fac4eebe	Merge branch 'master' of https://github.com/highfidelity/hifi	2014-02-13 17:38:23 -08:00
Jose Carlos	b899834c54	Show "displayname" in correct position Show "displayname" when on mouse hover Persistant displayname data	2014-02-14 00:23:21 +01:00
Andrew Meadows	ee4733d0bd	Fixing a comment.	2014-02-13 12:41:23 -08:00
Andrew Meadows	439cbe3f87	Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interaction Conflicts: interface/src/avatar/Hand.h interface/src/avatar/MyAvatar.cpp	2014-02-13 12:36:01 -08:00
Andrew Meadows	3a8aa0c47e	Removing HeadData::findSpherePenetration() as unused cruft.	2014-02-13 10:02:16 -08:00
Jose Carlos	319d1f6795	Wired up the send of the display data to the servers Added the renderDisplayName in Avatar	2014-02-12 00:54:50 +01:00
Andrzej Kapolka	3c535e6c9c	These need to be FST files, too.	2014-02-11 14:38:44 -08:00
ZappoMan	4b5e633258	tweaks to hydraMove.js, added scale to MyAvatar JS	2014-02-10 19:48:51 -08:00
Andrew Meadows	4edc6cd88b	Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interaction	2014-02-10 15:42:56 -08:00
Stephen Birarda	3e90bcd523	use shorter default URLs, set as placeholder text in prefs	2014-02-10 11:28:22 -08:00
Stephen Birarda	712692f8bf	add fallback default URLs for head and body models	2014-02-10 11:15:35 -08:00
Andrew Meadows	be1aaee359	Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interaction	2014-02-10 09:05:08 -08:00
Philip Rosedale	03bc5adf64	Add Audio Noise Reduction	2014-02-08 16:35:37 -08:00
Andrew Meadows	0a4eec448e	Removing findSpherePenetration() from AvatarData class	2014-02-07 10:47:00 -08:00
Stephen Birarda	a823722d27	add writeDatagram helper to NodeList to insert md5 hash	2014-02-06 14:28:58 -08:00
Stephen Birarda	cb6316bf4d	fix KeyState enum spacing	2014-02-06 11:45:52 -08:00
Stephen Birarda	f10404b31e	allow setting of avatar URLs via AvatarData properties	2014-02-06 11:45:37 -08:00
Stephen Birarda	e72f6d16cc	rename NodeList ownerUUID to sessionUUID	2014-02-06 11:43:23 -08:00
Stephen Birarda	092c969e75	more repairs to face and skeleton model passing	2014-02-04 15:48:31 -08:00
Stephen Birarda	adaa36a51d	repairs to key-framed URL sending through avatar-mixer	2014-02-04 15:28:27 -08:00
Stephen Birarda	3959209bc2	complete movement of URLs to AvatarData for re-usability	2014-02-04 14:49:56 -08:00
Stephen Birarda	2b80a5fbb8	move face/skeleton model URLs to AvatarData	2014-02-04 14:40:41 -08:00

... 13 14 15 16 17 ...

1828 commits