Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-04 14:59:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
70985 commits 76 branches 59 tags 1.2 GiB
Commit graph

26465 commits

Author SHA1 Message Date
sabrina-shanman
390e89a64d Fix missing NestableTransformNode import 2018-09-06 10:20:26 -07:00
sabrina-shanman
f7226757ad Just import TransformNode in AvatarTransformNode.h and similar 2018-09-06 10:03:05 -07:00
sabrina-shanman
84a2512f31 Fix collision pick scale not being used 2018-09-05 16:51:27 -07:00
sabrina-shanman
e8ce152687 Scale collision picks relative to parent by adding and using more 
specialized transform nodes.
 2018-09-05 16:51:28 -07:00
sabrina-shanman
62344c106d Make render states a map when returned from PointerScriptingInterface::getPointerProperties 2018-08-31 11:19:53 -07:00
sabrina-shanman
2e290ea798 Only create a NestableTransformNode if the spatially nestable exists 2018-08-31 10:52:00 -07:00
sabrina-shanman
f71fc83309 Remove PickResult::needsToCompareResults 2018-08-31 10:48:48 -07:00
sabrina-shanman
4d85cb17f3 Include full transform in CollisionPick::getResultTransform 2018-08-31 10:46:17 -07:00
sabrina-shanman
9bf088d32b Just assign mathPick.loaded in CollisionPick::getMathematicalPick 2018-08-31 10:28:45 -07:00
sabrina-shanman
e94d7de99a Add JS API hook for getting overlay IDs from a pointer via 
Pointer.getPointerProperties
 2018-08-31 09:18:07 -07:00
sabrina-shanman
1fe909f9ad Make CollisionPick::getResultTransform() always return a valid transform 2018-08-29 16:33:51 -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
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
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
sabrina-shanman
397b03d5d5 Add threshold parameter to collision pick with minimum of 0 2018-08-27 14:12:24 -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
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
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
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