Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-06 06:35:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
56250 commits 76 branches 59 tags 1.2 GiB
Commit graph

56250 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Dante Ruiz
2c3db0fb91 finished calibration-ui 2017-06-21 01:07:12 +01: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
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
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
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
druiz17
a5913af9b4 Merge pull request #10737 from vladest/fix_audio_qt59 
Fix audio qt59
 2017-06-20 09:41:58 -07:00
Dante Ruiz
33b89c9d32 adding glyph and text 2017-06-20 17:26:17 +01:00
David Rowe
513e0cd232 Fix import of JSON with parent-child relationships 2017-06-20 16:44:25 +12:00
Thijs Wenker
07fefdcb2f Merge pull request #10748 from samcake/brown 
Fix the local lights issue
 2017-06-20 05:17:18 +02:00
samcake
ba9dbbb4d4 Fix the local lights issue, and correct the script relying on the Render.getConfig(), this one is on me... 2017-06-19 17:34:50 -07:00
Dante Ruiz
13dff29bd5 adding calibration screen 2017-06-20 01:19:10 +01:00
Zach Pomerantz
497ee3a522 add Audio.inputLevel 2017-06-19 17:07:43 -07:00
Stephen Birarda
3619294761 Merge pull request #10745 from seefo/fb5367 
Added a restart button to domain server settings page
 2017-06-19 16:35:36 -07:00
Stephen Birarda
603c47f0da Merge pull request #10656 from birarda/bug/range-bigger-than-file 
fix ATP range requests for small ktx files
 2017-06-19 16:10:09 -07:00
Stephen Birarda
cf9a97cf10 use length sent by AssetServer to verify asset size 2017-06-19 15:15:45 -07:00
Zach Pomerantz
7512332104 replace mic-mute icons with red variants 2017-06-19 15:07:28 -07:00
Zach Pomerantz
6adfe34661 make mute red check 2017-06-19 15:07:28 -07:00
seefo
0c7f1cda0f Added a restart button to domain server settings page 2017-06-19 15:01:50 -07:00
Howard Stearns
ddce665613 Merge pull request #10739 from zfox23/spectatorCamera_mergeable_20170619 
Spectator Camera - Mergeable Rendering Components
 2017-06-19 14:55:43 -07:00
Zach Pomerantz
5c0e9e7496 improve wording for MyAvatar.qmlPosition doc 2017-06-19 14:52:32 -07:00
Zach Pomerantz
f0bc080502 fix tab 2017-06-19 14:51:30 -07:00
Brad Davis
8aeeab30e7 Merge pull request #10689 from Atlante45/fix/ktx 
Fix KTX performance problems
 2017-06-19 14:44:52 -07:00
Zach Pomerantz
a7e1b75909 stopgap with MyAvatar.qmlPosition 2017-06-19 14:41:01 -07:00
Zach Pomerantz
d3d36324c0 play sample output sound 2017-06-19 14:41:01 -07:00
Zach Pomerantz
071a8a783c add sample sound 2017-06-19 14:41:01 -07:00
Zach Pomerantz
1bf16c4318 update fonts 2017-06-19 14:41:00 -07:00
Zach Fox
2e215e6544 Fix build problems 2017-06-19 14:04:51 -07:00
Zach Fox
cbdffce88e Merge branch 'master' of https://github.com/highfidelity/hifi into spectatorCamera_mergeable_20170619 2017-06-19 13:53:29 -07:00
Dante Ruiz
cfffb74a29 Merge branch 'master' of github.com:highfidelity/hifi into hand-pucks 2017-06-19 21:40:26 +01:00
Dante Ruiz
734cde33e7 better calibrate button 2017-06-19 21:40:09 +01:00
Brad Davis
ed6620fc51 Merge pull request #10718 from jherico/frame_thread 
Cleanup and refactoring
 2017-06-19 13:31:44 -07:00
Stephen Birarda
3f580031d1 Merge pull request #10742 from seefo/fb5368 
Domain server settings will now tell user if saving will restart DS
 2017-06-19 13:23:15 -07:00
seefo
1619d877d3 Made requested changes to domain server settings.js 2017-06-19 13:21:13 -07:00
seefo
705ce4c789 Changed domain server restart/save button behavior to be correct 2017-06-19 12:09:20 -07:00