Commit graph

33640 commits

Author SHA1 Message Date
Shannon Romano
faa192a337
Merge pull request #16338 from ctrlaltdavid/DOC-126
DOC-126: Toolbars JSDoc
2019-10-30 13:46:16 -07:00
Shannon Romano
161de1478b
Merge pull request #16335 from ctrlaltdavid/DOC-191
DOC-191: Recording JSDoc
2019-10-30 13:46:04 -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
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
amerhifi
57302dd223 fixing build warning on mac/linux 2019-10-29 08:34:35 -07:00
amerhifi
37ba50992c temp reverting the call to display plugin 2019-10-29 07:16:58 -07:00
luiscuenca
ab6631fae3
Fix look at update and allow to release control 2019-10-28 17:51:29 -07:00
Amer
e61d9f3091
Merge pull request #16409 from amerhifi/dev-2450
case dev 2286: Wireless headphones crash due to missing device
2019-10-28 11:39:04 -07:00
amer cerkic
f1f67f1996 android build fix 2019-10-28 10:42:25 -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
35082a730e Changed the desktop sprint speed to 2.0.
This change will not actually be felt by users, because the speed was already effectively 2.0
(because the sprint speeds for Desktop and HMD were reversed).
2019-10-27 09:35:16 +02:00
amerhifi
8dc13ec242 fixed mac param spacing 2019-10-25 16:01:24 -07:00
amerhifi
397586bd19 setting defauld device code for mac to use QT with optional backup to platform code on failure 2019-10-25 15:19:24 -07:00
Anthony J. Thibault
8cf58f2034 Fix for unused avatar transit warnings on mac and linux
This was introduced by PR #16403

https://github.com/highfidelity/hifi/pull/16403
2019-10-25 13:56:12 -07:00
amerhifi
6860ac9693 fix missing default device 2019-10-25 13:09:13 -07:00
amerhifi
3e1f341225 typo fix 2019-10-25 12:50:13 -07:00
amerhifi
52637320f0 mac build fix 2019-10-25 12:49:03 -07:00
amerhifi
358f042f32 Merge branch 'master' into dev-2450 2019-10-25 12:12:10 -07:00
amerhifi
49465b1b96 null default device 2019-10-25 12:10:26 -07:00
Shannon Romano
c650ca6544
Merge pull request #16403 from hyperlogic/bug-fix/remove-avatar-transit-log-spam
Remove AvatarTransit log spam
2019-10-25 10:12:17 -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
Anthony J. Thibault
a67904212d Remove AvatarTransit log spam 2019-10-24 15:52:44 -07:00
amerhifi
5dd5447095 moved call to hmd device name prior to locking device mutex 2019-10-24 15:03:55 -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
amer cerkic
ac8b664537 addresing pr comments 2019-10-23 15:39:38 -07:00
amer cerkic
ed4df09a26 updated logging added clarifying comment for emit 2019-10-23 15:15:41 -07:00
amer cerkic
d7996c77f4 android build fix 2019-10-23 14:48:25 -07:00
luiscuenca
9432a37567
Undo changes in HeadData.cpp 2019-10-23 14:26:53 -07:00
luiscuenca
bb0849d3a0
Move changes to Head and remove leftover code 2019-10-23 14:23:29 -07:00
David Rowe
116510225a Typo 2019-10-24 09:10:26 +13:00
David Rowe
9d905dbec4 Merge branch 'master' into DOC-126 2019-10-24 09:05:41 +13:00
David Rowe
777f969919 Typo 2019-10-24 09:00:29 +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
David Rowe
fffb81b474 Merge branch 'master' into DOC-191 2019-10-24 08:23:27 +13: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
amerhifi
68681fdb2e Merge branch 'master' into amer-dev471-re 2019-10-21 21:04:24 -07:00
amerhifi
ec7c8ce13c updated default changes check to account for multiple devicetypes 2019-10-18 16:50:36 -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
luiscuenca
33ea63c708
Fix warnings and update controls 2019-10-17 15:06:12 -07:00
luiscuenca
63c2b41929
Restate legacy first person camera mode 2019-10-17 13:26:42 -07:00
Brad Hefta-Gaub
6d895942f3
Merge pull request #16350 from ctrlaltdavid/DEV-2391
DEV-2391: Fix Recording.stopRecording() crash
2019-10-16 15:33:13 -07:00
luiscuenca
9f0e82e1e6
Improve eye's look at and blinking. Fix look at update 2019-10-16 15:29:28 -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
dooglifeSF
0510215240 Move magic number to constant for SLOW_SPEED_THRESHOLD. 2019-10-15 17:48:06 -07:00
Shannon Romano
bebb21fa9e
Merge pull request #16352 from hyperlogic/bug-fix/legacy-sit-script
Bugfix for legacy sit scripts
2019-10-15 16:19:49 -07:00
Anthony J. Thibault
14e5962675 Bugfix for legacy sit scripts
Don't return additive clip nodes as valid "roles" for users to override.
2019-10-15 15:29:24 -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