Sam Gondelman
|
cfffa65819
|
Merge pull request #13899 from SamGondelman/pointerPerf
Improve Pointer performance
|
2018-08-29 16:57:43 -07:00 |
|
sabrina-shanman
|
1fe909f9ad
|
Make CollisionPick::getResultTransform() always return a valid transform
|
2018-08-29 16:33:51 -07:00 |
|
Stephen Birarda
|
aaf5f593c5
|
send MyAvatar avatar entity updates through entity tree
|
2018-08-29 16:30:24 -07:00 |
|
sabrina-shanman
|
686f9fb18a
|
Move load state flag from CollisionPickResult to CollisionRegion and make it a boolean
|
2018-08-29 16:29:59 -07:00 |
|
Angus Antley
|
9fb0f8b7c0
|
added condition to prevent overwriting tracker input with estimated orientation for spine2 joint
|
2018-08-30 00:25:53 +01:00 |
|
Sam Gateau
|
349f782697
|
Merge branch 'master' of github.com:highfidelity/hifi into black
|
2018-08-29 16:07:50 -07:00 |
|
Sam Gateau
|
ed4dbaa4c7
|
Refining the plot widget to be able to represent negative values
|
2018-08-29 16:07:30 -07:00 |
|
John Conklin II
|
7298cb4654
|
Merge pull request #13888 from dback2/editControllerMapping
Edit mode controller mapping using new platform state variables
|
2018-08-29 16:06:47 -07:00 |
|
sabrina-shanman
|
2d73b7845e
|
Code style fixes
|
2018-08-29 15:00:01 -07:00 |
|
sabrina-shanman
|
0981f08b22
|
Do not propagate avatar scale in AvatarHeadTransformNode
|
2018-08-29 14:48:27 -07:00 |
|
Zach Fox
|
67e57a9487
|
Merge pull request #13849 from zfox23/MS16003_backCloses
Fix MS16003: In PAL/GoTo WebView, 'BACK' closes app when you can't go back
|
2018-08-29 14:29:12 -07:00 |
|
SamGondelman
|
cda8b82ead
|
improve pointer performance
|
2018-08-29 13:32:53 -07:00 |
|
Angus Antley
|
f7d0cdda02
|
added a check for whether the head to shoulder azimuth is greater than 100 degrees. If so unflip the chest azimuth
|
2018-08-29 20:44:21 +01:00 |
|
David Back
|
96d2ba660c
|
Merge branch 'master' of https://github.com/highfidelity/hifi into editControllerMapping
|
2018-08-29 12:05:51 -07:00 |
|
Andrew Meadows
|
f9d14e1351
|
filter time-cost drivers for region regulation
|
2018-08-29 11:17:59 -07:00 |
|
John Conklin II
|
4ab45e70a4
|
Merge pull request #13887 from sethalves/fix-pick-reg-point-1
fix far-grab laser-lock on entities with non-default registration point
|
2018-08-29 10:42:03 -07:00 |
|
Sam Gateau
|
3c0e284e98
|
Merge branch 'master' of github.com:highfidelity/hifi into black
|
2018-08-29 08:48:04 -07:00 |
|
Angus Antley
|
ee33f5dc97
|
normalize the hip hand vector in getSpine2RotationRigSpace, made computeHandAzimuth a const function that returns a vec2
|
2018-08-29 01:57:49 +01:00 |
|
Sam Gateau
|
37b4cf6223
|
Picking pid values
|
2018-08-28 17:39:35 -07:00 |
|
SamGondelman
|
0c8a4cc81e
|
merge with master
|
2018-08-28 17:31:51 -07:00 |
|
Sam Gateau
|
0da22db837
|
Picking pid values
|
2018-08-28 16:05:57 -07:00 |
|
Sam Gateau
|
7dfdc79644
|
Picking pid values
|
2018-08-28 12:21:15 -07:00 |
|
Sam Gondelman
|
89bd24dd54
|
Merge pull request #13880 from SamGondelman/matCrash
Fix crash on shutdown in domain with material
|
2018-08-28 11:48:35 -07:00 |
|
amantley
|
3c792a04c1
|
fixed roll rotation added to azimuth in MySkeletonModel.cpp
|
2018-08-28 11:25:42 -07:00 |
|
Sam Gateau
|
7b399d9a04
|
Merge branch 'master' of github.com:highfidelity/hifi into black
|
2018-08-28 09:20:13 -07:00 |
|
Sam Gateau
|
d9d23e7fcf
|
Merge pull request #13877 from luiscuenca/multiplyOtherAvatars
Create N replicas of each other-avatar on the client side
|
2018-08-28 09:02:13 -07:00 |
|
Sam Gateau
|
63eb57c741
|
Exploring PID again
|
2018-08-28 08:58:25 -07:00 |
|
amantley
|
89b508251e
|
added some comment to explain rig to avatar transform
|
2018-08-27 17:57:50 -07:00 |
|
sabrina-shanman
|
c6e6da2e3f
|
Make MouseTransformNode actually parent the pick to a mouse rather than a MouseRayPick, and properly include rotation information
|
2018-08-27 16:53:55 -07:00 |
|
Seth Alves
|
52bbb4d2ab
|
fix ray-pick results on entities with non-default registration point. clean up grab scripts to correctly use this fix.
|
2018-08-27 16:21:01 -07:00 |
|
SamGondelman
|
aae06e8f49
|
faster aabox ray intersection and pre-computed inverse direction
|
2018-08-27 15:40:33 -07:00 |
|
David Back
|
b6edb2c9d6
|
platform states, edit controller mapping, separate mac/win delete
|
2018-08-27 14:53:13 -07:00 |
|
amantley
|
055f03878e
|
made changes to add roll to the spine2 rotation. also only the shoulders control the rotation recenter now
|
2018-08-27 14:44:27 -07:00 |
|
sabrina-shanman
|
397b03d5d5
|
Add threshold parameter to collision pick with minimum of 0
|
2018-08-27 14:12:24 -07:00 |
|
Sam Gateau
|
a6f7135ad8
|
Merge branch 'master' of github.com:highfidelity/hifi into black
|
2018-08-27 10:54:23 -07:00 |
|
Sam Gateau
|
d97d655148
|
USing a simpler halfTan test for culling
|
2018-08-26 23:17:29 -07:00 |
|
Sam Gateau
|
294fe51fde
|
Trying to simplify the LOD culling test
|
2018-08-24 16:48:23 -07:00 |
|
amantley
|
dd8a00983c
|
Merge remote-tracking branch 'upstream/master' into rotateFilterChange
|
2018-08-24 16:29:20 -07:00 |
|
amantley
|
2bec867863
|
added the sanity check to see if the shoulders have flipped
|
2018-08-24 16:29:08 -07:00 |
|
sabrina-shanman
|
cce62f4d92
|
Do not assume picks with doesIntersect()==false have no results to compare. Fixes CollisionPickResult 'loaded' value always evaluating to false when not colliding
|
2018-08-24 15:47:52 -07:00 |
|
sabrina-shanman
|
6e160ad22f
|
Add TransformNode-based parenting and implement for CollisionPicks
|
2018-08-24 15:47:52 -07:00 |
|
sabrina-shanman
|
3167d3c0c7
|
Create TransformNodes for SpatiallyNestables, the mouse, and MyAvatar head
|
2018-08-24 15:47:52 -07:00 |
|
Sam Gateau
|
8f8bcc1901
|
Merge branch 'master' of github.com:highfidelity/hifi into black
|
2018-08-24 15:23:37 -07:00 |
|
SamGondelman
|
98d145dc24
|
fix crash on shutdown in domain with material
|
2018-08-24 15:19:48 -07:00 |
|
SamGondelman
|
70f4d0c634
|
Merge remote-tracking branch 'upstream/master' into perf
|
2018-08-24 14:04:37 -07:00 |
|
John Conklin II
|
477fba4b15
|
Merge pull request #13847 from AndrewMeadows/workload-avatars-002
workload tracks other avatars and adds/removes from physics simulation accordingly
|
2018-08-24 12:43:51 -07:00 |
|
luiscuenca
|
ddbadf5a69
|
change to Test API
|
2018-08-24 11:59:46 -07:00 |
|
SamGondelman
|
3d048c77ba
|
Merge remote-tracking branch 'upstream/master' into recurse
|
2018-08-24 11:39:05 -07:00 |
|
amantley
|
a60ab863a3
|
demo version of the head and hands determining the rotate function
|
2018-08-24 11:06:36 -07:00 |
|
Angus Antley
|
25610c7587
|
got the hands turning the shoulders, needs error checking
|
2018-08-24 11:04:36 +01:00 |
|
Angus Antley
|
44a6c7df5f
|
added hook to myskeleton model to update spine2, need to get the rotation from myavatar then we have spine rot
|
2018-08-24 07:17:17 +01:00 |
|
Sam Gateau
|
699240027e
|
Merge branch 'master' of https://github.com/highfidelity/hifi into black
|
2018-08-23 19:29:14 -07:00 |
|
amantley
|
0e0561bb24
|
latest rotate code
|
2018-08-23 17:59:18 -07:00 |
|
SamGondelman
|
b5b7167644
|
add to stats
|
2018-08-23 17:56:24 -07:00 |
|
Sam Gateau
|
cee9b90930
|
working on the LOD behavior
|
2018-08-23 16:48:42 -07:00 |
|
Andrew Meadows
|
10d0833c19
|
use DynamicsWorld::numCollisionObjects instead of our own count
|
2018-08-23 15:57:54 -07:00 |
|
Zach Fox
|
dddb2141f0
|
Implement Wallet Security feature - Auto Logout checkbox
|
2018-08-23 15:45:29 -07:00 |
|
Zach Fox
|
a1d88a8588
|
Merge howard/wallet-locker2 into my branch
|
2018-08-23 14:45:16 -07:00 |
|
Andrew Meadows
|
abf4a926d8
|
cleanup
|
2018-08-23 12:59:28 -07:00 |
|
Andrew Meadows
|
8f2141b592
|
fix compile error
|
2018-08-23 12:59:28 -07:00 |
|
Andrew Meadows
|
777b90bdc0
|
add 'physics body count' to debug stats
|
2018-08-23 12:59:28 -07:00 |
|
Andrew Meadows
|
f5cae61b43
|
fix typo causing compile failure
|
2018-08-23 12:59:28 -07:00 |
|
Andrew Meadows
|
87223946ad
|
add/remove avatars according to workload region
|
2018-08-23 12:59:28 -07:00 |
|
Andrew Meadows
|
3ecabb6583
|
cleanup after removing spaghetti
|
2018-08-23 12:59:28 -07:00 |
|
Andrew Meadows
|
99aafb1f95
|
move code from Avatar to OtherAvatar
|
2018-08-23 12:59:28 -07:00 |
|
Andrew Meadows
|
615b8addd0
|
fix order of includes
|
2018-08-23 12:59:28 -07:00 |
|
Andrew Meadows
|
598a227f1a
|
use OtherAvatar instead of Avatar in AvatarMotionState
|
2018-08-23 12:59:28 -07:00 |
|
Andrew Meadows
|
3c01433e12
|
stub for avatars changing workload regions
|
2018-08-23 12:59:28 -07:00 |
|
Andrew Meadows
|
21adbf49c0
|
remove cruft
|
2018-08-23 12:59:28 -07:00 |
|
Andrew Meadows
|
15665b25e8
|
give OtherAvatars a proxy in workload
|
2018-08-23 12:59:28 -07:00 |
|
Sam Gateau
|
b725ed440b
|
Merge branch 'master' of github.com:highfidelity/hifi into black
|
2018-08-23 11:40:10 -07:00 |
|
Sam Gateau
|
473f8d0ca5
|
Working on the LOD system
|
2018-08-23 11:39:47 -07:00 |
|
John Conklin II
|
1320a34a18
|
Merge pull request #13841 from luiscuenca/noAttachmentsToJSON
Don't include old attachment data on new avatar recordings
|
2018-08-23 10:51:33 -07:00 |
|
John Conklin II
|
5dd64645eb
|
Merge pull request #13861 from SimonWalton-HiFi/safe-landing-fixes
Fix safe-landing protocol for sparse domains
|
2018-08-23 10:17:08 -07:00 |
|
Angus Antley
|
30ef544c6d
|
starting the c++ version of shoulder rotation
|
2018-08-23 15:57:14 +01:00 |
|
SamGondelman
|
c474f38860
|
force coarse picking, sort avatars
|
2018-08-22 18:07:16 -07:00 |
|
SamGondelman
|
5c0b12abf6
|
ordered ray/parabola intersection code
|
2018-08-22 16:29:17 -07:00 |
|
Wayne Chen
|
4daa30c1d0
|
changing text for check preference
|
2018-08-22 15:58:37 -07:00 |
|
Wayne Chen
|
9518b8cdaf
|
rearrangement
|
2018-08-22 15:46:02 -07:00 |
|
Wayne Chen
|
c32cc1ead2
|
adding implementation
|
2018-08-22 15:42:15 -07:00 |
|
Simon Walton
|
dd098f05c2
|
Change EntityQueryInitialResultsComplete protocol to use exclusive sequence number
|
2018-08-22 14:54:07 -07:00 |
|
luiscuenca
|
b3d127c953
|
Fix flickering
|
2018-08-22 14:31:34 -07:00 |
|
amantley
|
9dfaf32b72
|
fixed the step animation but it still needs work
|
2018-08-22 14:12:19 -07:00 |
|
amantley
|
2dd812935f
|
Merge remote-tracking branch 'upstream/master' into rotateFilterChange
|
2018-08-22 12:57:16 -07:00 |
|
amantley
|
1e3ca6f902
|
added quicker follow code and added head to rotate calculation
|
2018-08-22 12:57:06 -07:00 |
|
John Conklin II
|
50684f00c8
|
Merge pull request #13856 from sethalves/dont-squash-delete-events
don't squash delete events during shutdown so that QtWebEngine process gets destoryed
|
2018-08-22 12:44:35 -07:00 |
|
Seth Alves
|
579b2435c2
|
don't squash delete events during shutdown so that QWebEngine process gets destroyed
|
2018-08-22 11:04:26 -07:00 |
|
John Conklin II
|
04d72ea39d
|
Merge pull request #13850 from samcake/punk
Adjust Workload Region to be bigger
|
2018-08-22 10:21:14 -07:00 |
|
John Conklin II
|
32562511e8
|
Merge pull request #13782 from ElderOrb/FB17184
Add Support for Managing Avatar Entities to the Avatar App
|
2018-08-22 10:20:04 -07:00 |
|
amantley
|
456b8bf2a9
|
tweaked the animvars callback to update the spine2 position
|
2018-08-22 09:36:52 -07:00 |
|
luiscuenca
|
5f4903f884
|
Record entities
|
2018-08-22 08:53:51 -07:00 |
|
Sam Gateau
|
0f6f465e7f
|
Merge branch 'master' of https://github.com/highfidelity/hifi into punk
|
2018-08-21 19:23:33 -07:00 |
|
Alexander Ivash
|
cfb820762d
|
bulk adjusting to coding guidelines
|
2018-08-22 00:42:01 +03:00 |
|
Stephen Birarda
|
1723f3d3d8
|
don't use entity tree to clear all avatar entities
|
2018-08-21 12:21:29 -07:00 |
|
Stephen Birarda
|
a177e49877
|
Revert "send attachment clears through setAvatarEntityData"
This reverts commit 25876bca63.
|
2018-08-21 12:18:11 -07:00 |
|
Stephen Birarda
|
3e2d4dc696
|
fixes and improvments addressing CR comments
|
2018-08-21 10:53:52 -07:00 |
|
Stephen Birarda
|
25876bca63
|
send attachment clears through setAvatarEntityData
|
2018-08-21 10:32:05 -07:00 |
|
Stephen Birarda
|
f0ba61ff05
|
add missing local ID, reset client processed trait versions
|
2018-08-21 10:32:05 -07:00 |
|
Stephen Birarda
|
e33f349d53
|
fix flagging for avatar entity update/delete
|
2018-08-21 10:32:05 -07:00 |
|
Stephen Birarda
|
ea7c0e923a
|
make client traits handler a unique ptr in AvatarData
|
2018-08-21 10:31:15 -07:00 |
|