MiladNazeri
3585bead96
Merge pull request #12037 from humbletim/Leopoly_Phase1_004_RayPick-Changes
...
Leopoly_Phase1_004_RayPick-Changes
2018-01-29 14:02:38 -08:00
Sam Gateau
7fe4f8480a
Merge pull request #12172 from highfidelity/android
...
Android updates
2018-01-23 14:41:35 -08:00
humbletim
65455e7b50
Merge remote-tracking branch 'upstream/master' into Leopoly_Phase1_004_RayPick-Changes
2018-01-23 14:57:33 -05:00
Brad Davis
8ae0b09ea2
Merge remote-tracking branch 'upstream/master' into android
2018-01-22 15:07:30 -08:00
Anthony J. Thibault
c13c9f301c
Take defaultPoseFlag section into account when computing byteArraySize.
2018-01-22 14:57:09 -08:00
Anthony J. Thibault
52f1803ea8
code review feedback
2018-01-22 09:55:39 -08:00
Anthony J. Thibault
cd4d9255bd
Added defaultPoseFlags to avatar protocol
...
Change rotationSet to rotationIsDefaultPose for JointData
Also for translation. Fixed all code to flip boolean value.
Created EntityJointData so that the ModelEntity stuff doesn't need to change.
2018-01-19 15:34:27 -08:00
Brad Davis
cbb2d9d854
Merge remote-tracking branch 'upstream/master' into android
2018-01-17 17:51:39 -08:00
Zach Fox
1d747bc0e4
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_sendMoney1
2018-01-17 11:56:00 -08:00
Brad Davis
6a06bf405a
Merge remote-tracking branch 'upstream/master' into android
2018-01-16 18:24:44 -08:00
Brad Davis
58530c595a
Pre-merge cleanup
2018-01-14 19:48:12 -08:00
Zach Fox
1e608b13b2
Show username when admin (this probably isn't the way to get username
2018-01-11 14:45:43 -08:00
Brad Davis
97593bc4d8
Fixing compiled resource access
2018-01-10 17:18:12 -08:00
Atlante45
776a2e8373
Fix concurrent access crash in avatar mixer
2018-01-09 11:24:34 -08:00
humbletim
a146b778f7
support additional .extraInfo for ray intersections
2017-12-21 12:35:13 -05:00
Anthony J. Thibault
542af47e9e
Fix for hand controller avatar scaling.
...
* Added getDomainMaxScale() and getDomainMinScale() to JS api.
* Updated scaleAvatar controller module to use this to prevent scaling past the limits.
* Made sure that getDomainMaxScale() getDomainMinScale() and getUnscaledEyeHeight are thread safe,
so that they can be invoked on the script thread.
* Added signals to Model class that can be used to let observers know when the Rig has finished initializing it's skeleton.
and also when the skeleton is no longer valid. These hooks are used to cache the unscaled eye height of the avatar.
2017-12-07 17:08:13 -08:00
Anthony J. Thibault
b5ffda6911
const fix
2017-12-07 10:09:09 -08:00
Anthony J. Thibault
095bedcd3f
code review feedback
2017-12-07 10:08:18 -08:00
Anthony J. Thibault
fbcecbfc89
Merge branch 'master' into feature/domain-limited-height
2017-12-07 10:01:33 -08:00
Andrew Meadows
e212ac67c1
enable custom avatar sort tuning
2017-11-28 11:30:06 -08:00
Andrew Meadows
deccc54965
remove cruft
2017-11-28 09:14:05 -08:00
Anthony J. Thibault
b3896f664d
Made increaseScale and decreaseScale more responsive at limits
2017-11-22 14:45:52 -08:00
Anthony J. Thibault
9f54ce55f3
Change domain setting from min/max avatar scale to min/max avatar height
...
* Domain settings version has been bumped from version 2.0 to 2.1
* Old domain settings for avatar scale will be auto-converted to avatar height
* Avatar code has been changed so that limitDomainScale() works with the new height limits
* Avatar getUnscaledEyeHeight() was added to C++.
* MyAvatar.getHeight() was added to JS.
2017-11-21 13:25:47 -08:00
ZappoMan
b44ced4c21
Merge branch 'master' of https://github.com/highfidelity/hifi into entityItemCleanup
2017-11-20 17:19:18 -08:00
ZappoMan
04ee1adabd
Merge branch 'master' of https://github.com/highfidelity/hifi into entityItemCleanup
2017-11-19 14:40:31 -08:00
Seth Alves
93fd2a6a6b
clear garbage out of avatar-entity settings array before writing it to disk. when changing domains, re-rez avatar-entities after octree is cleared
2017-11-15 20:10:05 -08:00
Ryan Downe Karpf
9ff4541ee3
Merge pull request #11782 from hyperlogic/remove-vs2010-inttypes-hack
...
Remove hack for missing inttypes.h header on VS2010
2017-11-12 10:59:19 -08:00
Anthony J. Thibault
5507bcea3c
Remove hack for missing inttypes.h header on VS2010
2017-11-09 10:34:01 -08:00
vladest
6685b74c2a
Remove checking of empty model url and add sanity for checking modelUrl field existing
2017-11-08 21:23:50 +01:00
ZappoMan
b5199220ab
cleanup SpatiallyNestable Velocity to match WorldVelocity naming
2017-11-02 17:07:53 -07:00
ZappoMan
f63db42c0e
migrate SpatiallyNestable::getOrientation to getWorldOrientation, remove redundant getRotation
2017-10-28 10:14:25 -07:00
ZappoMan
a7a0f03ede
rename SpatiallyNestable::getPosition() to SpatiallyNestable::getWorldPosition()
2017-10-27 18:39:17 -07:00
Ryan Huffman
9c06afc4c8
Merge pull request #11326 from cain-kilgore/21537
...
WL 21537 - Improve log naming
2017-10-06 08:51:42 -07:00
Bradley Austin Davis
bc4193f276
Merge branch 'master' into android_new
2017-09-19 14:27:31 -07:00
Bradley Austin Davis
b93e91b9f3
New android toolchain
2017-09-19 13:45:12 -07:00
Cain Kilgore
387e474889
WIP
2017-09-08 23:48:09 +01:00
Anthony J. Thibault
9cd8b6991e
Merge branch 'master' into feature/ant-man
2017-08-30 08:58:55 -07:00
Chris Collins
47a2e57e26
Merge pull request #10625 from humbletim/21180-C++
...
CR 21180-C++ Camera app -- core changes
2017-08-30 07:20:00 -07:00
Anthony J. Thibault
573985c7c9
Merge branch 'master' into feature/ant-man
2017-08-28 09:27:04 -07:00
Brad Davis
e817d3ced4
Threaded rendering & entity rendering refactor
2017-08-24 13:34:34 -07:00
humbletim
9348048387
Merge remote-tracking branch 'upstream/master' into 21180-C++
2017-08-24 16:23:47 -04:00
Anthony J. Thibault
d62a0ea8ff
Correct controller offsets with sensor scaling
2017-08-22 11:43:39 -07:00
Anthony Thibault
9af6f2683a
Merge pull request #11083 from Menithal/experimental-face-expressions
...
Opened up setForceFaceTrackerConnected
2017-08-14 14:19:08 -07:00
Menithal
9ec14057f0
Opened up setForceFaceTrackerConnected
2017-07-29 21:51:19 +03:00
Andrew Meadows
8c55476c65
fix motor direction when walking upside down
...
also maintain worldUp and remove unnecessary cruft
2017-07-24 16:00:13 -07:00
Andrew Meadows
29be9aee65
move nextAttitude() from AvatarData to MyAvatar
2017-07-24 16:00:13 -07:00
humbletim
f9e0e616f7
Merge remote-tracking branch 'upstream/master' into 21180-C++
2017-07-18 17:34:39 -04:00
Dante Ruiz
21d760a533
make sure to lock data
2017-07-17 22:11:05 +01:00
Dante Ruiz
f6208a394c
delete avatar entity when switching domains
2017-07-17 21:27:55 +01:00
Stephen Birarda
f6d9a79fb5
Revert "Revert "fix for invisible avatars after radius ignore""
2017-07-12 10:36:53 -07:00
Andrew Meadows
782155e9ea
Merge pull request #10876 from Atlante45/fix/ac-crash
...
Fix AC crash (buffer overflow)
2017-07-11 14:26:08 -07:00
Atlante45
c32f4ab0d3
CR
2017-07-10 14:24:53 -07:00
Seth Alves
6782a891d0
rename the joint-name caches in AvatarData and Avatar so it's more clear that they are different
2017-07-07 10:35:45 -07:00
Atlante45
1d07ab70f0
Fix warnings
2017-07-06 10:56:09 -07:00
Atlante45
9a1d38384d
Remove unecessary loops
2017-07-05 17:43:09 -07:00
Atlante45
20a633eb89
Check struct sizes at compile time
2017-07-05 17:42:59 -07:00
Atlante45
95abbd0ad4
Prevent Interface from trying to send packets bigger than an MTU
2017-07-05 17:08:04 -07:00
Atlante45
7e9ce5a58b
Don't overflow during AvatarData::toByteArray
2017-07-05 16:15:18 -07:00
Seth Alves
70a7b302fc
Merge pull request #10860 from jherico/deadlock_guards
...
Don't use blocking connections on the main thread
2017-07-03 09:05:56 -07:00
humbletim
026e05f80c
Merge remote-tracking branch 'upstream/master' into 21180-C++
2017-07-03 11:55:59 -04:00
Stephen Birarda
f6fe3f91fd
Merge pull request #10829 from birarda/bug/sequence-skips
...
fix avatar mixer sending empty avatar identities
2017-06-30 15:28:29 -07:00
Brad Davis
6fc82bb351
Switch to preprocessor macro for blocking invokes to capture function information
2017-06-30 11:36:24 -07:00
Brad Davis
b52dd7b822
Don't use blocking connections on the main thread
2017-06-29 20:45:17 -07:00
Dante Ruiz
f6ba264de6
avatar recording fix
2017-06-28 16:22:28 +01:00
Stephen Birarda
089a2bb362
do not manage identity data without identity data received
2017-06-27 11:58:03 -07:00
Ryan Huffman
b56cfa56c7
Merge branch 'master' of github.com:highfidelity/hifi into feat/pal-replicated
2017-06-23 14:23:20 -07:00
humbletim
f6262ad54d
Merge remote-tracking branch 'upstream/master' into 21180-C++
2017-06-23 16:37:10 -04:00
Stephen Birarda
ccbae07170
rename _sequenceNumber to _lastSequenceNumber
2017-06-22 11:23:58 -07:00
Stephen Birarda
42cceb02a4
push sequence number when managing identity data for agent
2017-06-22 11:10:43 -07:00
Stephen Birarda
aeb3f443f8
address code review comments
2017-06-21 16:14:14 -07:00
Ryan Huffman
0e7ddfd29f
Disable silence/ban buttons in PAL if avatar is replicated
2017-06-21 09:49:16 -07:00
Ryan Huffman
8ce1474d9a
Add isReplicated to avatar identity data
2017-06-21 09:48:34 -07:00
humbletim
fbeaa01f7d
remerge master / remove debug block
2017-06-20 01:51:33 -04:00
humbletim
d3127ba975
remove unintended merge line
2017-06-19 20:18:39 -04:00
humbletim
fc33e95e2d
Merge branch 'master' into 21180-C++
2017-06-16 16:16:42 -04:00
Stephen Birarda
e6ef153148
Merge branch 'master' of https://github.com/highfidelity/hifi into feat/replicants
2017-06-15 15:43:13 -07:00
Stephen Birarda
8f154321a4
never process null avatar ID in avatar manager
2017-06-15 14:25:10 -07:00
Stephen Birarda
6cf4ff1daf
remove debug and fix peek of session ID
2017-06-15 13:44:44 -07:00
Stephen Birarda
bfa5df778d
remove avatar entity data debug
2017-06-14 14:59:49 -07:00
Stephen Birarda
e3c3831efa
only output sequence number information if debug is requested
2017-06-14 14:56:15 -07:00
Stephen Birarda
5b45beaa39
cleanup some debug from identity packet changes
2017-06-14 14:51:28 -07:00
Stephen Birarda
f2a61fa59d
change incoming/outgoing seq num handling
2017-06-14 14:41:25 -07:00
Stephen Birarda
ddb6db9f6a
fix repeated pushing of avatar identity seq nums
2017-06-14 14:31:22 -07:00
Stephen Birarda
50b56ec761
don't unpack avatar identity that is old
2017-06-14 14:02:22 -07:00
howard-stearns
2deb26551f
typos in comments/help-strings
2017-06-14 11:56:47 -07:00
howard-stearns
6271b8ee7c
avatar whitelist
2017-06-13 16:56:18 -07:00
Seth Alves
9fcc1e15b8
remove some cruft
2017-06-05 15:52:47 -07:00
humbletim
7cab0363a9
standalone 21180 branch with just the C++ changes
2017-06-05 15:57:54 -04:00
samcake
257813ec38
comment the code
2017-06-01 09:19:02 -07:00
Sam Cake
03fdc1396c
Fixing the warnings
2017-05-31 23:20:10 -07:00
David Rowe
3aebe96afe
Merge branch 'master' into 21359
2017-05-19 09:03:11 +12:00
David Rowe
f6c1fa4213
Merge branch 'master' into 21359
2017-05-18 16:40:20 +12:00
David Rowe
26e390fa89
Tidy code setting head orientation
2017-05-18 13:55:06 +12:00
David Rowe
223b1a858b
Fix avatar eye look-at in recording playback
2017-05-18 12:27:31 +12:00
Howard Stearns
95111d24b2
Merge branch 'master' into dk/sequenceNumberForAvatarIdentity
2017-05-17 17:09:47 -07:00
Andrew Meadows
09433a93ba
Merge pull request #10477 from AndrewMeadows/correct-avatar-mass
...
More correct avatar mass
2017-05-17 16:22:06 -07:00
David Kelly
057718bde3
remove clockSkew, reference new version for Avatar packets
2017-05-17 15:14:56 -07:00
David Kelly
689a0b5bad
Switch from timestamp to sequence id for avatar identity
2017-05-17 14:22:36 -07:00
Zach Fox
d4752926b8
First pass - checking performance
2017-05-17 13:51:27 -07:00
Brad Hefta-Gaub
764bfe94f5
Merge pull request #10336 from trentpolack/feature/snap-turn-smoothing-21270
...
Feature/snap turn smoothing 21270
2017-05-16 21:05:38 -07:00
Andrew Meadows
d065b569d3
support for variable avatar mass by size
2017-05-16 16:03:51 -07:00
David Rowe
7897bf8aa8
Fix display name not getting cleared
2017-05-17 08:17:55 +12:00
David Rowe
733b0feabd
Fix attachment data not getting cleared
2017-05-17 08:17:33 +12:00
Zach Fox
bc1e97032a
Thanks to Andrew!
2017-05-15 17:39:19 -07:00
Zach Fox
64ae5119ae
Merge pull request #10462 from zfox23/fixIdentityUpdatedAt
...
Force _identityUpdatedAt to stay above 0, fixing more identity packet bugs
2017-05-15 15:44:26 -07:00
Zach Fox
e492ca9364
Improve the test - thanks Dave!
2017-05-15 14:55:05 -07:00
Zach Fox
a2a24b22a8
Force _identityUpdatedAt to stay above 0
2017-05-15 14:25:47 -07:00
Seth Alves
66a1dbfcfe
Merge pull request #10445 from AndrewMeadows/cleanup-head-simulation
...
cleanup Head::simulate() code
2017-05-15 11:21:43 -07:00
Zach Fox
9289cd2022
Merge pull request #10398 from zfox23/PAL_FixIDPacketOrder
...
Fix the PAL not showing user info for user who opened PAL
2017-05-11 15:16:05 -07:00
Andrew Meadows
04827c3a2a
use const auto& where appropritate
2017-05-11 14:51:52 -07:00
Andrew Meadows
f4df223d23
cleanup Head::simulation() code
2017-05-11 14:46:00 -07:00
Zach Fox
15574f509e
Clarifying comments
2017-05-11 11:45:07 -07:00
David Rowe
e426d70437
Improve variable name
2017-05-11 18:37:23 +12:00
David Rowe
98b943269b
Sum of blendshapes is used sent through avatar mixer
2017-05-11 18:17:35 +12:00
David Rowe
21f9594f81
Sum of blendshapes is used for recording
2017-05-11 18:17:12 +12:00
David Rowe
3b06b03e01
Rename blendshapes variables in preparation for repurposing
2017-05-11 16:46:36 +12:00
Zach Fox
ae983658be
Finally, the actual fix?
2017-05-10 15:59:19 -07:00
Zach Fox
d7e4f02291
This is a better method.
2017-05-09 15:33:33 -07:00
Zach Fox
9ab643c416
I think this is all that must be done.
2017-05-09 15:33:33 -07:00
trent
a3545661dc
Merged hifi/master into this PR and resolved merge conflicts.
2017-05-09 15:09:53 -04:00
Andrew Meadows
13186dcb78
replace tab characer r with spaces
2017-05-08 14:28:08 -07:00
Seth Alves
960bab6e4e
Merge branch 'master' of github.com:highfidelity/hifi into fix-dont-send-non-entity-edits-over-wire
2017-05-04 16:42:57 -07:00
Brad Davis
2d0bbf70ae
Migrate core avatar rendering functionality to library
2017-05-04 14:08:59 -07:00
Seth Alves
69944cc76d
add a way to get a SpatiallyNestable's name without knowing what its type is
2017-05-03 21:32:49 -07:00
trent
6d1fb8a6f8
Merge branch 'feature/snap-turn-smoothing-21270' of https://github.com/mittens/hifi into feature/snap-turn-smoothing-21270
2017-05-02 13:55:39 -04:00
trent
49881b5ea2
Actually the full set of changes. Kids: don't forget to pop your stash.
2017-05-02 13:55:32 -04:00
Trent Polack
8f93a9a074
Merge branch 'master' into feature/snap-turn-smoothing-21270
2017-05-02 13:43:32 -04:00
trent
8f34ec4c7f
Iteration on the snap-turn smoothing based on feedback from Andrew. Also additional cleanup.
2017-05-02 13:41:34 -04:00
Brad Davis
425405f72d
Merge pull request #10245 from AndrewMeadows/avatar-renderer-002
...
more cleanup in preparation for moving Avatar class to lib
2017-05-02 10:37:22 -07:00
trent
6317857e3d
Merge branch 'master' of https://github.com/highfidelity/hifi into feature/snap-turn-smoothing-21270
2017-05-02 12:11:39 -04:00
trent
d446640bc8
Fixed tab issues.
2017-05-01 13:28:26 -04:00
trent
773563850c
Merge hifi/master with my branch, fixed merge issue.
2017-05-01 13:23:02 -04:00
Brad Davis
5e1bc0d908
Remove faceshift
2017-04-28 16:34:54 -07:00
Andrew Meadows
75b563d598
restore rendering of avatar receive stats
2017-04-27 13:16:50 -07:00
trent
53f47c132f
Avatar snap-turn rotation smoothing (sent out from the local client outward).
2017-04-27 16:12:25 -04:00
ZappoMan
bc2f893294
format and spelling changes
2017-04-26 21:47:54 -07:00
ZappoMan
c0df82ff69
Merge branch 'master' of https://github.com/highfidelity/hifi into retrySkeletonURL
2017-04-26 18:49:24 -07:00
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
Brad Davis
664100b9b1
Attachment dialog
2016-01-26 21:55:40 -08:00
Seth Alves
90847dc49c
oops
2016-01-19 15:00:33 -08:00
Seth Alves
09dd3e2a56
merge from upstream, respond to code review
2016-01-19 14:38:22 -08:00
Seth Alves
135f25bde7
changes so that avatar-mixer wont attempt to resolve a parentID
2016-01-18 15:35:54 -08:00
Anthony J. Thibault
7bef1ebdac
Merge remote-tracking branch 'upstream/master' into tony/soft-avatar-attachment-script
2016-01-07 16:14:52 -08:00
Anthony J. Thibault
031f59b7b5
Support for adding soft attachments from script.
...
Also, bug fixes for setting MyAvatar.attachmentData property.
2016-01-07 16:12:36 -08:00
Andrew Meadows
6eb177091b
overhaul of MotionState cleanup
...
Moved MotionState deletes out of PhysicsEngine.
EntityMotionStates are deleted by the PhysicsEntitySimulation.
AvatarMotionStates are deleted in the Avatar dtor.
2016-01-07 10:19:46 -08:00
Anthony Thibault
95f821d61a
Merge pull request #6732 from sethalves/set-model-entity-joints
...
hook up a way for scripts to set model-entity joint state
2016-01-05 17:31:18 -08:00
Andrew Meadows
9ab5ef358a
remove dangling whitespace
2016-01-05 16:44:36 -08:00
Seth Alves
b222c12857
unmangle merge
2016-01-05 12:21:50 -08:00
Seth Alves
96f506a98d
code review
2016-01-05 07:27:27 -08:00
Seth Alves
ce1b8ae6f0
Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting
2016-01-04 19:35:36 -08:00
Anthony J. Thibault
c2dd00375d
Merge branch 'master' into tony/soft-attachments
2015-12-29 13:21:37 -08:00
Anthony J. Thibault
098a455b67
AttachmentData operator== bug fix
...
This was causing some changes to not be reflected across the network.
2015-12-18 14:49:33 -08:00
Seth Alves
1a534ff645
Merge branch 'hdr' of github.com:samcake/hifi into near-grab-via-parenting
2015-12-18 13:43:33 -08:00
Anthony J. Thibault
1618e0a92f
Network, Preferences and UI support for soft attachments
...
Added an isSoft field to the AttachmentData which is edited
by the Attachment Dialog Menu, sent over the network via
AvatarData identity packets and saved in the Interface.ini preferences.
AvatarData and AvatarBulkData version number has been bumped.
Changed Avatar attachment collections to use smart pointers to models
instead of raw ones. Removed _unusedAttachmentModels.
I don't think the caching was worth the added code complexity.
2015-12-18 13:32:09 -08:00
Andrew Meadows
d6541e9ee7
angular velocity is a vector, not a quaternion
2015-12-18 11:06:58 -08:00
Seth Alves
b83579e6e5
include queryAABox in physics-induced sends
2015-12-16 17:25:49 -08:00
Seth Alves
0500c21e00
unmangle merge
2015-12-16 16:09:52 -08:00
Seth Alves
9e5116bf4f
Merge branch 'dejitter-hold-action' of github.com:sethalves/hifi into near-grab-via-parenting
2015-12-16 15:56:31 -08:00
Andrew Meadows
7baee8c391
use glm::clamp() instead of std::min() and max()
2015-12-15 18:18:08 -08:00
Andrew Meadows
c3823de353
setClampedTargetScale()-->setTargetScaleVerbose()
2015-12-15 18:18:08 -08:00
Andrew Meadows
33634cdaa1
properly delete departing avatars
2015-12-15 18:18:08 -08:00
Andrew Meadows
e9f52b1211
properly scale avatar collision shape
2015-12-15 18:18:08 -08:00
Seth Alves
c74f8bca49
location getters also return a success boolean so that callers can know if the value they are receiving is bad due to lack of information about an object's parent
2015-12-14 09:13:36 -08:00
Atlante45
6f29d9e7b8
Use strongly typed enum instead of nested alias
2015-12-10 11:10:09 -08:00
Seth Alves
0bf276efa5
adjust method names to fit convention
2015-12-07 14:37:35 -08:00
Seth Alves
f99812a903
adjust method names to fit convention
2015-12-07 14:31:08 -08:00
Seth Alves
fff4e3e831
make SpatiallyNestable setters take values by reference
2015-12-06 12:01:30 -08:00
Ryan Huffman
89c412c324
Merge branch 'master' of https://github.com/highfidelity/hifi into proto-received-message
2015-12-04 11:38:28 -08:00
Seth Alves
0595ef0938
merge from upstream
2015-12-02 09:30:19 -08:00
Brad Davis
9b6ec34f09
Fixing avatar orientation in recordings
2015-12-01 20:51:07 -08:00
Howard Stearns
ef32853d46
When AvatarData parses the .fst, store the (merged) .fbx filename.
...
(Interface gets the .fbx by a separate path, but agents don't have that chance.)
2015-12-01 11:51:22 -08:00
Seth Alves
b7ebe5b92b
merge from upstream
2015-11-30 16:59:52 -08:00
Seth Alves
3402585d1a
fix a crash from previous commit
2015-11-30 16:54:29 -08:00
Seth Alves
5c327edd5a
keep AvatarHashMap::findAvatar from creating bogus avatar entries. remove some more stray consts
2015-11-30 14:08:07 -08:00
Seth Alves
89b78986d5
remove some more stray const
2015-11-30 14:01:17 -08:00
Ryan Huffman
99dd9646bc
Merge branch 'master' of https://github.com/highfidelity/hifi into proto-received-message
2015-11-30 10:20:13 -08:00
Seth Alves
cf39cac7fc
attempt to make SpatiallyNestable data access thread-safe
2015-11-29 12:50:33 -08:00
Seth Alves
facf91faac
minimize diff vs master
2015-11-26 07:13:43 -08:00
Seth Alves
ca75802b9c
unmangle merge
2015-11-26 06:43:28 -08:00
Anthony J. Thibault
f120e10ff4
Merge branch 'master' into tony/remove-joint-states
2015-11-24 15:00:05 -08:00
Ryan Huffman
dac491ef41
Merge branch 'master' of https://github.com/highfidelity/hifi into proto-received-message
2015-11-24 09:59:22 -08:00
Brad Davis
5c2b980a45
Fixing avatar facial blendshapes and attachments in recordings
2015-11-23 22:36:07 -08:00
Seth Alves
ba30e01664
include global position in avatar-mixer protocol so server knows where avatars are in world-space
2015-11-23 14:12:49 -08:00
Brad Davis
64ba5b4f14
Cleaning up old recording files
2015-11-23 09:42:34 -08:00
Anthony J. Thibault
821264a031
Merge branch 'master' of github.com:highfidelity/hifi into tony/remove-joint-states
2015-11-22 16:15:03 -08:00
Seth Alves
abfc3e994a
AvatarData::toFrame expects a scaled transform
2015-11-22 07:18:12 -08:00
Seth Alves
4646c0c103
unmangle merge
2015-11-21 10:49:31 -08:00
Seth Alves
f013f95e9b
merge from upstream
2015-11-21 08:43:00 -08:00
samcake
0dc551409d
Fixing a comment
2015-11-20 15:22:01 -08:00
samcake
e97e864de7
Getting the animation playback to work
2015-11-20 15:05:17 -08:00
Stephen Birarda
19d3d80ff9
fixes for some incorrect assumptions
2015-11-20 11:03:52 -08:00
Anthony J. Thibault
ad4b8e0001
Avatar transmission fixes, moved JointData into shared
...
* Moved JointData into shared library
* added methods to the rig to copy into and out of JointData
* JointData translations must be in meters this is so the
fixed point compression wont overflow, also, it's a
consistent wire format.
2015-11-20 10:24:24 -08:00
Stephen Birarda
22f5d4df6d
change signature of copy return
2015-11-19 16:25:33 -08:00
Stephen Birarda
430cb7876d
remove a couple of read lockers for AvatarHashMap
2015-11-19 16:22:56 -08:00
Stephen Birarda
40397add43
fix for extra adds in AvatarManager
2015-11-19 16:15:21 -08:00
Stephen Birarda
6398a922c6
leverage COW for AvatarHash
2015-11-19 15:43:29 -08:00
Stephen Birarda
2a05ec650b
fix locking in AvatarHashMap/AvatarManager
2015-11-19 14:17:48 -08:00
Ryan Huffman
2a416ebc61
Merge branch 'master' of https://github.com/highfidelity/hifi into received-message
2015-11-18 16:52:23 -08:00
Brad Hefta-Gaub
ba922290a4
Merge pull request #6407 from jherico/dargo
...
Exclude avatar scales out of the permissable range
2015-11-17 18:41:15 -08:00
Brad Davis
4e57c9114c
Avatar has no dependency on audio or recording anymore
2015-11-17 17:13:53 -08:00
Brad Davis
0ad1d08041
Exclude avatar scales out of the permissable range
2015-11-17 16:46:25 -08:00
Brad Davis
900f425f35
Recording fixes
2015-11-17 15:18:31 -08:00
Brad Davis
cb26fc67fc
Move recording interface back to float/seconds
2015-11-16 14:44:22 -08:00
samcake
89e5db11a0
More fixes
2015-11-13 17:41:41 -08:00
samcake
8c21ac144e
Fixing review comments
2015-11-13 16:45:19 -08:00
Sam Gateau
89d120ab3d
Few fixes to make the recorder.js run
2015-11-12 22:24:11 -08:00
samcake
1fd37b51a2
trying to get somewhere....
2015-11-12 17:54:35 -08:00
Brad Davis
ee1545f649
Cleaning up clip and transform
2015-11-12 11:48:47 -08:00
Brad Davis
f521be10fe
Avatar recording work in progress
2015-11-12 00:33:38 -08:00
samcake
d3d5d3a19e
Removing useless code
2015-11-10 12:02:20 -08:00
samcake
2cf2257783
Fix warning
2015-11-10 09:20:43 -08:00
Sam Gateau
06a87012ad
Removing the setJointTranslations which is not helping...
2015-11-09 23:38:51 -08:00
Sam Gateau
b47c5dbff2
Cleaning the code to remove the old rec format and the use of separate joint Rotationns/Translations arrays
2015-11-09 23:12:04 -08:00
samcake
77e21b7190
Trying to fix the animation recording and playback, but still not good
2015-11-09 18:18:30 -08:00
samcake
2078c753ae
Merge branch 'master' of https://github.com/highfidelity/hifi into controllers
2015-11-09 09:23:59 -08:00
samcake
cbeb56aba4
using the frameInterpolatorCOrrectly
2015-11-06 17:25:50 -08:00
Howard Stearns
314c11e8d4
Make life easier for Sam.
2015-11-06 16:59:46 -08:00
samcake
4dbca68767
Updating the legacy file format to support the joint translation and also fix the replay problem oof the joints going to the moon
2015-11-06 16:24:19 -08:00
samcake
2f9c33dbfb
Merge branch 'master' of https://github.com/highfidelity/hifi into controllers
2015-11-06 09:35:48 -08:00
samcake
46d9a14951
Work in progress, fixing the animation playback
2015-11-06 09:35:20 -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
Seth Alves
fbaa86426c
re-remove the _nextPosition stuff
2015-11-03 16:52:46 -08:00
Seth Alves
60824a1fb0
back out some off-brand changes. add parentChanged call
2015-11-03 16:07:28 -08:00
Seth Alves
3ac0fef1ea
merge from upstream
2015-11-01 15:22:57 -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
Seth Alves
61269c3ce8
fix up entity constructors so that setProperties isn't called during the constructor
2015-10-23 13:52:50 -07:00
Brad Hefta-Gaub
f90844449d
fix angular velocity
2015-10-23 13:16:05 -07:00
Seth Alves
22af5b27ab
avoid shared_from_this while constructing
2015-10-23 12:55:48 -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
Seth Alves
7b08d047b1
when EntityTree::updateEntityWithElement is called on an entity, call it on all the children of that entity
2015-10-22 16:59:56 -07:00
Seth Alves
d86d69aeba
keep track of children. use local position and orientation on the wire.
2015-10-22 15:36:03 -07:00
Seth Alves
f6fe503c51
pass avatar parent information through avatar-mixer
2015-10-22 13:44:04 -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
Seth Alves
bc99ef778c
change how render engine is told about model position changes
2015-10-20 12:04:29 -07:00
Seth Alves
a78f2a9577
have avatar make use of SpatiallyNestable
2015-10-18 09:48:46 -07:00
Seth Alves
275e77d29e
remove old-style avatar referentials
2015-10-18 07:51:00 -07:00
Ryan Huffman
9ddcfdf94d
Cleanup PacketReceier and ReceivedMessage
2015-10-16 09:21:10 -07:00
Ryan Huffman
7682ab00e3
Add ReceivedMessage and receive progress
2015-10-15 14:09:53 -07:00
