Commit graph

564 commits

Author SHA1 Message Date
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
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