Commit graph

897 commits

Author SHA1 Message Date
Howard Stearns
314c11e8d4 Make life easier for Sam. 2015-11-06 16:59:46 -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
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
Brad Hefta-Gaub
f90844449d fix angular velocity 2015-10-23 13:16:05 -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
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
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