Andrew Meadows
d6541e9ee7
angular velocity is a vector, not a quaternion
2015-12-18 11:06:58 -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
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