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
