Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-21 20:41:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
77137 commits 25 branches 0 tags 1.1 GiB
Commit graph

1251 commits

Author SHA1 Message Date
Wayne Chen
77b7cc2457 separating out bubble icon qml - adding support for transparency 2019-03-22 14:16:29 -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
SamGondelman
609c4ab52e try to fix audio injector threading issues 2019-03-12 18:41:43 -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
Wayne Chen
e0fe11056e fixing compile error 2019-03-08 16:37:41 -08:00
Shannon Romano
ca87e217bd
Merge pull request #15097 from wayne-chen/audioSettingsModified 
Case 21562: Audio settings screen
 2019-03-08 16:22:52 -08:00
Wayne Chen
d46074d43f
Merge branch 'ptt' into pushToTalk 2019-03-08 16:09:58 -08:00
Wayne Chen
f4db9fefd0 Push to talk changes + rebased with master (#7) 
Push to talk changes + rebased with master
 2019-03-08 16:06:46 -08:00
r3tk0n
88a125aff0 Initial implementation (deadlocks still occurring in Audio.cpp) 2019-03-08 16:05:24 -08:00
Wayne Chen
b7d44403e1 updating compile failure + icons/settings update 2019-03-08 16:02:15 -08:00
Wayne Chen
a688c0a92b exposing setting pushingToTalk 2019-03-08 16:02:15 -08:00
Wayne Chen
60b98d2c70 Push to talk changes + rebased with master (#7) 
Push to talk changes + rebased with master
 2019-03-08 16:02:15 -08:00
Wayne Chen
7cb17b2d6e laying groundwork for audio app + fixing deadlocks 2019-03-08 16:02:14 -08:00
r3tk0n
15d49fd9a9 Initial implementation (deadlocks still occurring in Audio.cpp) 2019-03-08 16:02:14 -08:00
Roxanne Skelly
b38fc65372 Merge branch 'master' of https://github.com/highfidelity/hifi into StandaloneTags 2019-03-07 10:06:05 -08:00
Wayne Chen
e218e4bead updating compile failure + icons/settings update 2019-03-06 17:29:32 -08:00
Wayne Chen
a318b715c3 exposing setting pushingToTalk 2019-03-06 11:45:43 -08:00
Wayne Chen
5ffd9bc30b
Merge branch 'ptt' into pushToTalk 2019-03-06 11:07:34 -08:00
Wayne Chen
8b4123b5dc laying groundwork for audio app + fixing deadlocks 2019-03-06 11:00:09 -08:00
r3tk0n
d88235a08f Initial implementation (deadlocks still occurring in Audio.cpp) 2019-03-06 09:40:49 -08:00
r3tk0n
23e8a8bed4 Initial implementation (deadlocks still occurring in Audio.cpp) 2019-03-05 17:09:54 -08:00
Wayne Chen
4187104b17 culling mute state 2019-03-04 14:12:09 -08:00
Seth Alves
3ecd86caee add a way to disble muted warning from audio panel. 
fix positioning of warning.  hide warning when removing timer.
 2019-03-04 13:47:55 -08:00
Seth Alves
d54d0280c2 rework audioMuteOverlay.js 2019-03-04 13:47:54 -08:00
Oren Hurvitz
7780db813d Save the "Mute Microphone" setting 2019-03-04 13:47:54 -08:00
Seth Alves
38256df0f2 add a way to disble muted warning from audio panel. 
fix positioning of warning.  hide warning when removing timer.
 2019-03-04 11:08:06 -08:00
Seth Alves
3f52361753 rework audioMuteOverlay.js 2019-03-04 11:08:06 -08:00
Oren Hurvitz
18325ef5e3 Save the "Mute Microphone" setting 2019-03-04 11:08:06 -08:00
nimisha20
ba3895efdd
Update AccountServicesScriptingInterface.h 
Minor copy-edit
 2019-02-25 22:56:36 -08:00
nimisha20
736a050e68
Update AccountServicesScriptingInterface.h 2019-02-25 22:55:56 -08:00
nimisha20
4825ecdbf3
Update AccountServicesScriptingInterface.h 2019-02-25 22:44:16 -08:00
Roxanne Skelly
2dffd14fa7 Merge branch 'master' of https://github.com/highfidelity/hifi into StandaloneTags 2019-02-25 10:20:52 -08:00
nimisha20
e20f13f0ae
Update AccountServicesScriptingInterface.h 
Adding ctrlaltdavid's changes
 2019-02-25 09:28:56 -08:00
nimisha20
2bcee4e454
Update AccountServicesScriptingInterface.cpp 
Changes according to ctrlaltdavid's comments.
 2019-02-25 08:54:47 -08:00
David Rowe
4e9d162172 AccountServices, HifiAbout, and WalletScriptingInterface JSDoc review 2019-02-24 13:23:20 +13:00
Ken Cooke
c1786edc24 Emulate the old behavior of _lastInputLoudness 2019-02-21 18:45:17 -08:00
Roxanne Skelly
d957b38f10 Merge branch 'master' of https://github.com/highfidelity/hifi into StandaloneTags 2019-02-19 12:34:10 -08:00
ingerjm0
c8791841de
Merge pull request #14918 from ctrlaltdavid/M21128 
Case 21128: AccountServices, HifiAbout, and WalletScriptingInterface JSDoc
 2019-02-15 14:15:13 -08:00
Roxanne Skelly
be98fb1ac7 Standalone Tags - checkpoint 2019-02-15 11:21:40 -08:00
Bradley Austin Davis
d45d87031d
Merge pull request #14782 from SamGondelman/NOverlaysFinal 
Case 20723, Case 20334: Internally, replace all overlays with local entities
 2019-02-14 13:49:47 -08:00
David Rowe
6a00834147 Merge branch 'master' into M21128 
# Conflicts:
#	interface/src/AboutUtil.h
 2019-02-15 08:06:41 +13:00
David Rowe
d717e803dd WalletScriptingInterface API JSDoc 2019-02-15 08:00:53 +13:00
David Rowe
2a338124ae AccountServices API JSDoc 2019-02-15 08:00:19 +13:00
David Rowe
5428bb19dc Add "Avatar Script" JSDoc API classification 2019-02-12 11:49:49 +13:00
SamGondelman
d988de4a17 Merge remote-tracking branch 'upstream/master' into NOverlaysFinal 2019-02-11 10:27:12 -08:00