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
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
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
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
Stephen Birarda
a0df68f32f
move skeleton model URL emit to AvatarData
2018-08-21 10:31:14 -07:00
Stephen Birarda
be7eb57205
handle whitelist avatar URL override via traits
2018-08-21 10:31:14 -07:00
Stephen Birarda
a80d19a44a
remove skeleton from identity, handle in clients
2018-08-21 10:31:14 -07:00
Stephen Birarda
ac835650b7
add skeleton trait sending to Agent, queuing in AvatarMixer
2018-08-21 10:31:14 -07:00
Stephen Birarda
486557e28a
initial trait packet sending on skeleton URL change
2018-08-21 10:31:14 -07:00
Wayne Chen
acc7d493ec
Merge pull request #13812 from SimonWalton-HiFi/safe-landing
...
Safe landing client-side improvements
2018-08-20 20:36:17 -07:00
Simon Walton
8d6aaf3fb5
Tidy some method names per reviewer comment
2018-08-20 17:50:29 -07:00
John Conklin II
e6c81cdfba
Merge pull request #13833 from sabrina-shanman/stt_performance
...
Performance improvements for Collision Pick API
2018-08-20 17:34:46 -07:00
Sam Gateau
e60756cfe6
Merge branch 'master' of github.com:highfidelity/hifi into punk
2018-08-20 15:54:23 -07:00
John Conklin II
b28aa3951f
Merge pull request #13802 from jherico/feature/scribe_programs
...
Migrating to scribe program descriptors
2018-08-20 14:48:54 -07:00
sabrina-shanman
9c36519e87
Fix cross-platform build error in ColliisonPick.cpp (binding to temporary)
2018-08-20 12:42:23 -07:00
Simon Walton
a891b74fac
Reset SafeLanding in all cases
...
Also remove unused data member, elevate load priority only
for entities with collisions, handle case of no nearby entities.
2018-08-20 12:31:21 -07:00
sabrina-shanman
813290aad8
Do filtering with copy vector in CollisionPick::filterIntersections
2018-08-20 11:23:22 -07:00
sabrina-shanman
444224a11a
Fix ignoring elements in CollisionPick::filterIntersections
2018-08-20 11:07:52 -07:00
sabrina-shanman
74f482b361
Revert "Convert entityIntersections/avatarIntersections lists in"
...
This reverts commit aa4a6b2eae
2018-08-20 10:15:28 -07:00
sabrina-shanman
2a182a0033
Revert "Do not create a reference to a shared pointer in CollisionPick.cpp"
...
This reverts commit 130cb70a52
2018-08-20 09:24:07 -07:00
Sam Gateau
60765902fb
Merge branch 'master' of https://github.com/highfidelity/hifi into punk
2018-08-18 15:04:43 -07:00
Alexander Ivash
9f92ff5de9
fix for duplicating wearables on saving
...
note: the issue was caused by newly-introduced code converting between attachments & entities
fix removes attachments-related code because attachments are deprecated and converted into entities on the fly
2018-08-18 16:38:35 +03:00
Alexander Ivash
3bcd6f4a25
take 'relayParentJoints' into account during wearables comparison
2018-08-18 16:33:30 +03:00
Alexander Ivash
877bce23d2
explicitely specify localRotations on joint change, otherwise it will be updated by engine
2018-08-18 16:32:31 +03:00
sabrina-shanman
51940898d9
Do not implicitly convert size of vector to bool in CollisionPick::filterIntersections
2018-08-17 16:23:31 -07:00
sabrina-shanman
6081d63f53
Use std::vector::insert for merging CollisionPickResults
2018-08-17 14:23:02 -07:00
sabrina-shanman
e3c39020dc
Exit early from CollisionPick::filterIntersections on empty blacklist
2018-08-17 14:23:02 -07:00
sabrina-shanman
2933038d04
Rename PhysicsEngine::getCollidingInRegion to contactTest and change it to accept collision flags instead of a MotionState enum
2018-08-17 14:22:42 -07:00
sabrina-shanman
b65572725d
Merge branch 'master' into stt_performance
2018-08-16 14:44:58 -07:00
Andrew Meadows
90429f07cb
don't forget to use enqueue the Transaction
2018-08-16 14:38:32 -07:00
John Conklin II
0c0ecd18c9
Merge pull request #13827 from amantley/newJumpWalkMotions
...
Replacing jump_takeoff.fbx and jump_land.fbx animations to fix transition to fly bug
2018-08-16 13:26:37 -07:00
John Conklin II
1edf1b4337
Merge pull request #13555 from SamGondelman/destroy
...
Trying to fix dependency shutdown
2018-08-16 13:14:58 -07:00
sabrina-shanman
130cb70a52
Do not create a reference to a shared pointer in CollisionPick.cpp
2018-08-16 10:39:13 -07:00
