sam gateau
194903692e
clening up the code in LODmanager and the associated js/qml
2018-08-30 18:09:11 -07:00
Wayne Chen
5f43f5b276
adding different method for handling redirect
2018-08-30 17:40:13 -07:00
SamGondelman
5f08ed5027
misc perf improvements
2018-08-30 16:55:15 -07:00
Anthony Thibault
78d7c321b8
Merge pull request #13796 from amantley/noNeckFix
...
Avatar without Neck Joint bug 14620
2018-08-30 14:52:44 -07:00
sam gateau
8179de35b0
Merge branch 'master' of github.com:highfidelity/hifi into black
2018-08-30 14:46:40 -07:00
Dante Ruiz
03ede9371e
cleaning code
2018-08-30 14:26:39 -07:00
John Conklin II
8fa4a2855e
Merge pull request #13641 from amantley/rotateFilterChange
...
Hand Azimuth Controls Shoulder Rotation
2018-08-30 13:59:00 -07:00
David Back
cee270780b
Merge pull request #13908 from dback2/androidCrashStateVariables
...
Fix Android StateController assert
2018-08-30 13:37:13 -07:00
Sam Gateau
9e2a540bab
Merge branch 'master' of github.com:highfidelity/hifi into black
2018-08-30 12:12:24 -07:00
Sam Gateau
78c7948ebc
fine tuning the noise coef ramp and documenting the algorithm
2018-08-30 12:11:43 -07:00
John Conklin II
f5ebdfa233
Merge pull request #13905 from zfox23/fixPr13870
...
Fixup PR13870: Make the feature work in Master
2018-08-30 11:08:23 -07:00
John Conklin II
bf0ab865bb
Merge pull request #13903 from birarda/bug/av-entity-delete-master
...
send MyAvatar avatar entity updates through entity tree
2018-08-30 10:25:31 -07:00
David Back
8b1fcfcce9
fix double windows platform
2018-08-30 10:16:27 -07:00
Sam Gateau
12ec56875e
Merge pull request #13867 from SamGondelman/recurse
...
findRayIntersection/findParabolaIntersection performance improvements
2018-08-30 09:49:16 -07:00
Dante Ruiz
8c77820e30
Merge branch 'master' of github.com:highfidelity/hifi into interstitial-final-page
2018-08-30 09:45:41 -07:00
Wayne Chen
f07f326f06
Merge branch 'master' of https://github.com/highfidelity/hifi into 404DomainRedirect
2018-08-30 09:08:22 -07:00
Sam Gateau
6c502e79e3
Fine tuning a LOD regulator PV that works
2018-08-29 22:56:44 -07:00
Sam Gateau
8f4419de30
Merge branch 'master' of https://github.com/highfidelity/hifi into black
2018-08-29 19:11:03 -07:00
Sam Gateau
4844f06e5e
brain freeze
2018-08-29 17:33:39 -07:00
Zach Fox
b8cd5dd8b9
Fixup PR13870: Make the feature work in Master
2018-08-29 16:58:19 -07:00
Sam Gondelman
cfffa65819
Merge pull request #13899 from SamGondelman/pointerPerf
...
Improve Pointer performance
2018-08-29 16:57:43 -07:00
Wayne Chen
eb29c9c4a2
updating with default landing location
2018-08-29 16:53:22 -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
Wayne Chen
3810984056
Merge branch 'master' of https://github.com/highfidelity/hifi into 404DomainRedirect
2018-08-29 16:18:16 -07: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
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
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
Wayne Chen
442644381a
adding other connection refused suppressions
2018-08-28 20:16:55 -07:00
Wayne Chen
6689c15564
Merge branch 'master' of https://github.com/highfidelity/hifi into 404DomainRedirect
2018-08-28 19:22:34 -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
Wayne Chen
8a9ad421e7
adding serverless file + redirection if conn fail
2018-08-28 15:50:14 -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
David Rowe
c29c9f98c1
Make Cancel in HMD settings dialogs return to Settings dialog
2018-08-28 11:15:57 +12: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
danteruiz
e2cd695dfb
PR code clean up
2018-08-27 11:01:29 -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
danteruiz
e4293d9ad5
fixing some entity visual problems
2018-08-26 21:50:01 -07:00
Dante Ruiz
92acaade2b
trying to fix problems
2018-08-24 17:13:57 -07:00
amantley
8406fb2359
Merge remote-tracking branch 'upstream/master' into steppingReboot
2018-08-24 16:48:26 -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
Dante Ruiz
af19849a75
fixing merge conflict
2018-08-24 15:48:42 -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
Dante Ruiz
3796675123
script update and visuallyReady entities
2018-08-24 15:46:39 -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
Dante Ruiz
11ab6dd0b5
Merge branch 'master' of github.com:highfidelity/hifi into interstitial-final-page
2018-08-23 13:20:09 -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
Dante Ruiz
54258a8707
Merge branch 'master' of github.com:highfidelity/hifi into interstitial-final-page
2018-08-23 09:53:20 -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
Dante Ruiz
db8e1bdfa3
compile error fix
2018-08-22 16:47:18 -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
Dante Ruiz
f5441b2721
Merge branch 'master' of github.com:highfidelity/hifi into interstitial-final-page
2018-08-22 15:28:42 -07:00
Dante Ruiz
78458d62de
revert some changes and fix toolbar issue
2018-08-22 15:20:56 -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
Dante Ruiz
535fdf32cf
saving changes
2018-08-22 13:13:00 -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
Dante Ruiz
54236e5c59
fixing loading bar
2018-08-22 10:58:55 -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
Dante Ruiz
26a30edec9
trying to fix loading bar
2018-08-21 18:27:21 -07:00
amantley
1fabc77244
latest update to stop lurching, and allow leaning, and stop perma leans
2018-08-21 12:34:05 -07: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
Dante Ruiz
b2fb2c7f98
fix build error
2018-08-21 10:45:59 -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
Dante Ruiz
db3d3d3d93
Merge branch 'master' of github.com:highfidelity/hifi into interstitial-final-page
2018-08-21 09:56:59 -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
amantley
2dcdd60750
added new AvatarConstants and more frequent horizontal recentering to deal with lurching walk in large tracked volumes
2018-08-20 17:32:52 -07:00
SamGondelman
9ab1fc0500
Merge remote-tracking branch 'upstream/master' into perf
2018-08-20 17:04:42 -07:00
amantley
baa17395f0
Merge remote-tracking branch 'upstream/master' into rotateFilterChange
2018-08-20 16:47:21 -07:00
amantley
94026fb4dd
added activate(rotation) to prephysics update
2018-08-20 16:47:14 -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
SamGondelman
05ff99a1d2
working on blendshapes
2018-08-20 11:40:25 -07:00
sabrina-shanman
813290aad8
Do filtering with copy vector in CollisionPick::filterIntersections
2018-08-20 11:23:22 -07:00
Dante Ruiz
2261ad2bcb
clean up the interstitial page
2018-08-20 11:14:48 -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
amantley
471bb28545
Merge remote-tracking branch 'upstream/master' into steppingReboot
2018-08-20 09:50:45 -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
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
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
John Conklin II
02f53c4ee5
Merge pull request #13808 from dback2/createEntitiesGrabbable
...
Use Create Entities as Grabbable option when adding asset to world
2018-08-16 09:22:23 -07:00
sabrina-shanman
67ff05739a
Take advantage of CollisionPickResult intersections being shared pointers to avoid copying on result comparison
2018-08-16 09:00:30 -07:00
sabrina-shanman
aa4a6b2eae
Convert entityIntersections/avatarIntersections lists in
...
CollisionPickResult to shared pointers
2018-08-16 08:59:29 -07:00
elderorb
ea22fdb400
Merge branch 'master' into FB17184
2018-08-16 02:08:47 +03:00
Ryan Huffman
5d44877f56
Fix functionality sometimes getting stuck if window loses focus
2018-08-15 13:32:58 -07:00
sabrina-shanman
61d12923ea
Do not copy list of collision pick contact points when filtering them
2018-08-15 11:12:50 -07:00
John Conklin II
032e67fd8e
Merge pull request #13748 from ElderOrb/FB16831
...
FB16831 qml-related warnings in log
2018-08-14 16:40:07 -07:00
Seth Alves
3623590e90
Merge pull request #13784 from sethalves/far-point-joints
...
Far point joints
2018-08-14 15:40:07 -07:00
Seth Alves
dce7b6eae6
Merge pull request #13714 from sabrina-shanman/safe-teleport-target
...
Create CollisionPick API
2018-08-14 09:56:51 -07:00
Seth Alves
e5e9339a7b
Merge pull request #13819 from ElderOrb/FB16914
...
Avatar bookmarks missing from Avatar Favorites
2018-08-14 09:46:37 -07:00
Seth Alves
527b27da96
pseudo-joints for far-grab positions
2018-08-14 08:55:20 -07:00
sabrina-shanman
e5cb078133
Merge branch 'master' of github.com:highfidelity/hifi into safe-teleport-target
2018-08-13 14:51:37 -07:00
Seth Alves
0a5c96ecc1
Merge pull request #13792 from luiscuenca/attachmentsAPImgr
...
Attachments API returns avatar entities
2018-08-13 14:21:13 -07:00
Alexander Ivash
f910757ec4
FB16914 - Avatar bookmarks missing from Avatar Favorites
2018-08-13 22:57:07 +03:00
unknown
8a22d0adc7
set grabbable user data in addAssetToWorldCheckModelSize
2018-08-11 11:04:44 -07:00
unknown
c622a587e3
Merge branch 'master' of https://github.com/highfidelity/hifi into createEntitiesGrabbable
2018-08-11 07:59:56 -07:00
Simon Walton
829b83c61d
Use elevated model priority during initial load
2018-08-10 18:16:08 -07:00
amantley
c2612af7a8
changed the spine stretch limit, will check the scale implications next
2018-08-10 17:10:33 -07:00
Dante Ruiz
75cc1c62c0
mostly done interstitial page
2018-08-10 16:53:34 -07:00
Sam Gateau
12f1b99283
Merge branch 'master' of github.com:highfidelity/hifi into punk
2018-08-10 16:41:08 -07:00
Simon Walton
0ae86d5aa8
Remove useless statement
2018-08-10 16:16:58 -07:00
luiscuenca
dd93055d89
Convert and load attachments when rig is ready
2018-08-10 16:15:30 -07:00
Sam Gateau
d5c5bd714f
Merge pull request #13785 from AndrewMeadows/no-update-fading-avatars
...
don't call Avatar::simulate() on fading avatars
2018-08-10 15:44:07 -07:00
Simon Walton
05fa7fdf0e
Clean-up
2018-08-10 15:43:51 -07:00
Sam Gateau
d5cfe95a0a
merging with master
2018-08-10 15:03:33 -07:00
John Conklin II
644ff1eafa
Merge pull request #13655 from amantley/animationBlendChanges
...
New Default Strafe Animations Plus Animation Tuning Support
2018-08-10 15:03:30 -07:00
Alexander Ivash
5ba68cbfac
remove attachments menu item / dialogs / related components
2018-08-11 00:50:32 +03:00
Simon Walton
3c665b7de8
Don't delete sequence numbers outside of range as range may change
2018-08-10 14:40:08 -07:00
John Conklin II
61f0e9323a
Merge pull request #13800 from samcake/zvork-shadow
...
Fixing PR13731 shader error on Mac
2018-08-10 14:10:47 -07:00
unknown
8c185aa04e
fix menu option
2018-08-10 12:13:09 -07:00
unknown
5d1cc3696a
Merge branch 'master' of https://github.com/highfidelity/hifi into createEntitiesGrabbable
2018-08-10 12:10:57 -07:00
unknown
45b9871fdb
when adding asset to world set grabbable
2018-08-10 12:10:49 -07:00
sabrina-shanman
e5e1a72598
Use 'orientation' for Collision Pick API, not 'rotation'
2018-08-10 10:52:21 -07:00
Wayne Chen
6b73a0bba5
Merge pull request #13801 from wayne-chen/fixMyAvatarScale-case-17434
...
MS17434: modifying MyAvatar.scale get property
2018-08-10 10:45:53 -07:00
Simon Walton
a8b9568c92
Add some locking
2018-08-10 10:11:46 -07:00
unknown
5641c59f5f
Merge branch 'master' of https://github.com/highfidelity/hifi into createEntitiesGrabbable
2018-08-10 09:49:37 -07:00
Alexander Ivash
0a28361dc8
treat ModelEntityItem-s with relayParentJoints as wearables
2018-08-10 12:58:45 +03:00
Brad Davis
f03370c826
Migrating to scribe program descriptors
2018-08-09 17:58:34 -07:00
sabrina-shanman
660178e5bb
Remove 'plane' from list of supported Collision Pick shapeTypes, since it turns out ShapeFactory does not support it
2018-08-09 17:41:46 -07:00
Wayne Chen
769e7eab03
removing domainLimitedScale property and changing read property of scale
2018-08-09 17:38:58 -07:00
amantley
c8a31bc59f
created a backward walk speed constant 1.6m/s and changed the characteristic speed for strafe right left to 1.3
2018-08-09 17:38:57 -07:00
Wayne Chen
d533e3b341
adding domainLimitedScale property
2018-08-09 17:29:13 -07:00
sabrina-shanman
4c367fa443
Fix outdated explanation of when CollisionPickResult.intersects is true
2018-08-09 17:26:54 -07:00
sabrina-shanman
b32b811fff
Move up buildObjectIntersectionsMap in CollisionPick.cpp
2018-08-09 17:24:09 -07:00
John Conklin II
2d9cbe91bb
Merge pull request #13780 from hyperlogic/bug-fix/perftimer-memory-corruption
...
Fix memory corruption in PerformanceTimer when Stats are active
2018-08-09 17:16:03 -07:00
sabrina-shanman
26ae688d59
Refactor CollisionPickResult::toVariantMap
2018-08-09 17:11:32 -07:00
sabrina-shanman
c5e9f02372
Finalize Collision Pick API naming convention for intersectingObjects
2018-08-09 16:59:23 -07:00
Simon Walton
875407b3fe
New approach to physics readiness - now (mostly) working
2018-08-09 16:24:04 -07:00
sabrina-shanman
4f077080b0
Change API naming for intersectingObjects in CollisionPickResult and update docs
2018-08-09 15:29:21 -07:00
sabrina-shanman
4d31863484
Fix missing jsdoc note for getPrevPickResult on existence of ParabolaPickResult
2018-08-09 15:08:27 -07:00
John Conklin II
6481aea2f4
Merge pull request #13715 from SamGondelman/parabolic
...
Enable parabolic teleport
2018-08-09 13:12:17 -07:00
John Conklin II
59977fe1d3
Merge pull request #13764 from r3tk0n/17249-safe-landing
...
Relocate Avatar Spawn Point from the Hips to the Feet
2018-08-09 12:45:30 -07:00
David Back
9779ce1b80
Merge pull request #13777 from dback2/reloadContentScriptCache
...
Clear script cache with reload content
2018-08-09 12:19:39 -07:00
amantley
f26d6b8c3d
cleaned up code and changed the forward offset for the default eyes when there is no neck bone
2018-08-09 12:15:35 -07:00
luiscuenca
9ca0ee05dc
Fix wanings
2018-08-09 12:13:03 -07:00
amantley
a3f2fd1f23
removed some print statements and added the code to use the head parent when the neck is missing, this allows for cauterization
2018-08-09 11:33:27 -07:00
Simon Walton
4395e1fa26
Safe Landing checkpoint
2018-08-09 11:11:58 -07:00
luiscuenca
8c121a531d
Turn attachments into avatar entities
2018-08-09 10:35:15 -07:00
Andrew Meadows
8153e660bf
don't simulate/animateScaleChanges for fading avatars
2018-08-09 08:54:28 -07:00
Dante Ruiz
faa5411757
Merge branch 'master' of github.com:highfidelity/hifi into interstitial-final-page
2018-08-09 08:42:14 -07:00
amantley
c774dd7f5b
debugging to solve the no-neck crazy scale problem
2018-08-08 17:52:22 -07:00
Anthony Thibault
90b0bd333f
Merge pull request #13774 from danteruiz/revert-tablet-material-entity
...
Revert to using overlays instead of material entities for button highlighting.
2018-08-08 17:33:26 -07:00
David Back
8db0711b5b
set grabbable user data in addModelEntity, pass grabbable from asset browser
2018-08-08 16:33:47 -07:00
Sam Gateau
16bf46ea34
Merge branch 'master' of github.com:highfidelity/hifi into punk
2018-08-08 14:22:52 -07:00
Andrew Meadows
9b0dcb45ba
don't update fading avatars
2018-08-08 14:00:44 -07:00
Simon Walton
88bd4e3d9a
WIP - safe landing infrastructure
2018-08-08 12:32:45 -07:00
sabrina-shanman
5b6916177c
Add support for rotation as CollisionRegion parameter and make it the default
2018-08-08 10:47:13 -07:00
sabrina-shanman
22142a84b8
Remove JS documentation on 'loaded' parameter referencing unsupported model collision pick
2018-08-08 10:42:26 -07:00
Stephen Birarda
e686df6fb9
Merge pull request #13720 from Atlante45/feat/test-tool
...
Stack tester changes
2018-08-08 13:40:05 -04:00
Anthony J. Thibault
c4c3581285
Fix memory corruption in PerformanceTimer when Stats are active
...
PerformanceTimer was neither thread safe nor re-entrant. Because it was being used increasingly on render and worker threads it has increased the likelihood of heap corruption.
I was able to identify this by enabling full page heap verification using the gflags app.
https://docs.microsoft.com/en-us/windows-hardware/drivers/debugger/enable-page-heap
2018-08-08 09:53:26 -07:00
Sam Gateau
9295007d99
fixing the ui script and trying to get shadow
2018-08-08 09:22:31 -07:00
Olivier Prat
2584ce4c96
Merged with master
2018-08-08 08:42:44 +02:00
sabrina-shanman
69812d04ae
Reduce scope of CollisionPick shapeType to primitive shapes
2018-08-07 17:42:38 -07:00
Dante Ruiz
a9fd034f09
switching to location api
2018-08-07 16:02:54 -07:00
r3tk0n
32165dff40
Fixed rotations in MyAvatar::goToFeetLocation()
2018-08-07 14:31:48 -07:00
amantley
1353406254
more whitespace
2018-08-07 12:56:28 -07:00
David Back
a905a76c70
reload script cache with reload content
2018-08-07 11:53:11 -07:00
