Anthony J. Thibault
befbdcef48
Upgraded OSC plugin with changes from ARKit blendshape work.
2019-11-19 13:13:56 -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
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
