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
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
