Commit graph

56572 commits

Author SHA1 Message Date
Sam Cake
484aeed589 More comments on the getCOnfig call 2017-06-21 00:36:03 -07:00
Sam Cake
1e168a5f6d Remove extra logging 2017-06-21 00:23:24 -07:00
Sam Cake
a78018345b Fixing the last scripts maybe 2017-06-21 00:15:29 -07:00
Sam Cake
c35be446e6 adding profiling on the script engine call back to timer event 2017-06-21 00:06:45 -07:00
Sam Cake
189ad9c706 Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2017-06-20 22:42:40 -07:00
Thijs Wenker
2a4e9cb603 fix local include / headers 2017-06-21 06:38:16 +02:00
Thijs Wenker
47643e1efe Expose location API to Agent scripts (side-effect, agents now can teleport) 2017-06-21 06:31:36 +02:00
Zach Fox
8dab93e299 Merge pull request #10762 from zzmp/audio/input-select-active-level
Add a VU meter to the active mic selection
2017-06-20 18:38:49 -07:00
Zach Pomerantz
a9ffff6582 Merge pull request #10760 from zzmp/audio/mute-row
Give audio menu mute checkbox its own row
2017-06-20 18:24:03 -07:00
Howard Stearns
fea8a95fc7 Don't leave running markers around if they weren't there before and we quit after reporting (protocol)version. 2017-06-20 18:09:27 -07:00
Howard Stearns
ac1d4d9636 Merge branch 'master' of https://github.com/highfidelity/hifi into event-installer-interface-options 2017-06-20 17:57:12 -07:00
Dante Ruiz
17832b6022 edited some button behavior 2017-06-21 01:38:05 +01:00
samcake
d853a76376 Fixing the scripts and investigating the scripting 2017-06-20 17:23:44 -07:00
Dante Ruiz
5e82b13d65 removed double include 2017-06-21 01:15:17 +01:00
Dante Ruiz
2e329602f7 minimize diff 2017-06-21 01:13:45 +01:00
Dante Ruiz
b7286db523 fixed merge conflict 2017-06-21 01:10:54 +01:00
Ken Cooke
1688ad5f0a HRTF optimized for AVX512 2017-06-20 17:09:38 -07:00
Dante Ruiz
2c3db0fb91 finished calibration-ui 2017-06-21 01:07:12 +01:00
Zach Pomerantz
0075d8619a center MUTED text in InputLevel 2017-06-20 17:04:54 -07:00
Zach Pomerantz
1f7e1e8287 add level to active input selection 2017-06-20 17:04:54 -07:00
Atlante45
6bd1946e96 Merge branch 'stable' of https://github.com/highfidelity/hifi 2017-06-20 16:36:57 -07:00
Chris Collins
d55ebe1785 Merge pull request #10752 from highfidelity/RC-44-HOTFIX
Build 44.1 Hotfix Fix for lights, crash on switching domains and import objects
2017-06-20 16:29:49 -07:00
Zach Pomerantz
baafe1ad09 give Audio menu mute its own row 2017-06-20 16:15:05 -07:00
Ken Cooke
b27b09ebc6 Detect support for AVX512 instructions 2017-06-20 16:09:52 -07:00
Ken Cooke
bbfdb0f7eb Refactor CPU detection to use common subfunctions 2017-06-20 16:06:05 -07:00
Zach Pomerantz
8e1cf763e3 Merge pull request #10756 from zzmp/audio/input-level
Update chrome for the audio input level meter
2017-06-20 15:33:17 -07:00
Zach Pomerantz
7e84f67391 Merge pull request #10744 from zzmp/audio/output-sample
Add "Play sample sound" to audio setting
2017-06-20 15:32:57 -07:00
Brad Davis
e3fb42eefd Fix crash when cache File lifetime exceeds cache lifetime 2017-06-20 14:38:51 -07:00
Zach Pomerantz
278a122291 bring visibleChanged to standard 2017-06-20 14:04:50 -07:00
howard-stearns
41003bd307 Merge branch 'master' of https://github.com/highfidelity/hifi into event-installer-interface-options 2017-06-20 13:25:38 -07:00
howard-stearns
480ff784b9 add a skipTutorial option, that does not change settings 2017-06-20 13:25:03 -07:00
Cain Kilgore
02b3a07e67 Removed old smoke 2017-06-20 20:55:07 +01:00
Cain Kilgore
d4665da065 Fixed new smoke effect not spawning correctly. 2017-06-20 20:53:04 +01:00
Cain Kilgore
6652399534 Replaced texture & sound effect. 2017-06-20 20:33:50 +01:00
Zach Pomerantz
dc6542c615 fix typo 2017-06-20 12:20:49 -07:00
Zach Pomerantz
6823e7cae0 Audio -> HifiAudio to avoid collision 2017-06-20 12:20:14 -07:00
Zach Pomerantz
8d4307460c Audio -> HifiAudio to avoid collision 2017-06-20 12:19:42 -07:00
Zach Pomerantz
f55d842fac add SoundCache to tablet for PlaySampleSound 2017-06-20 12:16:08 -07:00
Zach Pomerantz
6c776e27af fix PlaySampleSound glyphs 2017-06-20 12:16:08 -07:00
Zach Pomerantz
ab6c8505b8 stop audio sample on visibleChanged 2017-06-20 12:15:23 -07:00
David Rowe
08b6c4f829 Fix import of JSON with parent-child relationships 2017-06-20 12:08:42 -07:00
Thijs Wenker
b22b45461f Merge pull request #10754 from ctrlaltdavid/21405
Fix import of JSON with parent-child relationships
2017-06-20 20:48:01 +02:00
Matti Lahtinen
256484cd21 Removed Whitespace 2017-06-20 21:44:32 +03:00
Zach Pomerantz
c33853f4cf update AvatarInputs with MicBar 2017-06-20 11:43:02 -07:00
Zach Pomerantz
ab68c44177 MicBar tweaks 2017-06-20 11:43:02 -07:00
Zach Pomerantz
8436d0cc6b rm unused AvatarInputs props 2017-06-20 11:43:02 -07:00
Zach Pomerantz
c826858458 revamp tablet MicBar 2017-06-20 11:43:02 -07:00
seefo
00a3fc77a1 Fixed an issue where toolbar buttons duplicated themselves when reloading scripts 2017-06-20 11:18:22 -07:00
Brad Hefta-Gaub
cbded766b1 Merge pull request #10676 from NeetBhagat/21369
WL 21369 - Implement parts of the JS "console" object
2017-06-20 11:06:34 -07:00
Zach Pomerantz
7f90f8af45 Merge pull request #10746 from zzmp/audio/mute-check
Emphasize mute state with red
2017-06-20 10:58:11 -07:00