Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-04 10:33:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
71183 commits 25 branches 0 tags 1.1 GiB
Commit graph

26572 commits

Author SHA1 Message Date
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
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
Zach Fox
a378435683 Fix MS16003: In PAL/GoTo WebView, 'BACK' closes app when you can't go back 2018-08-21 10:20:51 -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
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
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
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
amantley
0a1a75f752 Merge remote-tracking branch 'upstream/master' into newJumpWalkMotions 2018-08-15 10:26:24 -07:00
amantley
48e08276bf added new jump_takeoff and jump_land to fix the tposing in the transition to and from flying 2018-08-15 10:20:17 -07:00
Seth Alves
83718ca06d
Merge pull request #13746 from alexiamandeville/emoteIcon 
updating emote app icon
 2018-08-15 08:29:48 -07:00
Kerry Ivan Kurian
6a34bde49c
Merge pull request #13825 from roxanneskelly/autoScroll 
Auto scroll
 2018-08-14 20:56:53 -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
Roxanne Skelly
50b0a458ce Changes as requested by zfox23 - Start and stop timers on hover only if scroll is enabled. 2018-08-14 16:32:56 -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
Roxanne Skelly
5a8da4ce97 Fix 'hover-to-pause' functionality of AutoScroll Featured Stories list in the goto app 2018-08-14 15:28:22 -07:00
Roxanne Skelly
987d8569ae Merge branch 'autoScrollGoTo' of https://github.com/zfox23/hifi into autoScroll 2018-08-14 15:27:22 -07:00
John Conklin II
a5bace4e4d
Merge pull request #13706 from ElderOrb/FB17062 
use updated 'Last Legends: Male' from Mukul
 2018-08-14 14:18:39 -07:00
Ryan Huffman
19f27ec911
Merge pull request #13810 from ctrlaltdavid/M11360 
Don't auto-action entry in HMD file dialog when single-click
 2018-08-14 12:57:28 -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
Seth Alves
832eefd3a2
Merge pull request #13752 from ctrlaltdavid/M17208 
Improve text in Avatar app's pop-ups
 2018-08-14 08:48:04 -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
Sam Gateau
12f1b99283 Merge branch 'master' of github.com:highfidelity/hifi into punk 2018-08-10 16:41:08 -07:00
Zach Fox
57d2f04f14
Merge pull request #13799 from davidkelly/dk/17340 
Only update gain if it really changed
 2018-08-10 16:20:24 -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
Zach Fox
096be16bb1 Only restart timer if feedMouseArea doesn't contain mouse 2018-08-10 15:32:44 -07:00
Zach Fox
1a6a55680c PropagateComposedEvents 2018-08-10 15:30:32 -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
David Rowe
3a356de49f Don't auto-action entry in HMD file dialog when single-click on it 2018-08-11 09:46:11 +12:00
Alexander Ivash
c1ebadfdd8 adjust text in 'get wearables' popup 2018-08-11 00:43:39 +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
Alexander Ivash
e6915e63f2 put 'Fedora' on HEAD 2018-08-11 00:39:43 +03: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
Zach Fox
f514fde6fd
Merge pull request #13789 from zfox23/MS17469_listModelFix 
v0.72.0: Fix MS17469: Fix conditionals for needing more paginated results when ListView changes
 2018-08-10 10:24:01 -07:00
Alexander Ivash
9b9e30e829 add 'Tip: You can use hand controllers to grab and adjust your wearables' if in HMD 2018-08-10 20:14:15 +03:00
David Kelly
2b5ecd6b5f remove extraneous log 2018-08-10 10:12:32 -07:00
Simon Walton
a8b9568c92 Add some locking 2018-08-10 10:11:46 -07:00
Zach Fox
e39dd250cd Things will 'just work' once backend is in place 2018-08-10 10:01:09 -07:00
amantley
74186b0162 changed back speed to 2.2 m/s and the end frame for strafe left and right to 33, and the end frame for wlk_bkwd to 27 2018-08-10 09:56:24 -07:00
unknown
5641c59f5f Merge branch 'master' of https://github.com/highfidelity/hifi into createEntitiesGrabbable 2018-08-10 09:49:37 -07:00
Zach Fox
9124e5cf22 Merge branch 'master' of github.com:highfidelity/hifi into autoScrollGoTo 2018-08-10 09:47:10 -07:00
Zach Fox
1699d3ed6a Wording change in Availability 2018-08-10 09:35:40 -07:00
Alexander Ivash
3bfe173371 allow saving wearables right after adding new one 2018-08-10 19:15:35 +03:00
Alexander Ivash
9304d6c5c4 reset UI to default state & disable controls on removing last wearable 2018-08-10 18:42:08 +03:00
Alexander Ivash
90fb0d7be6 add possibility to add wearable from external url 2018-08-10 17:59:11 +03:00
Alexander Ivash
9234813e08 bring back 'get more' wearables button 2018-08-10 14:54:15 +03:00
Alexander Ivash
1771e4c742 better handling of 'modified' inside AdjustWearables dialog 2018-08-10 12:58:45 +03:00
Alexander Ivash
e900e034a3 couple Spinbox fixes: 
- stop resetting value in 'valueFromText'. The issue with such approach is that is is not possible to understand whether value was really changed or, for example, focus did change
- instead, propagate validator to TextInput which makes not possible to type bad text (which eliminate the reason for original fix)
- specify correct inputMethodHints to guide onscreen keyboards
 2018-08-10 12:58:45 +03:00
Alexander Ivash
0a28361dc8 treat ModelEntityItem-s with relayParentJoints as wearables 2018-08-10 12:58:45 +03:00
Alexander Ivash
56194bba8e bind 'is soft' to backend API, always show 'Hips' for soften entity 2018-08-10 12:58:45 +03:00
Alexander Ivash
da68a8906e show displayText if specified (to allow override combobox current value) 2018-08-10 12:58:45 +03:00