Commit graph

27497 commits

Author SHA1 Message Date
Atlante45
31033ad685 Update TTS audio API use 2018-11-14 15:42:39 -08:00
Clement
7f910a38e3 Update keyboard injector to new interface 2018-11-14 14:46:08 -08:00
Clement
7192aed131 Rework audio data memory ownership model 2018-11-14 14:45:18 -08:00
John Conklin II
b08283d9e9
Merge pull request #14401 from sethalves/rc76-revert-pr-14238
revert PR-14238 "TypeError: Cannot read property 'buttons'" until we can adjust it.
2018-11-14 14:38:34 -08:00
Seth Alves
1593c1185a revert PR-14238 "TypeError: Cannot read property 'buttons'" until we can adjust it. 2018-11-14 12:29:09 -08:00
Thijs Wenker
0248323bee fix test path 2018-11-14 01:05:38 +01:00
Thijs Wenker
cc207537a3 Fix for unintended snapshots while parenting/un-parenting 2018-11-14 01:05:38 +01:00
Thijs Wenker
afd69d04dd Make ctrl+shift shortcuts work for create app 2018-11-14 01:05:37 +01:00
John Conklin II
79e67ad45f
Merge pull request #14238 from ElderOrb/FB19400
FB19400 during shutdown -- TypeError: Cannot read property 'buttons' …
2018-11-13 15:07:21 -08:00
Sam Gondelman
13f650d514
Merge pull request #14093 from SamGondelman/police
Case 19409, Case 19468: Fading fixes and shader cleanup
2018-11-13 15:00:23 -08:00
Jeff Clinton
2afc8c505d
Merge pull request #14344 from ElderOrb/FB19348
FB19348 - Interface doesn't save changes to avatar animation text field
2018-11-13 14:29:25 -08:00
Jamil Akram
822e4bfe48
Merge pull request #14386 from ctrlaltdavid/M19820
Fix entities not loading when Interface doesn't have focus
2018-11-13 13:45:42 -08:00
Brad Hefta-Gaub
bb2239c0bd
Merge pull request #14359 from howard-stearns/no-url-logging
remove urls from logs in Interface
2018-11-13 13:19:30 -08:00
Brad Hefta-Gaub
4cab805392
Merge pull request #12718 from gcalero/tester_flag
Detect if Interface is running on an android testing device
2018-11-13 13:13:52 -08:00
Brad Hefta-Gaub
153b8920be
Merge pull request #14348 from sabrina-shanman/hfm_library
(case 19302) Create the HFM library and namespace
2018-11-13 12:03:53 -08:00
Brad Hefta-Gaub
b5e432bcb1
Merge pull request #14265 from amantley/needToSquat
Bug fix for Users unable to Squat
2018-11-13 12:01:06 -08:00
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
Howard Stearns
545b85bc9d Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging 2018-11-13 09:55:54 -08:00
Seth Alves
1611525220
Merge pull request #14028 from ElderOrb/FB12459
Improve keyboard raising logic for web views
2018-11-13 09:41:04 -08:00
Seth Alves
e5114c9b43
Merge pull request #14283 from ctrlaltdavid/M14836
Make tablet page indicators clickable to scroll tablet
2018-11-13 09:38:43 -08:00
Seth Alves
4ac719a87f
Merge pull request #14298 from ctrlaltdavid/M17640
Fix Goto app cards staying highlighted if move off dialog while dragging
2018-11-13 09:32:24 -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
David Rowe
e12833da23 Fix entities not loading when Interface doesn't have focus
Reverts https://github.com/highfidelity/hifi/pull/14286
2018-11-13 14:50:02 +13:00
Howard Stearns
7da440a886
Merge pull request #14385 from howard-stearns/inventory-icons-again
new inventory icons, and align message waiting light in items tab
2018-11-12 17:05:06 -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
amantley
f2f4a55c19 removed cruft 2018-11-12 15:07:14 -08:00
sabrina-shanman
753557736e Merge branch 'master' into hfm_library 2018-11-12 15:03:30 -08:00
Howard Stearns
3431bdbb0e new inventory icons, and align message waiting light in items tab 2018-11-12 14:51:32 -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
Howard Stearns
66ae01e0c3 Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging 2018-11-12 12:55:20 -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
cd3dc04dc5
Merge pull request #14159 from alexiamandeville/WoodyUpdate
Updating Woody avatar for new UV seams
2018-11-12 12:12:49 -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
Seth Alves
500b2b7adf
Merge pull request #14381 from zfox23/MS19803_retry
Actually fix MS19803: Replace missing imports
2018-11-09 16:38:26 -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
Zach Fox
8d325d8dd9 Actually fix MS19803: Replace missing imports 2018-11-09 15:02:57 -08:00
SamGondelman
1d1510e18e Merge remote-tracking branch 'upstream/master' into police 2018-11-09 13:32:41 -08:00
Zach Fox
1ce6079c5a Remove extra as 2018-11-09 11:26:18 -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