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
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
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
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
