ingerjm0
dda69bf91a
JSDoc revisions for PR16245
2019-11-12 14:47:09 -08:00
ingerjm0
ce174696c0
JSDoc revisions for PR 16144
2019-11-12 14:38:51 -08:00
ingerjm0
11cb6ac6e0
JSDoc updates for PR15974
2019-11-12 14:18:12 -08:00
ingerjm0
a61857b6d8
JSDoc revisions for PR16025
2019-11-12 14:17:23 -08:00
DouglasWilcox
f9f28fc286
Handle HMD in input vars and remove/fix json transitions in/out of HMD strafe states.
2019-11-12 14:15:19 -08:00
milad
49f972714c
more cleanup
2019-11-12 13:12:10 -08:00
DouglasWilcox
9d86e49a0b
Pretty good exponential acceleration, need to simplify
2019-11-12 11:59:39 -08:00
milad
0f605ffc43
clean up code
2019-11-12 11:37:07 -08:00
DouglasWilcox
995f5f92cd
Do not use turningSpeed when setting seatedTurn vars, and iterate acceleration formula
2019-11-12 11:11:19 -08:00
Andrew Meadows
cf08a4162a
add workload job to help debug entity proxies
2019-11-12 10:35:16 -08:00
Sabrina Shanman
769a332d22
Merge pull request #16485 from highfidelity/master
...
Merge master into instancing
2019-11-12 10:07:28 -08:00
milad
7cce153b6d
working flow. Needs clean up and final ui tweaks
2019-11-11 20:13:23 -08:00
milad
ae35ec0975
Merge branch 'master' of github.com:highfidelity/hifi into screenshareElectronApp
2019-11-11 16:42:55 -08:00
DouglasWilcox
64634f51b1
Merge branch 'master' into improve_seated_rotation
2019-11-11 11:31:56 -08:00
DouglasWilcox
c36c4a17b1
first pass hookup of seated rotation with acceleration and animation response
2019-11-11 11:31:34 -08:00
Shannon Romano
75ba65c2c9
Merge pull request #16467 from DouglasWilcox/rand_settles_and_by_momentum
...
Different settle transition depending on momentum
2019-11-11 10:48:57 -08:00
milad
c7b8d97639
updated api to try and communicate over EB, but still not working
2019-11-11 09:56:46 -08:00
Anthony J. Thibault
52acfc9333
Speculative fix for infinite loop in SafeLanding
...
This PR containts two fixes.
1) Tightening up the locks in the SafeLanding class to prevent race conditions.
By inspection there are cases where variables are read and modified outside of locks.
2) A check to help prevent an infinite loop in the _sequenceNumber std::distance calculation.
This is the main issue, in some cases backtrace is reporting the main thread as deadlocked.
The stacktrace points to an issue with the std::distance() calculation.
If the EntityQueryInitialResultsComplete is delayed signficantly, there could be a rare
case where the _sequenceNumber map grows large enough for the wraparound less then operator
will no longer function correctly. This will cause the std::distance calculation to never complete.
I've added a guard to prevent this from happening and some logs to help diagnose this issue in the future.
2019-11-08 14:22:04 -08:00
dooglifeSF
055d5cdf9b
Simplify boolean statements, revise several settle anims
2019-11-08 13:46:38 -08:00
milad
b206c102e8
Merge branch 'master' of github.com:highfidelity/hifi into screenshareElectronApp
2019-11-08 12:19:06 -08:00
dooglifeSF
02045a9fdf
add random versions of full sized settle
2019-11-08 11:57:06 -08:00
Sabrina Shanman
eebb9ad51f
Merge pull request #16475 from highfidelity/master
...
Merge master into instancing
2019-11-08 10:10:50 -08:00
Nex-Pro
fea65133b4
Update WindowScriptingInterface.h
...
replace "model" with "modal"
2019-11-08 12:51:00 +00:00
dooglifeSF
8e11d91c03
Merge branch 'master' into rand_settles_and_by_momentum
2019-11-07 15:09:10 -08:00
dooglifeSF
73202b9caf
Different settle transition depending on momentum
2019-11-07 09:52:26 -08:00
milad
dd1795e9b6
Merge branch 'master' of github.com:highfidelity/hifi into screenshareElectronApp
2019-11-07 09:33:47 -08:00
Shannon Romano
4484ef095c
Merge pull request #16464 from DouglasWilcox/seated_fidgets_less_fidgety
...
Reduce fidgety motions in seated fidgets
2019-11-07 09:09:05 -08:00
milad
4b06e429d2
Merge branch 'screenshareElectronApp' of github.com:MiladNazeri/hifi into screenshareElectronApp
2019-11-06 17:43:38 -08:00
Zach Fox
c8464786e7
Steps closer...
2019-11-06 17:16:21 -08:00
milad
fa8d5e57d1
Merge branch 'master' of github.com:highfidelity/hifi into screenshareElectronApp
2019-11-06 15:48:24 -08:00
Zach Fox
a41ae3daa9
Move the local web entity logic to c++ - might not be working
2019-11-06 15:45:48 -08:00
Shannon Romano
10a1ee24e8
Merge pull request #16462 from zfox23/removeHomeIcon
...
DEV-2701: Remove the home icon from the profile app
2019-11-06 15:34:18 -08:00
Zach Fox
40814f9086
Merge branch 'master' of github.com:highfidelity/hifi into screenshareElectronApp
2019-11-06 14:46:14 -08:00
milad
894b4127b4
modifying screenshare API for viewer
2019-11-06 14:35:20 -08:00
dooglifeSF
15b935b491
remove jitter and bounce from several seated idles and fidgets, also reduce look-around cone
2019-11-06 13:08:42 -08:00
Anthony Thibault
8f0ca7b6db
Merge pull request #16447 from luiscuenca/hideNeckSecondPass
...
DEV-2461: Head woes in 1st person part 2
2019-11-06 12:11:59 -08:00
Clément Brisset
96f53dbbf3
Merge pull request #16448 from matt-hifi/deep-codesign
...
"deep" codesign Interface on macOS
2019-11-06 12:08:29 -08:00
Zach Fox
ca8a61f085
DEV-2701: Remove the home icon from the profile app
2019-11-06 11:11:57 -08:00
Shannon Romano
668061e154
Merge pull request #16445 from hyperlogic/bug-fix/remove-last-legacy-blendshapes
...
Remove LipsUpperOpen and LipsLowerOpen, the last of the legacy blendshapes
2019-11-06 10:35:53 -08:00
Matt Hardcastle
8dc91d640b
Remove this and connection from lambda expression
...
Clang in Xcode 11 is more aggressive about its warnings. This resolves
one of the issue Clang noticed in order to support building w/Xcode 11.
I first attempted to remove `this` completes, but VS complained that
`QObject::disconnect` was being called without `this`. This change
satisfies both Clang and VS.
A second attempt added this back and then called `disconnect` directly.
This also generated a Clang warning.
This version resolves the issue by removing the error handler. This also
resolves a memory leak caused by the error handler.
2019-11-06 09:13:40 -08:00
milad
56838de22d
fixed conflicts
2019-11-05 17:32:46 -08:00
milad
c6f7c058bc
merging master
2019-11-05 17:30:09 -08:00
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
