Commit graph

22481 commits

Author SHA1 Message Date
Brad Hefta-Gaub
41d8220cbd
Merge pull request #14362 from ctrlaltdavid/M19768
Add option to enable/disable the mini tablet
2018-11-13 11:59:24 -08:00
Brad Hefta-Gaub
47cd6b332c
Merge pull request #14349 from hyperlogic/bug-fix/head-trackers-in-desktop-mode
Bug fix for head trackers in desktop mode
2018-11-13 11:49:24 -08:00
Brad Hefta-Gaub
4bafcd2cfa
Merge pull request #14271 from SamGondelman/oculus
Case 19475: Fix various Oculus Store test failures
2018-11-13 11:06:39 -08:00
Brad Hefta-Gaub
63e52ba8bd
Merge pull request #14284 from ctrlaltdavid/M19404
Fix interstitial page not displaying at Interface start-up
2018-11-13 10:38:38 -08:00
Seth Alves
969776e476
Merge pull request #14312 from ctrlaltdavid/M18577
Add option to start up at home location
2018-11-13 09:29:37 -08:00
Sam Gondelman
f68706e72f
Merge pull request #14252 from gcalero/enable_aec_by_default
Enabled AEC by default (bug 19210)
2018-11-12 16:15:33 -08:00
Jeff Clinton
ab8ba2daad
Merge pull request #14230 from amantley/shoulderSpaceFix
Hand Azimuth improvement
2018-11-12 16:00:26 -08:00
John Conklin II
ec4f2f781d
Merge pull request #14352 from Atlante45/feat/solo-source
[master] Add audio soloing feature
2018-11-12 14:07:30 -08:00
Jamil Akram
6511b60aa4
Merge pull request #14264 from ctrlaltdavid/M19085
Fix AvatarManager.getPalData() returning data for just a single avatar
2018-11-12 12:27:58 -08:00
John Conklin II
9d404a6cf3
Merge pull request #14379 from Cristo86/gles_use_tbo_no_ssbo
case 19562: GLES - Use TBO instead of SSBO and make shaders use it when it is not gl45 (master)
2018-11-12 10:45:52 -08:00
John Conklin II
33da88f174
Merge pull request #14351 from luiscuenca/tweakTransitAnimations
Tweak transit animations
2018-11-12 10:39:56 -08:00
Brad Hefta-Gaub
22dd958582
Merge pull request #14297 from jherico/feature/vcpkg
Case 19807: Switch to vcpkg for many dependencies on all non-mobile platforms
2018-11-12 09:52:02 -08:00
Jeff Clinton
12b833d121
Merge pull request #14167 from ElderOrb/FB18859
Make material entities to be presented in avatarapp
2018-11-09 15:32:27 -08:00
David Rowe
de61f0f010 Add missing JSDoc noticed in passing 2018-11-09 14:00:47 +13:00
David Rowe
c9b3fda724 Merge branch 'master' into M19768
# Conflicts:
#	interface/src/scripting/HMDScriptingInterface.h
2018-11-09 13:56:44 +13:00
David Rowe
5c97954e66 Merge branch 'master' into M19404
# Conflicts:
#	scripts/system/interstitialPage.js
2018-11-09 13:35:11 +13:00
John Conklin II
3fabe557c2
Merge pull request #13948 from danteruiz/3d-keyboard
3D Keyboard.
2018-11-08 13:35:13 -08:00
Brad Davis
8c4f0ec774 Vcpkg migration 2018-11-08 12:28:06 -08:00
Jeff Clinton
ea8dc8ae68
Merge pull request #14334 from danteruiz/interstitial-bug-fixes
Interstitial bug fixes
2018-11-08 11:43:38 -08:00
John Conklin II
ab9c494fef
Merge pull request #14367 from SamGondelman/tablet
Case 17284: Fix tablet culling
2018-11-08 11:14:12 -08:00
Jamil Akram
7c22a1954c
Merge pull request #14237 from NissimHadar/addNoLogin
case 18450: Do not show login dialog if requested not to on the command line.
2018-11-08 10:43:21 -08:00
Dante Ruiz
358aa547b1 feedback changes 2018-11-08 09:58:53 -08:00
Dante Ruiz
f664421fe0 addressing code review feedback 2018-11-08 09:58:53 -08:00
Dante Ruiz
501746b156 3D Keyboard 2018-11-08 09:58:53 -08:00
David Rowe
e5fe2622ae Merge branch 'master' into M19768 2018-11-08 17:13:02 +13:00
Zach Fox
cee1454f6e CR feedback - thanks Ken! 2018-11-07 15:09:53 -08:00
SamGondelman
d316fe15ce fix tablet culling 2018-11-07 15:02:32 -08:00
Zach Fox
48d3450c5a Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech 2018-11-07 14:59:23 -08:00
David Rowe
28097933ed Add setting to enable/disable the mini tablet 2018-11-07 14:39:06 +13:00
SamGondelman
887c4f108f high detail not low 2018-11-06 16:34:16 -08:00
SamGondelman
e20aeb28eb force low detail on oculus first run 2018-11-06 15:58:35 -08:00
Zach Fox
f22bbff505 Fix MS19743: Fix case where user couldn't update certain items 2018-11-06 15:47:47 -08:00
Clement
0ca0a6f3be Fix JSDoc arrays 2018-11-06 12:57:17 -08:00
Zach Fox
378bf911d4 Fix another build error 2018-11-06 12:48:17 -08:00
Clement
4e802b0f3f Add JSDoc comments 2018-11-06 11:59:15 -08:00
Zach Fox
c33f9b6ea3 Fix build error 2018-11-06 11:26:09 -08:00
Zach Fox
58dd690c0a Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech 2018-11-06 10:29:05 -08:00
luiscuenca
6ed6e30df3 Tweak transit animation 2018-11-05 19:14:40 -07:00
luiscuenca
f9b6d3dc6f Merge addTransitAPI branch 2018-11-05 19:02:35 -07:00
Anthony Thibault
ac8281075b Code review feedback
Added comment to explain removal of displayPlugin->resetSensors from Application::resetSensors()
2018-11-05 17:25:00 -08:00
Anthony Thibault
ac8869eb61 Bug fix for head trackers in desktop mode
Sitting and standing modes work even in desktop mode.
We were inadvertently checking for HMD Mode instead of if the head was valid.
* A change was made to the ViveControllerManager to return head poses in the correct standing universe when in desktop mode.
* The default sensorToWorld matrix in desktop mode is similar to the one returned by the system for Vive and Oculus sensor frame; y = 0 is at floor level.
* Sitting mode, walking mode and recentering flags are now visible in the AnimStats.
2018-11-05 16:21:19 -08:00
Howard Stearns
a99facb793
Merge pull request #14261 from howard-stearns/oculus-store-commerce
Oculus store commerce
2018-11-05 16:13:04 -08:00
John Conklin II
4d74f7a0da
Merge pull request #14338 from sabrina-shanman/hfm_geo2model
(case 19302) Rename HFMGeometry to HFMModel and adjust related variables
2018-11-05 15:00:06 -08:00
Gabriel Calero
611881e002 Mute when entering a domain 2018-11-05 18:35:57 -03:00
sabrina-shanman
30eb360f62 Convert remaining HFMModels called model to hfmModel, and rename some missed local variables 2018-11-05 12:07:17 -08:00
Zach Fox
a4d36b3845 Merge branch 'master' of github.com:highfidelity/hifi into oculus-store-commerce 2018-11-05 10:25:58 -08:00
Zach Fox
a87142b8b7 Merge branch 'master' of github.com:highfidelity/hifi into oculus-store-commerce 2018-11-02 16:49:20 -07:00
Brad Hefta-Gaub
d0181283dd
Merge pull request #14308 from sabrina-shanman/fbx2hfm
(case 19302) Re-name FBXGeometry to HFMGeometry and do the same for related classes
2018-11-02 16:44:31 -07:00
Zach Fox
d0854ca2ab Use AccountManager instead of settings 2018-11-02 16:42:18 -07:00
Howard Stearns
be17ed0910
Merge pull request #14327 from roxanneskelly/gift-update
Case 18794 - updates were being reported as gifts in the wallet
2018-11-02 16:42:03 -07:00