Commit graph

81236 commits

Author SHA1 Message Date
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
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
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
Shannon Romano
99aeb4aa2f
Merge pull request #16380 from zfox23/fixAnchorlessWindows
DEV-2471: Fix an issue with InteractiveWindow anchors that caused windows without anchors to move when the Interface window geometry changes
2019-10-18 14:36:06 -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
Maia Hansen
825fe122a9
Merge pull request #16376 from kencooke/audio-wasapi-qt5.12.3
DEV-589: Rebase our audio plugin to Qt 5.12.3 / Qt 5.13
2019-10-18 10:11:51 -07:00
Ken Cooke
6101f54d4b Rebase WASAPI audio plugin on Qt 5.12.3 2019-10-18 06:11:00 -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
Shannon Romano
db0a5f3e41
Merge pull request #16363 from SimonWalton-HiFi/avatar-mixer-reduce-log-spam
DEV-606: Remove excessive avatar-mixer logging
2019-10-17 16:05:07 -07:00
Shannon Romano
3f711b7427
Merge pull request #16368 from luiscuenca/enableFirstPersonCameraLegacy
DEV-2413: Restate legacy first person camera mode
2019-10-17 16:01:31 -07: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
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
Shannon Romano
6d8b5e2e19
Merge pull request #16364 from luiscuenca/tweakNoNeckView
DEV-2316: Tweak camera position in first person to further hide neck
2019-10-16 22:15:34 -07:00
luiscuenca
9000b4c7f8
Tweak camera position in first person to further hide neck 2019-10-16 17:31:10 -07:00
Simon Walton
84eab3cdd4 Remove excessive avatar-mixer logging 2019-10-16 16:58:37 -07:00
Ryan Huffman
e83ac8c0dd Remove call to processEvents on Mac in ~Application 2019-10-16 16:14:27 -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
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
Shannon Romano
a6842b5cba
Merge pull request #16346 from dooglifeSF/change_away_animation
New AFK "away" animation
2019-10-16 09:17:51 -07:00
luiscuenca
a9aeceff55
Undo rig changes 2019-10-16 09:10:30 -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
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
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
Shannon Romano
f7862a0556
Merge pull request #16348 from sethalves/fix-snap-translate-actions
fix step translate actions
2019-10-15 13:18:01 -07:00
David Rowe
185d6990eb Add missing threading checks to Recording API methods 2019-10-16 09:17:29 +13:00
Zach Fox
9c03de7af6 Merge branch 'friction' of github.com:RebeccaStankus/hifi into friction 2019-10-15 12:26:38 -07:00
Zach Fox
9b9110e163 Remove cachebusting code 2019-10-15 12:26:18 -07:00
Zach Fox
6c92091814
Merge pull request #16349 from zfox23/updateEmoteDisplayIcon
DEV-2426: Update Emote Indicator icon
2019-10-15 12:13:14 -07:00
Zach Fox
4770008383 DEV-2426: Update Emote Indicator icon 2019-10-15 11:39:00 -07:00
dooglifeSF
e757a6fd86 Merge branch 'master' into change_away_animation 2019-10-15 10:46:24 -07:00
Seth Alves
1f8a7cfea7 fix step translate actions 2019-10-15 09:23:35 -07:00
Zach Fox
3102a6ff08
Merge pull request #16339 from RebeccaStankus/ouputMutedOverlay
Fixed calculation of overlay position
2019-10-14 16:56:50 -07:00
dooglifeSF
589d4e992c Change away anim to hosted afk_texting animation. 2019-10-14 16:48:45 -07: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