Commit graph

56276 commits

Author SHA1 Message Date
Clément Brisset
4929939501 Merge pull request #10768 from Atlante45/fix/skyboxes
Fix skyboxes sometimes not showing
2017-06-21 13:56:42 -07:00
Chris Collins
f3ae1d8078 Merge pull request #10750 from Atlante45/master
Stable -> Master
2017-06-21 13:34:28 -07:00
Brad Hefta-Gaub
88a4f5c576 Merge pull request #10766 from humbletim/sort-running-scripts
Sort Running Scripts... list alphabetically
2017-06-21 13:08:47 -07:00
Brad Hefta-Gaub
4ddb5e8866 Merge pull request #10562 from huffman/fix/graceful-controls
Improvements to gracefulControls.js
2017-06-21 12:52:36 -07:00
Brad Hefta-Gaub
4f632005b6 Merge pull request #10372 from rabelaiis/21300
Add entity script for balloon spawner and sample json entity with us…
2017-06-21 12:50:52 -07:00
Atlante45
49623fefd8 Fix Skyboxes sometimes not showing 2017-06-21 11:40:32 -07:00
Anthony Thibault
a12109ed26 Merge pull request #10761 from hyperlogic/bug-fix/avatar-no-eyes
Bug Fixes for Eyeless Avatars
2017-06-21 10:59:55 -07:00
Brad Hefta-Gaub
f7d42c782d Merge pull request #10764 from thoys/feat/ac-location-jsapi
Expose location scripting interface to Agent (AC script)
2017-06-21 10:22:48 -07:00
Brad Hefta-Gaub
04d74a715a Merge pull request #10765 from samcake/brown
Adding Profiling for script engine timer callback
2017-06-21 10:13:20 -07:00
Brad Hefta-Gaub
c5845787da Merge pull request #10759 from jherico/file_cache_shutdown
Fix crash when cache entry lifetime exceeds cache lifetime
2017-06-21 10:06:48 -07:00
Sam Cake
09529f6592 One more refinemnt of the comment 2017-06-21 00:54:04 -07:00
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
samcake
d853a76376 Fixing the scripts and investigating the scripting 2017-06-20 17:23:44 -07: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
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
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
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
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
samcake
3727b2af7e Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2017-06-20 10:53:25 -07:00
Seth Alves
428dc81083 Merge pull request #10696 from AndrewMeadows/avoid-ownership-bid-race
ignore remote update younger than recent ownership bid
2017-06-20 10:42:54 -07:00
Anthony J. Thibault
29e3af820b Fix for avatars with no eyes.
The calculation of the centerEyeCalibration matrix (and several others) were incorrect.
2017-06-20 10:14:34 -07:00
Anthony J. Thibault
21c0e45d87 recenter rotation while driving.
This should reduce foot sliding in HMD mode.
2017-06-20 09:43:38 -07:00
druiz17
a5913af9b4 Merge pull request #10737 from vladest/fix_audio_qt59
Fix audio qt59
2017-06-20 09:41:58 -07:00
Sam Cake
5b6f6ab84f Trying to fix the getCOnfig from QML... 2017-06-20 00:25:51 -07:00