DouglasWilcox
19aacde3a2
Fix case where Avatar could get stuck facing camera if rotating camera quickly and avatar faced backward.
2019-11-19 14:32:51 -08:00
Brad Hefta-Gaub
3b9c997317
Merge pull request #16505 from luiscuenca/zoomAndOrbitCamUsingTouchPad
...
Touchpad improvements: pinch to zoom camera, two finger swipe to look around, bug fixes
2019-11-19 13:30:45 -08:00
Anthony J. Thibault
befbdcef48
Upgraded OSC plugin with changes from ARKit blendshape work.
2019-11-19 13:13:56 -08:00
milad
8676eaf0a0
removed additional signal
2019-11-19 13:04:27 -08:00
DouglasWilcox
8ccdfaf220
Clamp rotation velocity if hit trigger angle, but only bounce forward if cameraYaw is true.
2019-11-19 12:05:25 -08:00
Brad Hefta-Gaub
63b21af562
Merge pull request #16506 from ctrlaltdavid/DEV-2764
...
DEV-2764, DEV-2113: Remove Avatar app links to AvatarIsland and BodyMart
2019-11-19 12:05:10 -08:00
Brad Hefta-Gaub
69af66195c
Merge pull request #15334 from SaracenOne/screen_name_at_signup_push
...
case 22189: Add display name field to the log in screen.
2019-11-19 12:02:31 -08:00
jennaingersoll
451ffcd1e0
Merge pull request #16492 from jennaingersoll/jsdoc-revisions
...
DOC-208: Revisions to JSDoc added by developers since July 2019
2019-11-19 11:01:18 -08:00
Zach Fox
f07f81e976
Merge pull request #16510 from MiladNazeri/dev-2791/update-hardcoded-screen-values
...
dev-2791/update-hardcoded-screen-values
2019-11-19 10:46:36 -08:00
Brad Hefta-Gaub
0f428f0afb
Merge pull request #16498 from DouglasWilcox/improve_seated_rotation
...
Improve seated rotation
2019-11-19 10:22:08 -08:00
milad
0d713fcc8d
new values for position and dimensions
2019-11-19 10:12:17 -08:00
ingerjm0
d2118f0aac
DOC-208 revisions
2019-11-18 20:05:08 -08:00
Sabrina Shanman
359248829c
Merge pull request #16197 from highfidelity/instancing
...
(DEV-430) Instancing: Introduce hfm::Shape to enable Instancing support
2019-11-18 16:40:10 -08:00
Zach Fox
73590d2570
Fix DEV-2789: Implement retry timer when retrieving screen share info
2019-11-18 15:13:51 -08:00
Sabrina Shanman
518d6a530a
Merge pull request #16507 from highfidelity/master
...
Merge master into instancing
2019-11-18 13:54:33 -08:00
David Rowe
60d2845953
Remove further related dead code
2019-11-19 10:31:54 +13:00
David Rowe
748999b8d6
Remove reference to BodyMart in Avatar app
2019-11-19 09:59:59 +13:00
David Rowe
a912e97f1e
Remove reference to AvatarIsland in Avatar app
2019-11-19 09:53:58 +13:00
Sam Gateau
048626ba9a
Merge pull request #15278 from kitely/clear-more-disk-caches
...
case 21983: Clear more disk caches
2019-11-18 11:11:26 -08:00
Sam Gateau
6370059a96
Merge pull request #16483 from AndrewMeadows/debug-workload-selection
...
Add tools for debugging entity workload proxies
2019-11-18 11:02:00 -08:00
dante ruiz
cd6f9a774d
implement gesture pinch to camera zoom
2019-11-18 11:33:31 -07:00
DouglasWilcox
ddbb8d70ed
Speed up acceleration and blends slightly per Joshua, add kicks to turn anim.
2019-11-15 17:04:51 -08:00
Zach Fox
b64ce343bd
Merge pull request #16429 from MiladNazeri/screenshareElectronApp
...
Screenshare in Interface!
2019-11-15 15:32:51 -08:00
HifiExperiments
b73a608094
procedural vertex shaders
2019-11-15 00:22:40 -08:00
Brad Hefta-Gaub
f88f5ddded
Merge pull request #16496 from highfidelity/fix-realtime-unfocused
...
DEV-2760 - Fix Realtime Unfocused to be 60hz
2019-11-14 17:37:19 -08:00
DouglasWilcox
d9065affad
comment explaining seatedrot deceleration section, and transition-> turn works
2019-11-14 17:18:43 -08:00
DouglasWilcox
fb289704e2
iterate the turns, and make turning accessible from fidgets
2019-11-14 16:07:51 -08:00
milad
1035467c27
newline add
2019-11-14 16:06:28 -08:00
Zach Fox
5229b0c0f3
Various cleanup and CR
2019-11-14 15:45:52 -08:00
Zach Fox
e21ee20ff8
Merge branch 'master' of github.com:highfidelity/hifi into screenshareElectronApp
2019-11-14 15:18:07 -08:00
milad
65089494a8
updated cmake
2019-11-14 15:09:23 -08:00
DouglasWilcox
37010648be
Abandon exponential acceleration and use constant acceleration. Hook up turn->sit transitions.
2019-11-14 13:12:01 -08:00
milad
a4ad78c337
comment updates and extra includes removed
2019-11-14 11:28:37 -08:00
Brad Hefta-Gaub
56b1be4958
Fix Realtime Unfocused to be 60hz
2019-11-14 10:21:55 -08:00
Andrew Meadows
7692e858a1
use EntityItemID rather than QUuid
2019-11-14 09:59:43 -08:00
Andrew Meadows
3546bab19a
use std::vector<> instead of QVector<>
2019-11-14 09:59:43 -08:00
Andrew Meadows
9d92546a8b
revert the revert of PR-16307
2019-11-14 09:59:43 -08:00
DouglasWilcox
11e1c4e6fe
linear acceleration experiment
2019-11-14 09:23:16 -08:00
Zach Fox
b4135e2655
We are so close...
2019-11-13 17:35:57 -08:00
Anthony Thibault
929e829801
Revert "Speculative fix for infinite loop in SafeLanding"
...
This reverts commit 52acfc9333
2019-11-13 17:17:37 -08:00
Anthony Thibault
487515d956
Revert "bug fix from code review comment"
...
This reverts commit e81b21ac59
2019-11-13 17:17:17 -08:00
Zach Fox
8255210c6a
Add new screenshare error signals
2019-11-13 15:43:41 -08:00
ingerjm0
ed9db81bed
Fix for displaying moved properties' documentation in docs
2019-11-13 14:58:32 -08:00
Shannon Romano
e1fc666b0f
Merge pull request #16479 from hyperlogic/bug-fix/safe-landing-deadlock
...
Speculative fix for infinite loop in SafeLanding
2019-11-13 14:47:41 -08:00
Zach Fox
50a1ebaa4d
Call stopScreenshare when screenshare app closed
2019-11-13 14:24:01 -08:00
DouglasWilcox
b8e85aedc7
Merge branch 'master' into improve_seated_rotation
2019-11-13 13:11:30 -08:00
milad
c6c9059a29
Merge branch 'screenshareElectronApp' of github.com:MiladNazeri/hifi into screenshareElectronApp
2019-11-13 13:06:12 -08:00
Zach Fox
61f0896e30
Fix small bugs with the HTTP request to screenshare endpoint
2019-11-13 12:35:01 -08:00
Anthony J. Thibault
e81b21ac59
bug fix from code review comment
2019-11-13 10:40:00 -08:00
milad
abf592f533
Merge branch 'master' of github.com:highfidelity/hifi into screenshareElectronApp
2019-11-13 10:14:14 -08:00
DouglasWilcox
a3de25618a
Handle HMD in input vars and remove/fix json transitions in/out of HMD strafe states.
...
(cherry picked from commit f9f28fc286
2019-11-13 09:52:56 -08:00
Anthony J. Thibault
b92badbe76
Updated avatar-animation-optimized-ik.json from latest avatar-animation.json
2019-11-13 08:23:27 -08:00
Anthony J. Thibault
b4c4d81bd1
Merge branch 'master' into bug-fix/android-t-pose
2019-11-13 08:21:19 -08:00
Zach Fox
b0c578aa7f
Improved HTTP request to proper endpoint - won't work until PR16459 is merged
2019-11-12 17:06:35 -08:00
Andrew Meadows
1c399f5e9b
add doc about PICK_BYPASS_IGNORE Pick FilterFlag
2019-11-12 16:58:09 -08:00
milad
ea8e285793
Zach's ss cpp cleanup changes
2019-11-12 16:02:52 -08:00
Anthony J. Thibault
365b132c30
Bugfix for t-pose avatar when moving
...
The android specific optimized IK animation graph was out of date, it was referencing
animations that have been deleted, hence the t-pose. This PR updates and renames the
android/optimized ik animation graph to the latest.
2019-11-12 15:33:41 -08:00
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
Kalila R
a7b2c3a32c
Updated application name and version.
2019-11-11 20:22:19 -05: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
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
