Commit graph

1292 commits

Author SHA1 Message Date
David Rowe
3032b58abc Revise formatting of Facilities and Entity Methods sections 2019-04-30 10:10:46 +12:00
David Rowe
407ce745d5 Merge branch 'master' into M22075
# Conflicts:
#	libraries/controllers/src/controllers/Actions.cpp
2019-04-27 10:51:13 +12:00
Sam Gateau
c647bbcb16
Merge pull request #15400 from danteruiz/throttle-refresh-rate
Case 22253: Refresh Rate Controller
2019-04-26 12:04:39 -07:00
jennaingersoll
fb1842cbfa
Merge pull request #15455 from ctrlaltdavid/M22330
Case 22330: Regularize JSDoc deprecation notices
2019-04-26 09:48:45 -07:00
jennaingersoll
24196e2776
Merge pull request #15321 from ctrlaltdavid/M21956
Case 21956: Audio JSDoc
2019-04-25 17:03:58 -07:00
NissimHadar
2685550cc1 Merge branch 'master' of github.com:highfidelity/hifi into 21976-implementScriptAPIFor_gpuTextureMemSizeStable 2019-04-25 14:18:43 -07:00
NissimHadar
261277e4c1 Wrong method call fixed. 2019-04-25 13:49:56 -07:00
Sam Gondelman
ef64de7c04
Merge branch 'master' into openurl 2019-04-25 13:21:27 -07:00
David Rowe
8e69e0b049 Regularize deprecation notices 2019-04-25 20:55:30 +12:00
SamGondelman
31b3f0e8f1 possible fix for openUrl exploit 2019-04-24 16:39:31 -07:00
Dante Ruiz
0bdc37859d Refresh Rate Controller 2019-04-24 16:16:08 -07:00
NissimHadar
6f4ee601fb CR corrections. 2019-04-23 13:27:21 -07:00
NissimHadar
ec69fd38eb Added set minimum GPU texture memory cycles to API. 2019-04-23 12:26:13 -07:00
Wayne Chen
ad22af1379 set AudioClient mute state as catch-all 2019-04-23 09:47:15 -07:00
David Rowe
fbc8e1c347 Miscellaneous fixes 2019-04-23 14:49:14 +12:00
David Rowe
6e09c4885f Review updates 2019-04-23 14:35:25 +12:00
NissimHadar
f786f5a4a6 Corrected jsdoc comment. 2019-04-22 16:00:44 -07:00
Wayne Chen
55f3c3a11a allowing context change to change mute state 2019-04-19 18:28:10 -07:00
Wayne Chen
38115b0c09 simplify PTT logic 2019-04-19 07:30:48 -07:00
Wayne Chen
da8f8e0873 real fix 2019-04-18 14:46:08 -07:00
Wayne Chen
5baf2f21d8 adding settingsLoaded bool check 2019-04-18 07:48:59 -07:00
David Rowe
59533d0f59 Controller JSDoc update 2019-04-10 08:51:14 +12:00
David Rowe
a6ae79a2d8 Misc. fixes. 2019-04-04 11:34:10 +13:00
David Rowe
93f917527d Merge branch 'master' into M21956
# Conflicts:
#	interface/src/scripting/Audio.h
2019-04-04 11:06:09 +13:00
NissimHadar
6b83f2f94d Set stability count to 2 (enough for nitpick) 2019-04-02 08:39:04 -07:00
NissimHadar
670fb017f3 Moved API call to Test interface. 2019-04-01 10:29:31 -07:00
David Rowe
dff013128e Text improvements and typos 2019-03-30 10:09:48 +13:00
David Rowe
da45b4db38 Add further Audio API examples 2019-03-30 09:51:02 +13:00
David Rowe
5c8d89fb12 Fill in and tidy Audio API JSDoc 2019-03-29 18:53:30 +13:00
Wayne Chen
f3708ba27b
Merge branch 'master' into newAudioMuteStates 2019-03-27 15:49:39 -07:00
Wayne Chen
060932ad4b fixing typo 2019-03-26 09:13:10 -07:00
Wayne Chen
6aebd000d6 changing api to match verbiage of overall code 2019-03-25 15:41:03 -07:00
Wayne Chen
1952ad4be6
Merge branch 'master' into audio-mixer-volume-control 2019-03-25 11:28:14 -07:00
Wayne Chen
0676e4de5c
Merge pull request #15165 from wayne-chen/fixMuteStateWarning-master
Case 21684: Microphone is still live after reopening Interface
2019-03-25 11:14:29 -07:00
Ken Cooke
b5e8176b0f
Merge branch 'master' into audio-mixer-volume-control 2019-03-23 16:15:29 -07:00
Ken Cooke
e671a124c3 Cleanup 2019-03-22 17:58:17 -07:00
Wayne Chen
3ea45de7c7 fixing qml bug in MicBar 2019-03-22 16:37:23 -07:00
Wayne Chen
77b7cc2457 separating out bubble icon qml - adding support for transparency 2019-03-22 14:16:29 -07:00
Ken Cooke
e8ddee280d Quantize and limit the local injector gains to match the network protocol 2019-03-22 10:24:30 -07:00
Ken Cooke
23a6a66528 Add local injector gains to the Audio scripting interface 2019-03-22 10:21:54 -07:00
Sam Gondelman
04ecdb463f
Merge pull request #15173 from SamGondelman/audio
Case 21457, Case 16836, Case 15782: Improve AudioInjector threading
2019-03-21 18:03:58 -07:00
Ken Cooke
7311c3ac06 Move the new audio volume API from Users scripting interface to Audio scripting interface 2019-03-21 11:51:49 -07:00
SamGondelman
609c4ab52e try to fix audio injector threading issues 2019-03-12 18:41:43 -07:00
Wayne Chen
186588ddc4 set audio client muted when loaded data 2019-03-12 15:27:02 -07:00
NissimHadar
41662b183b Removed redundant method. 2019-03-12 10:45:04 -07:00
Wayne Chen
0279373d11
Merge branch 'master' into ptt 2019-03-11 17:09:37 -07:00
Jason Najera
3c5fd06959
Remove useless comment.
Comment was not helpful.
2019-03-11 16:16:58 -07:00
Wayne Chen
36c2358dc0
Merge branch 'master' into muteWarningModified 2019-03-11 14:35:13 -07:00
Wayne Chen
20487b2ad1 connecting pushingToTalkChanged with handlePushedToTalk 2019-03-10 19:39:45 -07:00
r3tk0n
04c6c42512 Fix build error from merge. 2019-03-10 14:28:31 -07:00