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

30835 commits

Author SHA1 Message Date
sabrina-shanman
921eed1ec1 Remove CollisionPick::computeShapeInfo 2019-11-05 10:57:54 -08:00
sabrina-shanman
7b14c00540 Merge branch 'master' into instancing 2019-11-05 10:22:24 -08:00
amerhifi
343807a9f5 Merge branch 'master' of https://github.com/highfidelity/hifi 2019-11-05 10:17:04 -08:00
Zach Fox
683c3f1300 An experiment with the top bar. Will you notice? 2019-11-05 09:33:11 -08:00
amer cerkic
b10f2a86c2 removed extra spaces 2019-11-04 15:44:15 -08:00
amer cerkic
81881acafc fixing a few spacing issues 2019-11-04 15:08:06 -08:00
amer cerkic
b2ab33116f removing double calls to switch devices, handling default changes from scripting interface instead 2019-11-04 15:03:53 -08:00
luiscuenca
de2d2de938
Head woes in 1st person part 2 2019-11-04 13:33:00 -07:00
Sam Gateau
a4696992e8 Renaming the env variable to enable Material Proecural Shaders 2019-11-04 11:15:37 -08:00
Anthony J. Thibault
101ec9d753 Remove LipsUpperOpen and LipsLowerOpen, the last of the legacy faceshift blendshapes 
These blendshapes are not present in ARKit and are not used by any of our procedural
face animations (talking, blinking etc).  This change should have been part of #16400 but
was accidently left out.
 2019-11-04 09:49:24 -08:00
HifiExperiments
bae2ba7bae merge with master 2019-11-02 01:08:56 -07:00
Zach Fox
e1b02fb73a The same message as the last commit, except do the work this time 2019-11-01 13:23:25 -07:00
Zach Fox
9273db4844 Fix an issue that prevented new screenshare scripts from running properly 2019-11-01 13:03:16 -07:00
milad
d9d9877f83 Merge branch 'master' of github.com:highfidelity/hifi into screenshareElectronApp 2019-11-01 10:53:03 -07:00
milad
f2e49cb553 Merge branch 'screenshareElectronApp' of github.com:MiladNazeri/hifi into screenshareElectronApp 2019-11-01 10:52:46 -07:00
milad
1b3367fcf9 logging ids 2019-11-01 10:51:23 -07:00
Sabrina Shanman
05ac16536e
Merge pull request #16436 from highfidelity/master 
Merge master into instancing
 2019-10-31 17:39:15 -07:00
Anthony J. Thibault
4b34311a0a Hooked up seated version of aim offset animation 2019-10-31 16:23:29 -07:00
MiladNazeri
676e7bd5b8
Merge branch 'master' into screenshareElectronApp 2019-10-31 13:11:56 -07:00
Anthony Thibault
f99bb3ec77
Merge pull request #16400 from hyperlogic/feature/arkit-blendshapes 
Extended avatar blendshape support for ARKit compatiblity
 2019-10-31 12:33:50 -07:00
Zach Fox
68819addd5 Attempt to fix DEV-2615 and DEV-2618 with more menu scripting interface guards 2019-10-31 11:29:46 -07:00
Zach Fox
a336a71db9 Add necessary include 2019-10-31 10:39:04 -07:00
Zach Fox
47b3fdbfe3 Stop screenshare process on interface shutdown 2019-10-31 10:01:00 -07:00
Maia Hansen
de5570ced8
Merge pull request #16421 from amerhifi/dev-2571new 
case DEV-2771: Audio client shutdown lock
 2019-10-31 09:50:56 -07:00
Zach Fox
d8026304a4 Guard against a crash in stopScreenshare() 2019-10-31 09:47:31 -07:00
Zach Fox
1e2fcf8bd5 Add screenshareStopped signal; use std::unique_ptr<QProcess> 2019-10-31 09:43:56 -07:00
Zach Fox
c22f5097c0 Make SCREENSHARE_EXE_PATH private 2019-10-31 09:24:28 -07:00
Zach Fox
6291590737 Fixup paths 2019-10-31 09:01:02 -07:00
Zach Fox
1e24df3f71 Get Interface to look in the proper directories 2019-10-31 08:57:06 -07:00
amerhifi
52e0f54d0c addressing comments 2019-10-31 07:21:16 -07:00
milad
ea373ac14c First steps towards a screenshare app 2019-10-30 16:44:42 -07:00
amer cerkic
4b4b722875 fixed issues related to context switching and selection with hmd 2019-10-30 16:27:19 -07:00
Shannon Romano
8d6434fbca
Merge pull request #16367 from ctrlaltdavid/DOC-199 
DOC-199: AudioScope JSDoc
 2019-10-30 13:45:13 -07:00
amer cerkic
39e1092660 working on hmd fix 2019-10-30 11:34:41 -07:00
Shannon Romano
9948a181dc
Merge pull request #16392 from kitely/load-avatar-entities-after-skeleton 
In Bookmarks, attach avatar entities after the skeleton is loaded
 2019-10-30 09:29:51 -07:00
Sabrina Shanman
e8b963b59a
Merge pull request #16425 from highfidelity/master 
Merge master into instancing
 2019-10-30 09:16:04 -07:00
Shannon Romano
2b25dd30d2
Merge pull request #16424 from RebeccaStankus/consoleText 
Specified color on text edit for console
 2019-10-30 09:15:27 -07:00
Oren Hurvitz
7953e3889f Wait for the avatar skeleton to finish loading before adding the avatar entities 2019-10-30 12:12:26 +02:00
Rebecca Stankus
9c0003515a Specified color on text edit for console 2019-10-29 15:46:16 -07:00
amerhifi
ddfbb55e19 fixed old ui filtering of audio devices 2019-10-29 15:36:43 -07:00
Shannon Romano
8fc135d972
Merge pull request #16423 from hyperlogic/bug-fix/third-person-look-at-fix-2 
DEV-2302: Fix for head not turning in third person look at camera mode
 2019-10-29 13:41:13 -07:00
Brad Hefta-Gaub
206e519b5e
Merge pull request #16390 from kitely/fix-walk-speed 
Fixed the sprint speeds of Desktop vs HMD
 2019-10-29 13:04:45 -07:00
Anthony Thibault
4341da03c5
Merge pull request #16419 from luiscuenca/lookAtFixes 
DEV-2285: Fix look at update and allow to release control
 2019-10-29 12:56:22 -07:00
Anthony J. Thibault
e753010411 Fix for head not turning in third person look at camera mode 
If MyAvatar::setSkeletonModelURL() is called with the same url that has already been loaded the
SkeletonModel::skeletonLoaded signal will not be triggered.  In this case the MyAvatar local variable
MyAvatar::_skeletonModelLoaded will be set to false and never re-set to true.  This, in turn,
caused MyAvatar::updateHeadLookAt() to skip setting the proper blend values that would turn the head.

Rather then try to make MyAvatar::_skeletonModelLoaded handle all the possible edge cases. It has
been removed.  All conditionals that used to use it have been replased with _skeletonModel->isLoaded().
 2019-10-29 12:38:06 -07:00
amerhifi
7d5dcbfc77 space cleanup 2019-10-29 11:58:04 -07:00
Rebecca Stankus
b8d6a2cf0b Added extra attempt to parent interactive window content on creation 2019-10-29 11:20:14 -07:00
amerhifi
884cbd7de9 working on moving display plugin lookup to audiodevices 2019-10-29 09:26:48 -07:00
luiscuenca
ab6631fae3
Fix look at update and allow to release control 2019-10-28 17:51:29 -07:00
Zach Fox
bda1e3f696
Merge pull request #16398 from RebeccaStankus/grayEmoteWindow 
Gray emote window
 2019-10-28 11:37:17 -07:00
Oren Hurvitz
70c3bb2748 Emit an event when failing to load an avatar. 
Previously, MyAvatar only emitted an event (onLoadComplete) if the load succeeded.
Now it also emits an event (onLoadFailed) if the load failed.
 2019-10-27 10:55:31 +02:00
Oren Hurvitz
62e5b50e24 Fixed the sprint speeds of Desktop vs HMD (they were flipped) 2019-10-27 09:33:59 +02:00
Anthony J. Thibault
9325ea588a Re-added removed jsdoc comments for removed AvatarInput jsapi. 
With a comment that these properties/functions have been removed.
 2019-10-26 09:20:51 -07:00
HifiExperiments
deb5aacfad fix materialcachescriptinginterface 2019-10-25 18:16:08 -07:00
Sabrina Shanman
e74de214e2
Merge pull request #16404 from highfidelity/master 
Merge master into instancing
 2019-10-25 09:55:44 -07:00
Amer
42234b119f
Merge pull request #16381 from amerhifi/amer-dev471-re 
case Dev 471: HMD default audio behavior
 2019-10-24 16:23:14 -07:00
Shannon Romano
15f27e53cb
Merge pull request #16372 from ctrlaltdavid/DEV-2055 
DEV-2055: Sanitize LODManager.setWorldQualityDetail() parameter value
 2019-10-24 15:20:34 -07:00
Rebecca Stankus
9a8fda2705 Feedback changes 2019-10-24 12:07:34 -07:00
Rebecca Stankus
f8102be74d Added a timeout to update the content holder parent after interactive window has finished loading 2019-10-24 12:07:25 -07:00
Rebecca Stankus
8e8c157567 Debugging stuff 2019-10-24 12:07:20 -07:00
Rebecca Stankus
83a6155592 Added tons of logging to debug interactive window 2019-10-24 12:06:49 -07:00
Anthony J. Thibault
dc7b611e8e documentation and warning fixes 2019-10-24 09:53:11 -07:00
HifiExperiments
1e100a672e merge with master and try to fix opacity mode stuff 2019-10-23 22:21:45 -07:00
Anthony J. Thibault
d43d12dfa7 Merge branch 'master' into feature/arkit-blendshapes 2019-10-23 21:45:10 -07:00
Anthony Thibault
edb181bd16
Merge pull request #16317 from luiscuenca/setAvatarLookAtAPI 
DEV-2285: Improve eyes look at
 2019-10-23 20:42:27 -07:00
Anthony J. Thibault
f28d317914 Clean up reamining issues 2019-10-23 16:43:10 -07:00
Shannon Romano
3268fa7a9f
Merge pull request #16386 from luiscuenca/fixStrafingError 
DEV-2475: Fix head twitching when strafing
 2019-10-23 14:48:57 -07:00
Zach Fox
a6bcbe4c66 DEV-2463: Put FTUE users in an empty serverless domain instead of the tutorial 2019-10-23 14:32:03 -07:00
luiscuenca
bb0849d3a0
Move changes to Head and remove leftover code 2019-10-23 14:23:29 -07:00
Shannon Romano
fb7589eff9
Merge pull request #16347 from ctrlaltdavid/DOC-195 
DOC-195: Keyboard JSDoc
 2019-10-23 14:01:03 -07:00
Zach Fox
1b24f61dd9
Merge pull request #16395 from zfox23/menuInstanceCheck 
DEV-2498: Fix a crash in MenuScriptingInterface
 2019-10-23 13:42:45 -07:00
David Rowe
423074463d Typo 2019-10-24 09:17:13 +13:00
David Rowe
a949f327d2 Merge branch 'master' into DOC-199 2019-10-24 09:14:08 +13:00
amer cerkic
179f5e0873 fixed context switching issue with hmd. included additional output info for other audio crash issues 2019-10-23 12:56:43 -07:00
luiscuenca
9849205ca0
Add perf timer to code block 2019-10-23 12:32:16 -07:00
Zach Fox
f847d364a8 DEV-2498: Fix a crash in MenuScriptingInterface 2019-10-23 11:52:07 -07:00
Zach Fox
df782edcd9 DEV-2541: Update 'Jump To' top bar expanded text 2019-10-23 11:14:22 -07:00
Anthony J. Thibault
61b9f08fec Blendshapes for OtherAvatars should update even if no joints have changes. 2019-10-22 22:19:03 -07:00
David Rowe
ea864e4e97 Remove unused variable 2019-10-23 08:13:46 +13:00
dooglifeSF
b8a607dcf0 remove unused slow speed sidesteps 2019-10-22 11:53:59 -07:00
luiscuenca
f6aa4a2dd4
Head look at should update before rig 2019-10-22 11:42:19 -07:00
amer cerkic
0410a45da1 fixed selection issue 2019-10-22 11:11:13 -07:00
amerhifi
a8602195d4 addressing comments 2019-10-22 07:17:57 -07:00
David Rowe
6a2e67ca54 Typo 2019-10-22 21:07:04 +13:00
David Rowe
378c47d16c Replace world detail quality float with enum 2019-10-22 19:18:11 +13:00
amerhifi
68681fdb2e Merge branch 'master' into amer-dev471-re 2019-10-21 21:04:24 -07:00
Anthony J. Thibault
03f88f696d Renamed LipsTogether to MouthClose and bug fixes. 2019-10-21 19:37:57 -07:00
luiscuenca
a4fcb2c39e
Add eyesLookAtTarget set/get API methods 2019-10-21 14:31:15 -07:00
dooglifeSF
b914bb60fe Change strafeleft<->straferight transitions to isMoving vars and remove the sidesteps from the blendranges 2019-10-21 14:15:31 -07:00
amerhifi
421cff1cb2 fixed naming to match standards 2019-10-18 15:30:32 -07:00
amerhifi
c7e1fdaeac adding hmd audio device info to deviceslist 
changing locations

one more

merge

working on the threading issue

changing offices, working on qml

simple qml filtering

fixed spacing problem when item is removed
 2019-10-18 15:29:10 -07:00
Zach Fox
4c48d80da7 Fix warning on MacOS and Ubuntu 2019-10-18 13:34:42 -07:00
Zach Fox
d65538a11b DEV-2471: Fix an issue with InteractiveWindow anchors that caused windows without anchors to move when the Interface window geometry changes 2019-10-18 12:41:19 -07:00
Sabrina Shanman
5d91d22314
Merge pull request #16379 from highfidelity/master 
Merge master into instancing
 2019-10-18 10:24:35 -07:00
Maia Hansen
fbb47bcfbb
Merge pull request #16370 from AndrewMeadows/secondary-shadows 
DEV-2293: secondary canera shadow config should recognize performance tier restrictions
 2019-10-17 18:26:29 -07:00
David Rowe
3bcb305f70 Santize LODManager.setWorldQualityDetail() parameter value 2019-10-18 11:51:51 +13:00
luiscuenca
33ea63c708
Fix warnings and update controls 2019-10-17 15:06:12 -07:00
Andrew Meadows
8aa1bddcee RenderSecondView shadow config follows that of RenderMainView 2019-10-17 14:11:18 -07:00
luiscuenca
63c2b41929
Restate legacy first person camera mode 2019-10-17 13:26:42 -07:00
David Rowe
fa9bf4d51c JSDoc fixes noticed in passing 2019-10-18 09:17:03 +13:00
David Rowe
24b4374967 AudioScope JSDoc 2019-10-18 09:15:56 +13:00
Shannon Romano
95f00e2caa
Merge pull request #16362 from huffman/fix/mac-early-exit 
DEV-830: Remove call to processEvents on Mac in ~Application
 2019-10-16 22:22:58 -07:00
luiscuenca
9000b4c7f8
Tweak camera position in first person to further hide neck 2019-10-16 17:31:10 -07:00
Ryan Huffman
e83ac8c0dd Remove call to processEvents on Mac in ~Application 2019-10-16 16:14:27 -07:00
luiscuenca
9f0e82e1e6
Improve eye's look at and blinking. Fix look at update 2019-10-16 15:29:28 -07:00
Sam Gateau
af269a4720 Merge branch 'master' of github.com:highfidelity/hifi into upstream-instancing 2019-10-16 11:57:15 -07:00
Anthony Thibault
5115b52ca0
Merge pull request #16356 from luiscuenca/fixLookAtNoHead 
DEV-2316: Fix camera position in first person
 2019-10-16 10:52:53 -07:00
Anthony J. Thibault
389f5a1d33 ARKit Blendshape hookup work 2019-10-16 10:36:39 -07:00
Anthony J. Thibault
6efd74a339 WIP adding blendshapes to input system 2019-10-16 10:36:38 -07:00
Anthony J. Thibault
da0911e01b Delete legacy blendshape code 
Move FaceshiftConstants to BlendshapeConstants.
Delete FaceTracker and DdeFaceTracker classes.
Delete old facetracker menu and preferences
 2019-10-16 10:36:37 -07:00
Anthony J. Thibault
8411e6b033 Blendshape script API work 
* Moved hasScriptedBlendshapes, hasProceduralBlinkFaceMovement, hasProceduralEyeFaceMovement, hasAudioEnabledFaceMovement to AvatarData
  so they are accessable via agent scripts.
* Marked setForceFaceTrackerConnected as depricated.
* Updated jsdoc comments
 2019-10-16 10:36:35 -07:00
luiscuenca
02837be13f
Get state using CharacterController 2019-10-16 09:04:03 -07:00
Shannon Romano
71ef645781
Merge pull request #16351 from dooglifeSF/transition-locomotion-to-idle-based-on-input-and-speed 
Fix sliding when stopping from run.
 2019-10-16 09:03:00 -07:00
Shannon Romano
c2270765c1
Merge pull request #16355 from hyperlogic/bug-fix/hmd-flying-fix 
Fix for HMD mode flying
 2019-10-16 08:42:22 -07:00
luiscuenca
93a1adc736
Fix camera position in first person 2019-10-15 18:25:33 -07:00
Anthony J. Thibault
288f9bfb16 Fix for HMD mode flying 
In HMD mode you should fly/move in the direction you are looking.
 2019-10-15 18:22:42 -07:00
Zach Fox
1527bf2e11
Merge pull request #16294 from RebeccaStankus/friction 
First Time User Experience Project
 2019-10-15 14:56:25 -07:00
dooglifeSF
a043f0a17e Create isNotInputSlow var for stategraph switch when no input and speed less than 1.5 m/s 2019-10-15 14:51:42 -07:00
David Rowe
b793e23cb0 Keyboard JSDoc 2019-10-15 15:24:41 +13:00
Shannon Romano
f29d4aad1b
Merge pull request #16322 from Atlante45/feat/xcode-11-compatible-build 
Add Bullet3 patch for Xcode 11 build
 2019-10-14 16:28:17 -07:00
Zach
e495dc7990 Fix crash on MacOS; don't do resizing in C++ anymore 2019-10-14 15:55:33 -07:00
Sabrina Shanman
c38462bf6d
Merge pull request #16345 from highfidelity/master 
Merge master into instancing
 2019-10-14 14:54:22 -07:00
Sabrina Shanman
b8df1c180f
Merge pull request #16343 from jherico/fix/DEV-2375 
DEV-2375: ensure web entities stop playing audio
 2019-10-14 13:04:57 -07:00
Zach Fox
341abb8185 Merge branch 'master' of github.com:highfidelity/hifi into friction 2019-10-14 12:36:35 -07:00
Brad Davis
6c35387b8d also fix DEV-2083 2019-10-14 10:56:23 -07:00
Brad Davis
95b5c8a905 DEV-2375: ensure web entities stop playing audio 2019-10-14 10:46:32 -07:00
luiscuenca
505813b3c3
Fix blink async and other is talking bug 2019-10-14 10:44:55 -07:00
Zach Fox
c8b975b2f1
Merge pull request #16342 from zfox23/newInvalidatedLanguage 
DEV-2334: New 'Item Invalidated' language in Inventory
 2019-10-14 13:28:33 -04:00
Zach Fox
b45156b44c
Merge pull request #16337 from RebeccaStankus/locationText 
Added blank placeholder text on focus to text field
 2019-10-14 12:35:29 -04:00
Zach Fox
7bd550e37b DEV-2334: New 'Item Invalidated' language in Inventory 2019-10-14 09:30:44 -07:00
Maia Hansen
db75d03f76
Merge pull request #16332 from highfidelity/Fix-stand-talk-pops 
Fix stand talk pops
 2019-10-11 15:51:00 -07:00
Rebecca Stankus
21503137d4 Added blank placeholder text on focus to text field 2019-10-11 14:42:39 -07:00
Sam Gateau
93e266cde5
Merge pull request #16333 from highfidelity/revert-16307-colossal-cave 
Revert "DEV-1811: apply deletion rules to linked entities"
 2019-10-11 13:13:55 -07:00
Brad Hefta-Gaub
51669e1ac3
Revert "DEV-1811: apply deletion rules to linked entities" 2019-10-11 11:06:10 -07:00
dooglifeSF
96510429ba Fix stand talking pops 2019-10-11 10:44:50 -07:00
dooglifeSF
df11977b39 remove all transitions from seated except idle via isNotSeated 2019-10-11 09:54:10 -07:00
Clement
0df6661f5b Fix incorrect assert 2019-10-10 15:57:05 -07:00
Zach Fox
19acd76854 Modify InteractiveWindow positions in C++ instead of JS, resulting in huge speedup 2019-10-10 15:48:40 -07:00
Ken Cooke
8325ee2c8e
Merge pull request #16327 from kencooke/audio-device-sleep-wake 
DEV-1901: No audio in Interface when restoring from sleep
 2019-10-10 15:12:07 -07:00
Ken Cooke
ec67b67966 On waking from sleep/hibernate, restart the audio devices 2019-10-10 14:10:47 -07:00
Maia Hansen
07b916f0b7
Merge pull request #16307 from AndrewMeadows/colossal-cave 
DEV-1811: apply deletion rules to linked entities
 2019-10-10 13:24:43 -07:00
Zach Fox
240f904b85 DEV-2386: Remove 'Run Client Script Test' 2019-10-10 11:11:27 -07:00
Sam Gateau
c0e4509095 Merge branch 'master' of github.com:highfidelity/hifi into instancing 2019-10-10 09:04:38 -07:00
Sam Gateau
3e8d6671f7 Merge branch 'instancing' of github.com:highfidelity/hifi into instancing 2019-10-10 09:04:22 -07:00
Brad Hefta-Gaub
1316f9b046
Merge pull request #16301 from dooglifeSF/drivekey_anim_triggers 
Drivekey anim triggers
 2019-10-09 18:25:10 -07:00
Sabrina Shanman
63fa9afa13
Merge pull request #16323 from highfidelity/master 
Merge master into instancing
 2019-10-09 16:59:54 -07:00
Maia Hansen
6b5f90f641
Merge pull request #16315 from jherico/qt_5.13 
Qt 5.13 changes
 2019-10-09 15:04:07 -07:00
Zach Fox
2220234d68 Removed yellow 2019-10-09 14:33:28 -07:00
Zach Fox
bed1192d70 A bunch of fixes, plus added a debug mode Settings switch 2019-10-09 14:18:36 -07:00
Zach Fox
601f7ac5e9 Merge branch 'master' of github.com:highfidelity/hifi into friction 2019-10-09 13:26:21 -07:00
luiscuenca
fc018257e1
Select avatar to look using API. Blink when look at change 2019-10-09 12:20:35 -07:00
Sam Gateau
9df2186696 Merge branch 'master' of github.com:highfidelity/hifi into instancing 2019-10-09 10:03:09 -07:00
Shannon Romano
b3d974504a
Merge pull request #16316 from luiscuenca/fixForwardEyeLookAt 
DEV-2285: Fix eye look at forward vector
 2019-10-09 09:13:02 -07:00
dooglifeSF
8a262a3d1a Merge branch 'master' into drivekey_anim_triggers 2019-10-09 07:37:38 -07:00
Sam Gateau
abaf0262a7 Merge branch 'master' of https://github.com/highfidelity/hifi into instancing 2019-10-08 18:55:51 -07:00
Sam Gateau
1f3993c308 getting the transform right for the rigid bodies 2019-10-08 18:13:24 -07:00
Brad Davis
960cab9994 Qt 5.13 warnings & fixes 2019-10-08 15:40:13 -07:00
Zach Fox
5871e6b83a Host avatars remotely 2019-10-08 17:39:57 -04:00
luiscuenca
68e287628c
Fix eye look at forward vector 2019-10-08 14:39:27 -07:00
Zach Fox
17478af32d Remove debug code 2019-10-08 17:31:35 -04:00
jennaingersoll
0b1a4878fe
Merge pull request #16308 from ctrlaltdavid/DOC-189 
DOC-189: SpeechRecognizer JSDoc
 2019-10-08 12:53:04 -07:00
Shannon Romano
0bf7fd0233
Merge pull request #16310 from luiscuenca/fixStrafeWhileFlying 
DEV-2261: DEV-2320: Fix strafe while flying, and ramp up diagonal movement
 2019-10-08 11:45:26 -07:00
Zach Fox
960440e802 DEV-2352: Modify Release Notes URL 2019-10-08 14:28:01 -04:00
Zach Fox
42bf2bf30e All windows 'done' except for final tweaks; debug mode still ON 2019-10-08 13:17:04 -04:00
luiscuenca
5576132df7
Fix strafe while flying, and ramp up diagonal movement 2019-10-08 10:13:58 -07:00
David Rowe
1106d8fdfa Doc review 2019-10-08 21:15:16 +13:00
David Rowe
f224832d27 Merge branch 'master' into DOC-111 2019-10-08 20:44:13 +13:00
David Rowe
570abba3ce SpeechRecognizer JSDoc 2019-10-08 13:04:52 +13:00
Zach Fox
a23bee19e8 Controls screen done 2019-10-07 19:52:22 -04:00
Andrew Meadows
052a0c3ebe remove cruft, add comments, change variable name 2019-10-07 16:23:30 -07:00
Sabrina Shanman
2fcb526a5c
Merge pull request #16305 from highfidelity/master 
Merge master into instancing
 2019-10-07 15:44:42 -07:00
Sam Gateau
521ce3936b I changed names! Renaming the Geometry to NetworkModel, the GeometryResource to ModelResource, i think there is no need for the 2, only one would be enough in my opinion... 2019-10-07 15:19:23 -07:00
Andrew Meadows
8ab70225d9 apply delete rules down linked hierarchy 2019-10-07 14:38:36 -07:00
Andrew Meadows
470a45c012 EntityItem::_owningAvatarID always AVATAR_SELF_ID for MyAvatar's entities 2019-10-07 14:38:36 -07:00
Andrew Meadows
3155ffe07e remove useless unreachable code 2019-10-07 14:38:36 -07:00
Zach Fox
643dd21f86 Merge branch 'master' of github.com:highfidelity/hifi into frictionIteration 2019-10-07 13:22:08 -04:00
Sam Gateau
42bc91b389 Merge branch 'master' of github.com:highfidelity/hifi into instancing 2019-10-07 09:42:14 -07:00
Shannon Romano
3db915c432
Merge pull request #16275 from dooglifeSF/sit_variants_and_fidgets 
Sit variants and fidgets
 2019-10-07 09:14:38 -07:00
dooglifeSF
387f0a3f10 add isInput* and isNotInput vars for use in json, and edit json to use them 2019-10-04 15:28:35 -07:00
Shannon Romano
f797f714bd
Merge pull request #16298 from luiscuenca/addisSeatedAPImethod 
DEV-2011: Add MyAvatar::isSeated API method
 2019-10-04 15:06:46 -07:00
luiscuenca
07080f0138
Clarify jdocs 2019-10-04 13:47:20 -07:00
luiscuenca
3a9c829c95
Add MyAvatar::isSeated API method 2019-10-04 11:07:49 -07:00
dooglifeSF
37afabe866 Merge branch 'master' into sit_variants_and_fidgets 2019-10-04 10:29:15 -07:00
Sam Gateau
c7ca431296 Merge branch 'master' of github.com:highfidelity/hifi into instancing 2019-10-04 10:00:41 -07:00
RebeccaStankus
2f2b7b0306 Ready for CR Thank you Zach 2019-10-03 17:30:47 -07:00
luiscuenca
e0d0ec5852
Fix isInAir so takes into account the new seated state: 2019-10-03 10:36:23 -07:00
Zach Fox
b23aecf6c5 Merge branch 'friction' of github.com:RebeccaStankus/hifi into friction 2019-10-03 10:12:58 -07:00
Zach Fox
33b8942ffd Changes to Avatar/Profile App complete 2019-10-03 09:41:30 -07:00
dooglifeSF
ebd0b06475 animation revisions after checking them in a standup group 2019-10-02 17:18:36 -07:00
luiscuenca
75f0b4ea54
Fix First Person Camera issues 2019-10-02 14:17:57 -07:00
luiscuenca
059bcc10cc
merge master 2019-10-02 13:24:32 -07:00
RebeccaStankus
47841d9bcd Merge branch 'friction' of github.com:RebeccaStankus/hifi into friction 2019-10-02 12:42:53 -07:00
RebeccaStankus
dc15b55aa5 Merge branch 'master' of github.com:highfidelity/hifi into friction 2019-10-02 12:05:34 -07:00
luiscuenca
521aa50356
Set time and angle recentering parameters 2019-10-02 11:43:06 -07:00
Sam Gateau
9b9f91ab85 Merge branch 'master' of github.com:highfidelity/hifi into instancing 2019-10-02 10:22:43 -07:00
Sam Gateau
dcfc3cddd2 Merge branch 'master' of https://github.com/highfidelity/hifi into instancing 2019-10-01 19:50:33 -07:00
Zach Fox
50b06a40d7 Improved random avatar selection logic, plus local avatars 2019-10-01 17:22:24 -07:00
amer cerkic
c0a852d68c updated audio wording and removed audio defaul spamming. 2019-10-01 16:55:37 -07:00
dooglifeSF
86e67afe34 Merge branch 'master' into sit_variants_and_fidgets 2019-10-01 16:52:17 -07:00
dooglifeSF
0ab4075c3b sit idles and idle fidgets with json edits 2019-10-01 16:51:10 -07:00
RebeccaStankus
d2e62749c7 Ready for Zach to add default avatar changes 2019-10-01 16:36:06 -07:00
luiscuenca
09f0222285
Restore previous control keys for free camera 2019-10-01 14:18:46 -07:00
luiscuenca
18af7c5d84
Add recenter timer and temp API 2019-10-01 13:44:27 -07:00
Shannon Romano
38574cd66b
Merge pull request #16245 from luiscuenca/implementPointAt 
DEV-442: Implement directional blending node for point reaction
 2019-10-01 11:46:30 -07:00
Sam Gateau
1d19671e88 Merge branch 'master' of github.com:highfidelity/hifi into instancing 2019-10-01 11:27:16 -07:00
Maia Hansen
220123ff3b
Merge pull request #16254 from kencooke/macos-appnap-disabler 
BUGZ-1117: On Mac OS, disable App Nap to prevent audio glitches
 2019-10-01 10:53:03 -07:00
luiscuenca
d4a74f798c
aimToBlendValues to static function 2019-10-01 10:15:16 -07:00
RebeccaStankus
3167dc9a35 Merge branch 'master' of github.com:highfidelity/hifi into friction 2019-10-01 09:59:14 -07:00
RebeccaStankus
0dfb234089 Finished UI, ready for CR 2019-10-01 09:58:44 -07:00
Anthony Thibault
c2690eb39d
Merge pull request #16268 from luiscuenca/limitRotationWhileSeated 
DEV-2125: Rotation while seated do not trigger re-centering
 2019-10-01 09:33:02 -07:00
luiscuenca
7c55cee1f0
Limit rotation while seated to not trigger recentering 2019-09-30 17:37:14 -07:00
luiscuenca
0fac1e134f
Allow avatar look at when in first person camera 2019-09-30 16:43:02 -07:00
Shannon Romano
e8f1eecc5b
Merge pull request #16258 from samcake/yellow 
DEV-1815: Investigating rendering issues with opacity map and adding tools to debug resource caches
 2019-09-30 16:36:24 -07:00
Ken Cooke
de5da65757 Use NSActivityUserInitiated instead of NSActivityBackground 2019-09-30 15:48:01 -07:00
Anthony Thibault
7ee5b8e229
Merge pull request #16252 from dooglifeSF/emotes_revisions_per_feedback 
Emotes revisions per feedback
 2019-09-30 15:46:50 -07:00
Shannon Romano
95b219475d
Merge pull request #16260 from jherico/warnings 
BUGZ-1596: Cleaning up android build warnings
 2019-09-30 11:58:21 -07:00
luiscuenca
02d889ba6e
account for point target validity 2019-09-30 11:35:00 -07:00
RebeccaStankus
68f52584cf Merge branch 'master' of github.com:highfidelity/hifi into friction 2019-09-30 09:19:15 -07:00
Sam Gateau
c8663f7fe6 Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-09-30 09:18:23 -07:00
David Rowe
cd6d9b57c4 Fix Blocks script displaying a blank page 2019-09-28 11:30:56 +12:00
Sam Gateau
25bcc31b72 Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-09-27 09:24:25 -07:00
Brad Davis
403499bf32 Cleaning up android build warnings 2019-09-27 09:19:52 -07:00
RebeccaStankus
de4e8b9cc4 Merge branch 'master' of github.com:highfidelity/hifi into friction 2019-09-27 09:16:26 -07:00
RebeccaStankus
f4ecd3dcd8 Working on initial/second launch 2019-09-27 09:15:39 -07:00
Sam Gateau
24cc302a8b second pass of cleaning on the code to make it ready for merge 2019-09-26 16:56:00 -07:00
luiscuenca
ea23a82f33
Make mouse pitch less sensitive 2019-09-26 15:14:47 -07:00
luiscuenca
1b064a0ebe
Fix Q key on first person cam. Let camera control flying Y axis 2019-09-26 14:29:01 -07:00
Sam Gateau
9d999baab2 FIrst pass to clean up before pushing a pr: 2019-09-26 11:59:01 -07:00
Ken Cooke
6e54ff30bd Bugfix 2019-09-26 11:36:23 -07:00
Ken Cooke
3f686be7ab Add all Objective-C sources in CMakeLists.txt 2019-09-26 10:50:00 -07:00
Ken Cooke
ae62b96f67 On Mac OS, disable App Nap to prevent audio glitches while running in the background 2019-09-26 08:52:35 -07:00
Sam Gateau
ba11c3e702 Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-09-25 17:54:21 -07:00
Amer
1e94a82ee6
Merge pull request #16196 from amerhifi/dev469 
DEV-469: Default Audio device
 2019-09-25 16:28:00 -07:00
dooglifeSF
0fa7220750 tilt head down slightly to minimize crazy eyes 2019-09-25 15:27:11 -07:00
dooglifeSF
a8fa3a136c emote revisions, json tuning 2019-09-25 14:47:07 -07:00
luiscuenca
d7fc4e905c
fix function on jsdoc 2019-09-25 14:02:43 -07:00
amer cerkic
73f14d812f addressing cr comments 2019-09-25 13:22:50 -07:00
luiscuenca
0aab2ed07f
Disable head look at when pointing 2019-09-25 12:37:24 -07:00
MiladNazeri
7d7024f5eb
Merge pull request #16247 from MiladNazeri/DEV-148/add-mirror-mode-to-settings 
Dev 148/add mirror mode to settings
 2019-09-25 12:08:09 -07:00
milad
aba6a28d54 updated camera modes 2019-09-25 11:05:32 -07:00
milad
39d96b76a6 fixed help text 2019-09-25 08:41:38 -07:00
Sam Gateau
3e3c4c2e70 Merge branch 'master' of https://github.com/highfidelity/hifi into yellow 2019-09-24 18:58:29 -07:00
luiscuenca
7c4fe39918
Add point directional blending node to animation json 2019-09-24 18:24:27 -07:00
luiscuenca
ad79393e1f
Implement point at directional blend and API 2019-09-24 17:55:38 -07:00
Clement
96b58756b1 Add flag for account settings feature 2019-09-24 16:50:10 -07:00
milad
677dbe59cc fixed qml typo 2019-09-24 16:47:07 -07:00
milad
edb135776a Added selfie view and updated help 2019-09-24 16:44:34 -07:00
Shannon Romano
73c558bc51
Merge pull request #16237 from dooglifeSF/emotes_interrupt_settle 
Transition between walk/emote should be faster
 2019-09-24 15:49:31 -07:00
Shannon Romano
0c2ca7500d
Merge pull request #16241 from RebeccaStankus/removeInspect 
Undo removal of User Inspection
 2019-09-24 15:41:35 -07:00
amer cerkic
9daf670678 Merge branch 'master' into dev469 2019-09-24 15:38:07 -07:00
Anthony Thibault
6fbcc9151e
Merge pull request #16235 from luiscuenca/resetLookAtOnGoTo 
BUGZ-1553: Reset look at params when the avatar's location is set
 2019-09-24 13:20:26 -07:00
RebeccaStankus
978bcaffeb Undo removal of User Inspection 2019-09-24 11:18:16 -07:00
Shannon Romano
b491d00c00
Merge pull request #16238 from RebeccaStankus/fullSizeWindow 
Prereq work for 'Reduce User Friction'
 2019-09-24 10:58:39 -07:00
RebeccaStankus
982bdf5c98 Prereq work for 'Reduce User Friction' 2019-09-23 16:49:16 -07:00
dooglifeSF
7307bea16f speed up interpolation of point, rework point animation, add transitions for emotes to idle from settle 2019-09-23 16:45:35 -07:00
amerhifi
fbc68e7f69 removed clang format issue, removed old attempt at getting defaults to startup correctly 2019-09-23 15:07:04 -07:00
RebeccaStankus
e41632e3ec Removing connections to use inspect mode on mouse events 2019-09-23 14:42:13 -07:00
luiscuenca
10f76da3ec
Reset look at values when goToLocation or sitting 2019-09-23 11:53:47 -07:00
amer cerkic
e3db7a43a6 set default value for non set devices, typically only for first time runs 2019-09-23 11:00:51 -07:00
Sam Gateau
483a716839 Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-09-23 10:19:45 -07:00
Shannon Romano
68c37e561a
Merge pull request #16233 from Atlante45/fix/flush-timer 
Put flush timer on right thread without parenting
 2019-09-23 09:37:05 -07:00
Sam Gateau
fd3e3aba7b Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-09-23 09:32:10 -07:00
Sam Gateau
3c2809b9ed Merge branch 'master' of https://github.com/highfidelity/hifi into yellow 2019-09-21 08:52:13 -07:00
Sam Gateau
4480d56433 Rendering just the overlay layer and improving the resoruceCache inspector to sort 2019-09-20 19:00:03 -07:00
Clement
1ca30b688d Put flush timer on right thread without parenting 2019-09-20 15:39:35 -07:00
dante ruiz
b478a22ed2 fix edge case 2019-09-20 15:25:10 -07:00
Shannon Romano
bd488f0196
Merge pull request #16144 from luiscuenca/addLookAtThirdCamera 
DEV-391: Keyboard Input Controls Camera Not Avatar Orientation
 2019-09-20 13:03:03 -07:00
Anthony Thibault
fecef584c9
Merge pull request #16226 from danteruiz/fix-snap-html-issue 
BUGZ-1522: Snap app on tablet is blocked when saving/canceling out of its Settings page
 2019-09-20 12:39:01 -07:00
Shannon Romano
22dffa5ce8
Merge pull request #16217 from Atlante45/fix/flush-timer 
BUGZ-489: Make sure the flush timer is not spawned too early
 2019-09-20 12:35:39 -07:00
luiscuenca
f979c4e1ab
Add more info to jdocs 2019-09-20 09:51:51 -07:00
dante ruiz
fe2a4c3600 fix fix-snap-html-issue 2019-09-19 18:20:08 -07:00
luiscuenca
365aa1bf03
Add jdoc to camera modes and fix variable namings 2019-09-19 17:30:01 -07:00
David Rowe
5a4ab1d43f Missed typo 2019-09-20 10:27:21 +12:00
David Rowe
605d272392 Merge branch 'master' into DOC-111 2019-09-20 10:25:21 +12:00
David Rowe
9d9317c50d Miscellaneous fixes and typos 2019-09-20 10:19:45 +12:00
David Rowe
34883990b4 Clarify which line3d overlay properties aren't working 2019-09-20 10:19:02 +12:00
David Rowe
42bc9356ca Add Steam to list of limited commerce versions 2019-09-20 09:23:09 +12:00
Zach Fox
97ef2c030e
Merge pull request #16223 from zfox23/simplifiedGoToIteration 
Whoops! New placeholder text color
 2019-09-19 16:40:48 -04:00
Zach Fox
10352f1cb2 New placeholder text color 2019-09-19 13:38:37 -07:00
David Rowe
19888fad03 Format findableBy and audioListenerMode property values as lists 2019-09-20 08:35:23 +12:00
luiscuenca
279e25ca70
Merge master 2019-09-19 13:21:49 -07:00
David Rowe
d5e08d19e3 Fix JSDoc for miscellaneous white space issues 2019-09-20 08:17:24 +12:00
Zach Fox
a472e723e2
Merge pull request #16222 from zfox23/simplifiedGoToIteration 
BUGZ-1529: Iteration on JumpTo Field visuals/interaction states
 2019-09-19 16:13:21 -04:00
Zach Fox
5077089518 BUGZ-1529: Iteration on JumpTo Field visuals/interaction states. NOTE - need to fix placeholder text swap 2019-09-19 11:15:53 -07:00
luiscuenca
6d98537a20
Clean up code and refactor avatar-animation.json 2019-09-19 10:45:20 -07:00
amerhifi
9cc3b7a5c7 addressing pr comments 2019-09-19 10:08:30 -07:00
Zach Fox
5e96ce8822 DEV-152: Implement 'Smooth/Snap Turn' setting in SimplifiedUI > Settings > VR 2019-09-19 09:48:11 -07:00
Sam Gateau
819c942056 Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-09-19 09:01:19 -07:00
luiscuenca
fc223e4cb6
Reverse the up/down arrow keys if in selfie mode 2019-09-18 17:15:25 -07:00
Clement
527b27b32d Make sure the flush timer is not spawned too early 2019-09-18 17:05:05 -07:00
luiscuenca
7bc8e6b237
Solved some sitting and sound issues while looking at 2019-09-18 17:00:10 -07:00
Shannon Romano
e7001c3f1b
Merge pull request #16157 from sethalves/vive-pro-groundwork 
DEV-605: Vive pro groundwork
 2019-09-18 16:36:12 -07:00
Shannon Romano
0be972062d
Merge pull request #16207 from hyperlogic/bug-fix/sitting-bug-fixes 
Sit bug fixes
 2019-09-18 16:20:51 -07:00
Zach Fox
f92c5d0882 DEV-576: Allow users to type HiFi locations into the SimplifiedUI top bar just like GOTO 2019-09-18 14:39:11 -07:00
Zach Fox
59184edc89 DEV-521: Update Emoji window's search field to display emoji's name during hover 2019-09-18 13:37:46 -07:00
Sam Gateau
381fc5146f Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-09-17 18:08:09 -07:00
Sam Gateau
c0660329a3 Exposing the REsource Caches through a bit of ui, adding MaterialCache to the family 2019-09-17 18:06:08 -07:00
luiscuenca
1054e8fcde
Selfie camera and updated camera menus 2019-09-17 17:15:16 -07:00
amer cerkic
c1854d3438 fixing gnu warnings and removing debug output 2019-09-17 14:42:35 -07:00
Anthony J. Thibault
1157d59f67 Sit bug fixes 
* You should not be able to move after being seated, even if you switch seats.
* You should not be able to jump out of the chair by holding the space bar.
* Fixed small issue with the sitting to standing transition being delayed. (causing the user to look
  like there were sitting in mid-air)  This was due to a missing transition in the animation.json
 2019-09-17 13:40:43 -07:00
amer cerkic
a777757c48 fixed android build 2019-09-17 12:46:38 -07:00
Zach Fox
610e0c3d82
Merge pull request #16205 from zfox23/changeAboutCopyright 
v85: BUGZ-1485: Fix Copyright date in About dialog
 2019-09-17 14:55:11 -04:00
Zach Fox
60f4189eb3 BUGZ-1485: Fix Copyright date in About dialog 2019-09-17 11:36:12 -07:00
Seth Alves
3ece763a8e code review 2019-09-17 10:52:55 -07:00
Seth Alves
58cf51058b code review 2019-09-17 09:43:32 -07:00
Seth Alves
8875453585 remove old/unused eyetracker code 2019-09-17 09:43:32 -07:00
Seth Alves
a288c0a52d remove old/unused eyetracker code. 2019-09-17 09:43:21 -07:00
Seth Alves
5c570d28a0 remove old/unused eyetracker code 2019-09-17 09:43:20 -07:00
Seth Alves
943348ba51 input action channels for eyes and eyelids and fingers. connect eyelid input actions to blendshapes. 2019-09-17 09:43:20 -07:00
Seth Alves
b64ff70d6c add show-lookat-targets DebugDraw. remove old/unused eyetracker code. 2019-09-17 09:43:19 -07:00
amerhifi
66725f5f1b working on swapping default devices on system change 2019-09-17 07:50:22 -07:00
David Rowe
dff37a71eb Fix JSDoc markup HTML issues 2019-09-17 16:26:09 +12:00
luiscuenca
481917ae8a
Rotate avatar with camera and diagonal rotation 2019-09-16 18:26:19 -07:00
Sam Gateau
60045f4783 Replacing key combination to trigger a frame capture 2019-09-16 17:48:30 -07:00
amerhifi
e689531410 added unique identifier to device for comparison. Because a default device had a different name, but same underlying device. So comparing with device name is not necessarily the same device. Possibly fixed select issue with multiple devices same name 2019-09-16 15:31:44 -07:00
Shannon Romano
dd0b527d63
Merge pull request #16185 from huffman/fix/hifi-log-login 
BUGZ-1441: Update logo on login popup
Build failure is on Android not communicated to Docker.
 2019-09-16 13:15:58 -07:00
sabrina-shanman
76b1f551b1 Merge branch 'master' into instancing 2019-09-16 10:17:59 -07:00
sabrina-shanman
46616b4efd Fix more integer conversion warnings 2019-09-16 09:55:25 -07:00
sabrina-shanman
a166b41216 Fix build warnings/errors 2019-09-13 15:39:29 -07:00
luiscuenca
5adf3e8c25
Expose API some parameters for live configuration 2019-09-13 14:10:11 -07:00
Shannon Romano
79d845d127
Merge pull request #16190 from danteruiz/fix-html 
BUGZ-1398: HMD Tablet Apps blocked by Web access error
 2019-09-13 12:35:29 -07:00
amerhifi
cc11bd9552 created new AudioWrapper 2019-09-13 11:24:41 -07:00
danteruiz
8491a37923 fixing WebEntities html 2019-09-13 09:57:51 -07:00
Ryan Huffman
5370e67507 Update logo on login popup 2019-09-12 14:48:21 -07:00
sabrina-shanman
b944db3e79 std::vector-ize joints and materials in hfm::Model 2019-09-11 16:54:07 -07:00
luiscuenca
8af22f0c04
Compute when negative deltas 2019-09-11 16:27:07 -07:00
luiscuenca
793b2917f6
Compute only when delta is not zero 2019-09-11 16:25:48 -07:00
luiscuenca
8a6cb93a84
Limit the camera pitch and use the eyes as the pivot point 2019-09-11 16:08:14 -07:00
MiladNazeri
fb9a6a3c78
Merge pull request #16175 from MiladNazeri/dev-551/hide-crash-menu-behind-enviornment-variables 
DEV-551/hide-crash-menu-behind-environment-variable
 2019-09-11 15:47:40 -07:00
Zach Fox
a5504c3780
Merge pull request #16176 from MiladNazeri/BUGZ-1456/HMD-audio-setting-shows-up-when-desktop-mode 
BUGZ-1456/HMD-audio-setting-shows-up-when-desktop-mode
 2019-09-11 15:05:44 -07:00
luiscuenca
7c7c3cd223
merge master 2019-09-11 14:07:19 -07:00
Shannon Romano
65d0bb1342
Merge pull request #15906 from kasenvr/kpi-v1-modkit-rc 
Kasen Plugin Infrastructure v½ Codename "Modkit Mini"
 2019-09-11 13:04:01 -07:00
MiladNazeri
a9da5b8f16
Update interface/resources/qml/hifi/audio/Audio.qml 
Co-Authored-By: Zach Fox <fox@highfidelity.com>
 2019-09-11 12:45:18 -07:00
MiladNazeri
d95a803324
Update interface/resources/qml/hifi/audio/Audio.qml 
Co-Authored-By: Zach Fox <fox@highfidelity.com>
 2019-09-11 12:44:59 -07:00
milad
3cf56210b2 modified Audio.qml to handle desktop audio level meter visible 2019-09-11 12:30:24 -07:00
milad
f9c5d00efa remove source from variable name 2019-09-11 12:10:47 -07:00
luiscuenca
f0dcfa7f15
fix rotation frame 2019-09-11 12:04:23 -07:00
luiscuenca
b28154235a
Look at camera when camera in front 2019-09-11 11:43:26 -07:00
milad
5ec8b0d589 added environment variable check for crash menu 2019-09-11 11:39:19 -07:00
luiscuenca
7584fe587e
Fix warnings and initial camera orientation 2019-09-11 11:21:53 -07:00
luiscuenca
2f33e37eb6
Angles instead dot product and fix API 2019-09-10 18:10:02 -07:00
Zach Fox
50ba55a988 Protect against engine not returning a valid CPU/GPU object 2019-09-10 13:03:40 -07:00
Zach Fox
e52d65a7bc BUGZ-1451: Update links in controller reference 2019-09-10 11:31:51 -07:00
Zach Fox
eb286d992e
Merge pull request #16160 from RebeccaStankus/emojiDoubleClickSound 
Emoji app duplicates sound on opening from toolbar
 2019-09-09 11:27:26 -07:00
Shannon Romano
e1dac580b6
Merge pull request #16121 from luiscuenca/audioPosesSyncFix 
BUGZ-1234: Mitigate the effect of audio noise on talking animations
 2019-09-09 10:37:07 -07:00
RebeccaStankus
33b78bea4f Changed textField module sounds 2019-09-09 10:36:35 -07:00
Shannon Romano
ca190f9932
Merge pull request #16143 from dooglifeSF/Sitting_emote_variants 
Sitting emote variants, revisions on stand emote agree anims, point bug fix
 2019-09-09 10:12:56 -07:00
Shannon Romano
4017a4f937
Merge pull request #16156 from sethalves/wtf-audio-devices 
BUGZ-1434: use existing audio settings on startup
 2019-09-09 10:09:34 -07:00
Shannon Romano
c7db287458
Merge pull request #16146 from AndrewMeadows/ess-with-simulation 
BUGZ-1385: allow entity-script-server to move entities kinematically
 2019-09-09 07:51:28 -07:00
Seth Alves
4eb88fb396 use existing audio settings on startup 2019-09-07 15:55:31 -07:00
Matt Hardcastle
3074ff96e0
Merge pull request #16150 from MattHardcastle/add-signing-2.0-rebase 
Add signing 2.0 rebase
 2019-09-07 09:09:11 -07:00
luiscuenca
1f458d195e
Refactorting, up/down attenuation and comments 2019-09-06 17:50:06 -07:00
Andrew Meadows
227b99859d fix api for checking EntityItem grab status 2019-09-06 17:23:38 -07:00
dooglifeSF
932093bead Merge branch 'master' into Sitting_emote_variants 2019-09-06 15:06:52 -07:00
luiscuenca
3b8d3f987d
Add animation 2019-09-06 14:31:53 -07:00
luiscuenca
0e4e09acb5
Add blending 2019-09-06 14:30:10 -07:00
luiscuenca
189ddf39e2
Merge branch 'master' into addLookAtThirdCamera 2019-09-06 14:29:51 -07:00
dooglifeSF
422ad52a87 Add one more sitting emote: clap03, touch up two of the standing clap anims, adjust frame ranges 2019-09-06 13:57:33 -07:00
dante ruiz
768ac08d11 Add entitlements for Launcher and Interface 2019-09-06 11:20:16 -07:00
dante ruiz
c2e0e6a976 Change Launcher config.json location 
Launcher `config.json` can not be inside Interface's app bundle, as it
will break signing.
 2019-09-06 11:20:06 -07:00
luiscuenca
78eee5961c
Fix key mapping for new camera 2019-09-05 18:05:46 -07:00
luiscuenca
ddbd30fac9
Fix magic numbers and refactor some code 2019-09-05 17:14:35 -07:00
luiscuenca
ff8f2c5c16
Add new LookAt camera 2019-09-05 17:04:39 -07:00
dooglifeSF
b5d2675a05 Merge branch 'master' into Sitting_emote_variants 2019-09-05 16:45:24 -07:00
dooglifeSF
5061aca487 Update sitting_emote_raisehand03_all.fbx 2019-09-05 16:44:13 -07:00
dooglifeSF
9cfa4753d9 sitting emote acknowledge and dismiss added, also went through emote_agree set and pushed them per Josh feedback. Fixed point glitch stand/sit 2019-09-05 15:31:07 -07:00
Anthony J. Thibault
c35640f739 Warning fixes and small bug fix to anim stats 2019-09-05 14:54:19 -07:00
humbletim
271fac4bca Merge remote-tracking branch 'upstream/master' into kasenvr-kpi-v1-modkit-rc-merge 2019-09-05 09:46:21 -04:00
HifiExperiments
97b9179144 merge with master 2019-09-05 00:46:56 -07:00
Zach Fox
df3f7fcb72
Merge pull request #16132 from MiladNazeri/dev-486/emote-ui-toggle-fix 
Dev-486 : emote indicator should still be showing
 2019-09-04 13:11:24 -07:00
milad
5fdcf0ecaf updated setting name and changed default value to true for show tray 2019-09-04 12:59:17 -07:00
Shannon Romano
24faa4a7cb
Merge pull request #16124 from MattHardcastle/call-interface-highfidelity 
Call Interface "High Fidelity" on macOS
 2019-09-04 09:34:35 -07:00
milad
669fef763a removed logs 2019-09-03 18:11:56 -07:00
milad
44e518f5a1 working fix 2019-09-03 18:06:25 -07:00
dooglifeSF
6b3dfd6d56 sitting emote raised hand 03 wip 2019-09-03 16:53:36 -07:00
Shannon Romano
5f4b2a0080
Merge pull request #16109 from sethalves/fix-saccade-override 
apply fake eye saccades if eye joints aren't overridden
 2019-09-03 11:34:02 -07:00
Zach Fox
d88c43614c
Merge pull request #16129 from RebeccaStankus/feetPosition 
Feet position
 2019-09-03 11:04:17 -07:00
Jamil Akram
a9d8f105ae
Merge pull request #16112 from dooglifeSF/Anim_memory_reduction 
Anim memory reduced ~10mb by removing static channels
 2019-09-03 10:08:02 -07:00
RebeccaStankus
a34a533c07 Added defaults for some params 2019-09-03 10:06:17 -07:00
RebeccaStankus
37304f57ea Merge branch 'master' of github.com:highfidelity/hifi into feetposition 2019-08-30 14:20:58 -07:00
RebeccaStankus
5fadfa5275 Updated property in MyAvatar.h 2019-08-30 13:52:02 -07:00
Bradley Austin Davis
8e3b337a6e
Merge pull request #16120 from jherico/fix/bugz-1365 
BUGZ-1365: prevent server scripts from accessing local files in HTML controls
 2019-08-30 13:10:09 -07:00
Bradley Austin Davis
29424ca971
Merge pull request #16113 from jherico/fix/bugz-1363 
BUGZ-1363: crash when checking for web content restrictions
 2019-08-30 13:09:49 -07:00
Matt Hardcastle
f91ec8fbf5 Call Interface "High Fidelity" on macOS 2019-08-30 09:18:36 -07:00
Brad Davis
82a49d4641 Fix android build 2019-08-29 20:19:49 -07:00
luiscuenca
265b6f57a1
Try to mitigate the effect of background mic noise when simulating talking 2019-08-29 15:19:17 -07:00
Brad Davis
6aa967f29f fixing test code 2019-08-29 14:11:22 -07:00
Brad Davis
31340d278a Add test for local file access 2019-08-29 13:45:43 -07:00
Brad Davis
428a58710d BUGZ-1365: Ensure that by default web views can't access local content 2019-08-29 13:44:49 -07:00
Shannon Romano
3695a5e633
Merge pull request #16105 from amerhifi/bugz-186 
CASE DEV-186: HQ Launcher/Interface Icons and wording need to be standardized
 2019-08-28 15:58:10 -07:00
Shannon Romano
e07e8abc0d
Merge pull request #16106 from AndrewMeadows/less-MyAvatar-mesh-tuneling-2 
BUGZ-1325 prevent MyAvatar from pushing through mesh barrier
 2019-08-28 15:51:42 -07:00
dooglifeSF
974b18b16b Export one more that used to be hosted. I moved it to the source repo. 2019-08-28 14:16:57 -07:00
dooglifeSF
a5118d8a31 Merge branch 'master' into Anim_memory_reduction 2019-08-28 10:21:21 -07:00
dooglifeSF
577a82f750 Export animations, remove static channels. Remove unused joints. Exclude all scene data from fbx. 2019-08-28 10:10:39 -07:00
Brad Davis
954773124a BUGZ-1363: crash when checking for web content restrictions 2019-08-28 09:56:45 -07:00
Anthony Thibault
1a1e8297e6
Merge pull request #16077 from dooglifeSF/tweak_sit_pose 
Sit pose reworked and new sit emote variants added.
 2019-08-28 09:06:31 -07:00
Andrew Meadows
6be3750b38 use collision brake feedback to prevent tunneling 2019-08-27 20:28:56 -07:00
Seth Alves
1979e1dbc7 apply fake eye saccades if eye joints aren't overridden (rather than if HasProceduralEyeFaceMovement is true) 2019-08-27 16:47:01 -07:00
amerhifi
42357904cd fixed icon name spacing 2019-08-27 20:13:15 +02:00
amerhifi
335dea43df changing app name to high fidelity and changing icons to the new logo 2019-08-27 20:08:21 +02:00
Shannon Romano
3134332513
Merge pull request #16098 from hyperlogic/feature/backtrace-shutdown-flag 
Added "shutdown" crash annotation and crash menu option
 2019-08-27 10:57:07 -07:00