ZappoMan
834a447d62
remove debugging code
2017-04-26 18:36:44 -07:00
ZappoMan
1f9e07b828
more logging
2017-04-26 16:40:13 -07:00
humbletim
f8bbd9174c
Merge remote-tracking branch 'upstream/master' into 21281
2017-04-26 18:26:15 -04:00
ZappoMan
7154a11192
add some more logging
2017-04-26 14:03:36 -07:00
Andrew Meadows
4511156d7b
cache avatar identity info forever
2017-04-26 12:50:48 -07:00
ZappoMan
517bbc795f
interface/
2017-04-26 11:29:42 -07:00
ZappoMan
5164aa4056
hacking
2017-04-25 18:21:09 -07:00
ZappoMan
382645ddd0
more cleanup
2017-04-24 18:01:54 -07:00
ZappoMan
aa955ee360
Merge branch 'master' of https://github.com/highfidelity/hifi into retrySkeletonURL
2017-04-24 17:36:30 -07:00
ZappoMan
c9aad6b762
new approach to the tpose fix, as well as other improvements
2017-04-24 17:36:05 -07:00
humbletim
28b3eef7aa
add getJointTranslations() methods
2017-04-24 19:22:02 -04:00
ZappoMan
088cdae320
CR feedback
2017-04-21 11:14:47 -07:00
ZappoMan
f133713d0e
CR feedback
2017-04-21 10:21:34 -07:00
ZappoMan
fbc699d6b2
handle overflow case
2017-04-21 09:30:00 -07:00
ZappoMan
c03182546b
some cleanup
2017-04-21 09:11:51 -07:00
ZappoMan
125b3d5f4e
ignore old identity packets
2017-04-21 07:51:17 -07:00
ZappoMan
c197979354
add more logging
2017-04-20 18:36:00 -07:00
ZappoMan
e89b6c5d2c
some initial debugging on tpose avatars
2017-04-20 17:26:31 -07:00
kunalgosar
ffdbc12968
copy into new vector
2017-04-18 12:20:03 -07:00
kunalgosar
06c5fa0585
correctly resizing blendshapes vector
2017-04-18 11:44:59 -07:00
kunalgosar
d215856b23
cleanup to blendshapes
2017-04-18 11:44:59 -07:00
kunalgosar
0a295fc258
setBlendshapes will presist
2017-04-18 11:44:59 -07:00
Zach Fox
e13000410e
Whoops
2017-04-17 11:02:27 -07:00
Andrew Meadows
e364b8d33e
avatar-mixer resends to avoid stale avatar
2017-04-13 13:35:59 -07:00
Zach Fox
6569de697d
Merge pull request #10187 from zfox23/fix/getAvatar_Fix
...
Fix FB3999; Fix crashes caused by getAvatar() design bug
2017-04-11 11:17:48 -07:00
Stephen Birarda
db6fc40277
fix ScriptAvatar promotion of AvatarData
2017-04-10 22:15:45 -07:00
Stephen Birarda
84a5807ff1
return ScriptAvatarData raw pointer from getAvatar
2017-04-10 22:15:45 -07:00
Zach Fox
16be0ca70c
Birarda's CR changes
2017-04-10 22:15:44 -07:00
Zach Fox
5edd5d2b30
It's working...it's workinggit add -A!
2017-04-10 22:15:44 -07:00
Zach Fox
a16e261735
Checkpoint before a number of confusing changes
2017-04-10 22:15:44 -07:00
Zach Fox
297da90118
Semicolons lol
2017-04-10 22:15:44 -07:00
Zach Fox
bc75ff4462
Checkpoint
2017-04-10 22:15:44 -07:00
Zach Fox
177445c371
Does this work?
2017-04-10 22:15:44 -07:00
Stephen Birarda
4ed22ad7ac
move audio loudness to AvatarData, change AvatarData to ScriptOwnership
2017-04-10 22:15:44 -07:00
Zach Fox
1ed53113a9
Commit for birarda - testing QSharedPointer instead; doesn't work right now
2017-04-10 22:15:44 -07:00
Zach Fox
6ddd7a612c
Initial pass at fix looks promising
2017-04-10 22:15:44 -07:00
Andrew Meadows
662c34c266
fix avatar scale animation and avatar render debug
2017-04-07 11:06:16 -07:00
Zach Fox
8a96969471
Merge pull request #9873 from highfidelity/PAL_v2
...
PAL v2.0
2017-03-31 17:00:41 -07:00
Andrew Meadows
7100f44927
refresh AvatarData when receiving identity data
2017-03-28 21:03:01 -07:00
Zach Fox
e1a880a5d4
Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2
2017-03-27 09:10:12 -07:00
Seth Alves
66f8e4063d
Merge pull request #9984 from Atlante45/fix/warnings
...
Fix warnings
2017-03-26 07:03:33 -08:00
Zach Fox
e88895935b
Revert "Actually merge from master"
...
This reverts commit 056d6fbe4f
2017-03-24 17:56:48 -07:00
Zach Fox
056d6fbe4f
Actually merge from master
2017-03-24 10:10:17 -07:00
Atlante45
d4353e1d19
Fix warnings
2017-03-23 11:39:42 -07:00
Triplelexx
31ec9b832f
rename fronts to forwards
2017-03-22 18:43:30 +00:00
Triplelexx
b7980569cc
change all references of IDENTITY_FRONT to IDENTITY_FORWARD
2017-03-21 22:13:33 +00:00
Zach Fox
fc2a501474
Cleanup JS<->QML messaging
2017-03-16 15:38:39 -07:00
kunalgosar
d2a2ba1846
Fixed recording bug
2017-03-07 17:19:21 -08:00
Zach Fox
718ecea404
Potential non-spammy solution using pseudo-state
2017-03-06 10:03:41 -08:00
Zach Fox
cfb8534d71
Comment
2017-03-06 10:03:41 -08:00
Zach Fox
c9c07c4269
Basically rebase and squash
2017-03-06 10:03:41 -08:00
Andrew Meadows
c6730f7c58
Merge pull request #9745 from AndrewMeadows/faster-avatar-updates
...
Faster avatar updates
2017-02-28 10:55:21 -08:00
Howard Stearns
a9b8045697
Merge pull request #9720 from howard-stearns/filter-pal-by-view-distance
...
Filter pal by view distance
2017-02-24 11:10:13 -08:00
Andrew Meadows
0657ca1e5e
remove unnecessary context brackets
2017-02-23 17:36:45 -08:00
Andrew Meadows
e54812430e
avoid unnecessary copy of priority_queue
2017-02-23 17:36:45 -08:00
Andrew Meadows
ee5971c39e
no need to calc length of normalized vector
2017-02-23 17:36:45 -08:00
Brad Hefta-Gaub
1b7ec7d61e
Merge branch 'master' of https://github.com/highfidelity/hifi into avatarBandwidthBudgetImprovements
...
Conflicts:
libraries/avatars/src/AvatarData.cpp
2017-02-23 13:50:16 -08:00
kunalgosar
3af05ece7d
Made QScript Object more JS friendly
2017-02-23 10:57:06 -08:00
kunalgosar
99e51e88ae
Add QMetaObject for AvatarEntityMap
2017-02-23 10:57:06 -08:00
Brad Hefta-Gaub
dde9640c66
remove old full rate distance code
2017-02-23 10:29:17 -08:00
Howard Stearns
cddba43837
Merge branch 'master' into filter-pal-by-view-distance
2017-02-23 08:25:16 -08:00
Brad Hefta-Gaub
4f17498daf
fix warning
2017-02-23 00:19:06 -08:00
Brad Hefta-Gaub
06f0087459
wire up radius properly
2017-02-22 22:36:37 -08:00
Brad Hefta-Gaub
edf7c016a1
more cleanup
2017-02-22 22:06:28 -08:00
Brad Hefta-Gaub
05995163cf
add support for tuning sorting
2017-02-22 09:49:47 -08:00
Brad Hefta-Gaub
01fd0860bf
Merge branch 'master' of https://github.com/highfidelity/hifi into avatarBandwidthBudgetImprovements
...
Conflicts:
interface/src/avatar/AvatarManager.cpp
2017-02-22 08:47:03 -08:00
Brad Hefta-Gaub
4c42e95607
add some debugging
2017-02-22 08:13:37 -08:00
Brad Hefta-Gaub
8cc0b383c4
wire up bandwidth buget to sorting
2017-02-21 16:22:22 -08:00
Brad Hefta-Gaub
2017ea4491
hacking on using sorted avatars for bandwidth budget
2017-02-21 14:18:00 -08:00
howard-stearns
15d8041683
snapshot working, before button change
2017-02-21 13:14:45 -08:00
Brad Hefta-Gaub
66a6666b52
more cleanup, improved stats, port throttling
2017-02-18 12:29:01 -08:00
Brad Hefta-Gaub
42d916a719
fix warnings
2017-02-17 21:58:48 -08:00
Brad Hefta-Gaub
291b823cfa
const cleanup and fix crash
2017-02-17 18:28:07 -08:00
Brad Hefta-Gaub
92ca7de0bf
some tweaks to support too large avatar data
2017-02-17 10:12:35 -08:00
Brad Hefta-Gaub
d22f4c1dd7
partial const migration work so mixer will not side-effect AvatarData
2017-02-15 21:29:03 -08:00
Brad Hefta-Gaub
faa8e629a0
checkpoint
2017-02-15 20:28:32 -08:00
Brad Hefta-Gaub
f433347362
Merge pull request #9652 from sethalves/avatar-as-child-fixes
...
some fixes for when an avatar is a child of something else
2017-02-14 09:07:47 -08:00
Seth Alves
5ee484a592
don't send avatar localPosition unless the avatar has a parent, even if sendAll is true
2017-02-13 13:36:07 -08:00
Seth Alves
b333126cbe
avoid sending localPosition for avatars with no parent
2017-02-13 12:20:07 -08:00
Seth Alves
107442eea0
avoid extra sends to localPosition
2017-02-12 11:56:38 -08:00
Seth Alves
bc5f563f57
make _parentID and _parentJointIndex private to avoid accidental direct access
2017-02-12 11:37:29 -08:00
Seth Alves
0c2abc9883
fix handling of an avatar's parent changing
2017-02-12 10:01:30 -08:00
Seth Alves
1164a1b3bf
some fixes for when an avatar is a child of something else
2017-02-12 08:27:39 -08:00
Andrew Meadows
66a315cb9c
cap number of avatar entities
2017-02-10 13:14:20 -08:00
Andrew Meadows
c551a41e0a
restore exposure of setAvatarEntityData() to JS
2017-02-10 13:14:20 -08:00
Andrew Meadows
0e504e9ec6
make methods private: avoid sanity check logic
2017-02-10 13:14:20 -08:00
Brad Hefta-Gaub
57e0dadd65
CR
2017-02-09 11:35:00 -08:00
Brad Hefta-Gaub
c2171ca08f
Merge branch 'master' of https://github.com/highfidelity/hifi into avatarSimulationStats
...
Conflicts:
libraries/avatars/src/AvatarData.h
2017-02-08 16:52:38 -08:00
Brad Hefta-Gaub
6c41a25032
more stats
2017-02-08 16:51:00 -08:00
Brad Hefta-Gaub
b399420190
CR
2017-02-08 15:42:59 -08:00
Brad Hefta-Gaub
eedfc4fd38
fix various bot related bugs
2017-02-08 12:35:00 -08:00
Zach Fox
5ea3c5dffd
Skipped this line
2017-02-01 18:13:24 -08:00
Zach Fox
4af5118654
First pass
2017-02-01 17:04:21 -08:00
Seth Alves
ac475300f6
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-01-30 08:15:29 -08:00
Thijs Wenker
a2da1e3dc1
Merge branch 'master' into fix-ac-playback-audio
2017-01-27 21:00:57 +01:00
Seth Alves
fa61bbe2a6
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-01-26 18:21:39 -08:00
Thijs Wenker
cdc0f3ddd2
- make AC recording audio play with right encoding
...
- spelling fix
2017-01-27 01:19:11 +01:00
ZappoMan
af426063ac
fix bad merge
2017-01-26 15:19:25 -08:00
ZappoMan
4c80422a73
Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo
2017-01-26 14:34:58 -08:00
Seth Alves
db38503d57
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-01-26 13:48:59 -08:00
Andrew Meadows
b8afc87ad9
remove cruft
2017-01-26 08:35:26 -08:00
Andrew Meadows
e65d9309b3
remove cruft: Avatar::setShouldDie()
2017-01-26 08:35:26 -08:00
Andrew Meadows
88bf126168
remove old avatar culling and LOD logic
2017-01-26 08:35:25 -08:00
ZappoMan
1309af6d7a
CR feedback
2017-01-24 12:47:47 -08:00
ZappoMan
44b8a57ed3
more CR feedback
2017-01-24 12:18:33 -08:00
ZappoMan
8b662647bd
CR feedback
2017-01-24 12:01:57 -08:00
ZappoMan
0655b47dd7
fix warnings
2017-01-23 16:44:55 -08:00
ZappoMan
6801099cd9
more cleanup
2017-01-23 16:03:07 -08:00
ZappoMan
81b5a3c585
more cleanup
2017-01-23 15:12:54 -08:00
ZappoMan
5f9f051c3c
more tweaks
2017-01-23 15:01:50 -08:00
ZappoMan
e0bad95257
some cleanup
2017-01-23 13:18:55 -08:00
ZappoMan
29fff2e556
Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo
2017-01-23 13:09:59 -08:00
ZappoMan
292d472a59
checkpoint - got first cut at distance based rotation tolerance working
2017-01-23 13:06:29 -08:00
Seth Alves
b57803057d
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-01-18 06:38:44 -08:00
ZappoMan
6e5e9d3492
more work
2017-01-16 18:28:01 -08:00
Zach Fox
e98a40c30e
Does this work?
2017-01-16 14:43:30 -08:00
Zach Fox
3b56f46206
Style changes
2017-01-16 13:18:24 -08:00
Zach Fox
32e330320e
Cleanup after rebase
2017-01-16 11:26:57 -08:00
Zach Fox
2f176f50fa
Another checkpoint
2017-01-16 10:44:54 -08:00
ZappoMan
c9c311e275
checkpoint for distance joints
2017-01-15 11:47:48 -08:00
ZappoMan
3a9a6e8283
local position tweaks
2017-01-13 09:09:29 -08:00
ZappoMan
ee4df20df3
duh
2017-01-12 19:27:28 -08:00
ZappoMan
2e48444422
hack
2017-01-12 19:03:58 -08:00
ZappoMan
aed1b69ee0
make the avatar bounding box be avatar local and only change when it actually changes
2017-01-12 17:19:06 -08:00
ZappoMan
dd85cd9558
one more shot at kens way
2017-01-12 08:48:33 -08:00
ZappoMan
0e600fc8fd
more audio loudness tweaks
2017-01-12 07:56:09 -08:00
ZappoMan
fe06dfdca7
tweak audioLoudness packing
2017-01-11 18:58:43 -08:00
ZappoMan
0661531e3a
try another version of an 8bit audio loudness
2017-01-11 17:51:12 -08:00
ZappoMan
407ad633e0
more cleanup use kens 1 byte audio gain
2017-01-11 11:01:49 -08:00
Anthony J. Thibault
9db6806026
In desktop mode, tablet is in front of camera.
...
* added a new fauxJointIndex for the camera. CAMERA_MATRIX_INDEX = -7
this can be used to attach objects to the camera.
* WebTablet.js has been changed to detect when entering and exiting HMD mode
to move the tablet appropriately.
There's a known bug with the tablet entity position lagging the camera by one frame.
2017-01-10 11:31:45 -08:00
ZappoMan
182edf0e9a
change avatarOrientation to use SixByteQuat packing
2017-01-10 09:41:11 -08:00
ZappoMan
8bbfb51419
some cleanup
2017-01-10 08:37:01 -08:00
ZappoMan
eadb1758f9
adding some rate debugging
2017-01-09 17:07:47 -08:00
ZappoMan
13198fd949
add datarate
2017-01-09 13:57:59 -08:00
Brad Hefta-Gaub
ef7b9bfde0
Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo
2017-01-09 10:07:05 -08:00
Brad Hefta-Gaub
785582057e
more comments
2017-01-08 20:35:52 -08:00
Brad Hefta-Gaub
251495978c
more work on delta sending
2017-01-05 19:46:19 -08:00
Zach Fox
495925a017
This behavior was harder to change than expected...
2017-01-05 16:58:32 -08:00
Brad Hefta-Gaub
5acae04420
fix some warnings
2017-01-04 19:40:03 -08:00
Brad Hefta-Gaub
acca9dbe87
Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo
...
Conflicts:
libraries/networking/src/udt/PacketHeaders.cpp
libraries/networking/src/udt/PacketHeaders.h
2017-01-04 18:07:22 -08:00
Brad Hefta-Gaub
99f180f945
more hacking
2016-12-29 08:16:19 -08:00
Zach Fox
800389cf20
Remove HRS logging
2016-12-28 14:37:19 -08:00
Brad Hefta-Gaub
c7a5e873df
debug by sending all
2016-12-27 18:34:47 -08:00
Brad Hefta-Gaub
73bfc069da
more work on only sending changes
2016-12-27 17:19:55 -08:00
howard-stearns
0ad9786f6b
requestsDomainsListData
2016-12-27 10:14:20 -08:00
Brad Hefta-Gaub
be61052368
check point
2016-12-26 12:12:23 -08:00
Brad Hefta-Gaub
474cb604f1
fix unix error, don't send all all the time
2016-12-23 10:43:34 -08:00
Brad Hefta-Gaub
01d48a5e27
grrr
2016-12-23 10:18:48 -08:00
Brad Hefta-Gaub
62b4a132a0
more hacking
2016-12-23 09:02:13 -08:00
Brad Hefta-Gaub
02a6060b5e
hacking on new format
2016-12-22 16:16:44 -08:00
Brad Hefta-Gaub
977cda3d2e
adjust audio loudness radix so we can support the entire range
2016-12-21 19:10:19 -08:00
Brad Hefta-Gaub
82dd9412ab
tweaks, using packed scalar for audio loudness
2016-12-21 17:21:28 -08:00
Brad Hefta-Gaub
8e7b062aa2
cleanup avatar data to include better documentation
2016-12-21 11:52:24 -08:00
Brad Hefta-Gaub
be62df2001
Merge branch 'master' of https://github.com/highfidelity/hifi into addViewFrustumToAvatarMixer
2016-12-21 08:59:29 -08:00
Brad Hefta-Gaub
5e65e3991c
CR feedback
2016-12-20 21:03:10 -08:00
howard-stearns
a6e353d75f
read lock, not write
2016-12-20 16:25:23 -08:00
Brad Hefta-Gaub
d09afa9454
Merge branch 'master' of https://github.com/highfidelity/hifi into addViewFrustumToAvatarMixer
...
Conflicts:
assignment-client/src/avatars/AvatarMixer.h
assignment-client/src/avatars/AvatarMixerClientData.h
libraries/avatars/src/AvatarData.cpp
libraries/networking/src/udt/PacketHeaders.h
2016-12-20 16:25:12 -08:00
howard-stearns
3f4faec15f
Fix idententity packet in AC
2016-12-20 16:14:59 -08:00
Brad Hefta-Gaub
9b11c7cc9c
Merge branch 'master' of https://github.com/highfidelity/hifi into removeLogSpam
...
Conflicts:
libraries/networking/src/NodeList.cpp
2016-12-20 10:46:57 -08:00
Brad Hefta-Gaub
dbbed462b4
cleanup naked qDebug() calls
2016-12-19 22:24:25 -08:00
howard-stearns
a45e4da75f
Initialize AvatarMixerClientData with the proper node id (should not be
...
zeros for everyone). Then, in interface, check identity packets for self
and make sure they're handled.
2016-12-19 15:22:42 -08:00
howard-stearns
3adc78fecc
Merge branch 'master' of https://github.com/highfidelity/hifi into sessionDisplayNames
2016-12-16 14:16:06 -08:00
howard-stearns
49fd4216de
sessionDisplayName set at server and passed to all clients (including
...
oneself)
2016-12-16 14:15:20 -08:00
Andrew Meadows
ee6a9f4506
adding profile stats relating to avatar CPU costs
2016-12-16 13:41:31 -08:00
Brad Hefta-Gaub
6d7d3551d9
added some stats to the mixer fixed debug logging, improved timer precision
2016-12-15 18:32:11 -08:00
Brad Hefta-Gaub
ed19b4b592
remove compression at the per avatar data buffer for now, since it gave no benefit
2016-12-15 14:13:38 -08:00
Brad Hefta-Gaub
439434b300
fixes
2016-12-14 20:24:52 -08:00
Brad Hefta-Gaub
c8fb467579
send minimum data for out of view avatars
2016-12-14 18:17:11 -08:00
Brad Hefta-Gaub
2443b2d6d9
duh
2016-12-14 17:35:02 -08:00
Brad Hefta-Gaub
daccb70819
disable compression by default
2016-12-14 13:18:09 -08:00
Brad Hefta-Gaub
e57774f630
fix unix/mac build
2016-12-14 12:19:50 -08:00
Brad Hefta-Gaub
2290179281
add compression and minimal data flags to AvatarData
2016-12-14 11:47:45 -08:00
Zach Fox
7030c7b0a6
Space bubble improvements ( #9142 )
...
* The space bubble around a player's avatar is now visualized. When another avatar enters a player's bubble, The bubble visualization will appear, a soft tone will play, and the "Bubble" HUD button will flash.
* The space bubble radius setting has been removed. Space bubble size now scales based on avatar scale.
* Space bubble collision detection is now more accurate and reliable.
* CTRL + N toggles the bubble.
* The "Bubble" HUD button has been moved to the proper location.
2016-12-12 14:22:54 -08:00
Anthony J. Thibault
38ac6fff03
Hand Controller rendering is camera relative
...
Basically, when using the third person camera in HMD mode. If the controllers are shown.
They should be shown in front of the users camera, not in front of the users avatar.
To accomplish this, two new faux joint indices are introduced.
CAMERA_RELATIVE_CONTROLLER_RIGHTHAND_INDEX and CAMERA_RELATIVE_CONTROLLER_LEFTHAND_INDEX.
These joint indices can be used for Overlay parenting. (But not for entity parenting because they are not transmitted over the network).
They can also be queried for by using the MyAvatar.getAbsoluteJointRotationInObjectFrame() call.
These new indices are now used by the controllerDisplay.js for the hand controller rendering.
They are also used by system/libraries/controllers.js as the origin for hand controller grabbing and interaction lasers.
2016-11-17 11:33:12 -08:00
Stephen Birarda
64d9fa0f39
clamp avatar scale to domain limit in avatar mixer
2016-11-10 14:19:32 -08:00
Stephen Birarda
77ede81fc9
limit MyAvatar scale to limits from domain settings
2016-11-10 13:27:13 -08:00
Zach Pomerantz
301f3ced98
fix typoed threaded call
2016-10-17 15:30:49 -07:00
howard-stearns
dc7a9f253c
kill agents in avatar mixer when they stop being avatars
2016-10-05 13:06:11 -07:00
Ryan Huffman
5e8c8f84b5
Handle edge cases of AVATAR_SELF_ID being used with entities
2016-09-13 16:34:05 -07:00
SamGondelman
9d447d4dcc
enabled qnetworkrequest redirects everywhere I could find them
2016-09-06 17:35:06 -07:00
Seth Alves
1a9f43cb67
fix AvatarActionHold's idea of where the controllers are when the avatar has been scaled
2016-09-01 12:17:34 -07:00
Seth Alves
7c5b8cb75d
send faux joints to the avatar-mixer
2016-08-25 15:21:29 -07:00
Seth Alves
39f52b3682
start on faux avatar joint that represent hand controllers
2016-08-25 10:58:23 -07:00
Anthony J. Thibault
6be737993e
bug fix for sensorToWorld translation transmission
2016-08-23 10:13:07 -07:00
Anthony J. Thibault
c6ea64926c
Sensor space entity support
...
You can do this by parenting an entity to an avatar's -2 joint index.
This will mean that the entity will follow the avatar as it moves in the world, but
will not follow the avatar's position as it moves in sensor space. Essentially, this
gives you the ability to place objects in the user's physical room.
WebTablets now are located in this feature and no longer jitter.
2016-08-23 10:13:06 -07:00
David Rowe
afe76c69d2
Fix crash when adding new attachment
2016-08-10 10:41:16 +12:00
Andrew Meadows
1df3b59aa1
change BUG to FIXME
2016-07-24 19:19:35 -07:00
Andrew Meadows
7280992806
add mutex lock around AvatarData joint data
2016-07-23 10:30:44 -07:00
Stephen Birarda
39c7805ca2
don't process packets for ignored avatars
2016-07-13 15:06:31 -07:00
Stephen Birarda
609900f246
move ignore set handling to NodeList
2016-07-13 15:06:31 -07:00
Seth Alves
4e70e8ed42
js call to ray-pick against avatars
2016-06-28 09:55:49 -07:00
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
Brad Hefta-Gaub
f274cdcc7f
Revert "Fix ModelBlender crash"
2016-03-21 10:47:31 -07:00
Brad Hefta-Gaub
0474be59c9
remove invalid.com url
2016-03-17 19:49:45 -07:00
Brad Hefta-Gaub
7483b8546b
remove FaceModel, make Model support shared_from_this() so we can ave shared and weak pointers to it
2016-03-17 17:05:35 -07:00
Anthony Thibault
54cc49283c
libraries/avatars: cppcheck warning fixes
2016-03-13 18:19:42 -07:00
Anthony J. Thibault
807d31743c
Removed Hand, HandData & PalmData
...
Instead, we just store two controller::Poses in MyAvatar.
Existing behavior and scripting APIs have been preserved.
The hand controller debug drawing is slightly different, but still works.
2016-03-10 19:33:31 -08:00
Anthony Thibault
3b87cd0ea8
Improve hold action by using controller velocity
...
The AvatarHoldAction now derives the body velocity by using data from the controller::Pose. Rather then trying to derive it based on previous positions. This results in more acurate motion of the held object when the hold is released.
OpenVR input plugin: pass the velocity and angularVelocity directly from the controller pose to the controller::Pose.
2016-02-22 19:15:22 -08:00
Anthony J. Thibault
072172b1a2
SpatiallyNestable: now with velocity support!
...
Moved velocity and angularVelocity into the SpatiallyNestable base class.
Entity velocity and angularVelocity properties are now relative to their parent, similar to the way position and orientation work for entities.
MyAvatar rig animations now use SpatiallyNestable to convert velocity into local frame to drive the animation state machine.
2016-02-08 19:43:23 -08:00
Stephen Birarda
816fe52c5b
mark getAvatarBySessionID as virtual
2016-02-03 17:31:38 -08:00
Stephen Birarda
058bba7b55
move avatar invokables from AvatarManager to AvatarHashMap
2016-02-03 17:13:35 -08:00
