Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-12 13:14:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
56171 commits 76 branches 59 tags 1.2 GiB
Commit graph

56171 commits

This branch
This branch
All branches
Author SHA1 Message Date
Zach Pomerantz
20c0dac8e8 update QML with Audio.muted 2017-06-13 16:10:16 -04:00
Zach Fox
8962c7bf6a Viewfinder re-flip, add comments regarding why it's necessary 2017-06-13 13:06:03 -07:00
Zach Pomerantz
337b6bca14 update JS with Audio.muted 2017-06-13 16:02:58 -04:00
Anthony Thibault
0d46b78bff Merge pull request #10541 from Menithal/21324 
Reworked Particle Editor UI
 2017-06-13 13:00:54 -07:00
Zach Pomerantz
79563b7d83 fix header on AudioDevices.h 2017-06-13 14:55:20 -04:00
Zach Pomerantz
9b131ee4af rm old AudioDevice interface 2017-06-13 14:55:10 -04:00
Zach Pomerantz
bf5c70501d rm tester script 2017-06-13 14:54:53 -04:00
Zach Pomerantz
1a046b4d91 propagate title in Audio dialog qml 2017-06-13 14:42:48 -04:00
Zach Pomerantz
4a39798a97 sticky audio selection 2017-06-13 14:38:52 -04:00
Zach Fox
7b6033f7bc Getting closer to a solution 2017-06-13 11:37:27 -07:00
Chris Collins
90c4d7d666 Merge pull request #10674 from samcake/brown 
Fix bug in clearFramebuffer with Stencil Buffer
 2017-06-13 11:25:06 -07:00
howard-stearns
614d2f8ea1 fix teleport vs stuck-in-floor work 2017-06-13 11:23:05 -07:00
Chris Collins
33bf8cc20e Merge pull request #10672 from howard-stearns/fix-teleport-vs-stuck-in-floor 
fix teleport vs stuck-in-floor work
 2017-06-13 11:13:35 -07:00
Brad Davis
c3f664502a Add support for querying the desired output audio device for OpenVR 2017-06-13 10:57:10 -07:00
Matti Lahtinen
35f83afd09 Removed unneccessary print 2017-06-13 20:43:14 +03:00
Menithal
c2c1e607c0 Formating 2017-06-13 20:31:41 +03:00
Zach Fox
4acbb81413 Checkpoint 2017-06-13 10:22:48 -07:00
Zach Fox
b50c8120bd Merge pull request #10673 from samcake/flash 
Fix the background not rendering on the second frame
 2017-06-13 10:22:20 -07:00
Zach Fox
ec162327a2 Merge branch 'spectator-camera' into flash 2017-06-13 10:22:02 -07:00
Menithal
395cc55fb2 Fixed formatting 2017-06-13 20:20:54 +03:00
Menithal
020760cc97 21324: Fixed accidental inccorect bracket 2017-06-13 20:16:56 +03:00
Zach Fox
7d1a7f4c0b Merge branch 'master' of https://github.com/highfidelity/hifi into 
spectator-camera - INCLUDING MERGE CONFLICT FIXES
 2017-06-13 09:42:14 -07:00
Zach Pomerantz
89bd895054 mv showAudioTools to just AvatarInputs 2017-06-13 12:31:05 -04:00
Menithal
00701eb5c7 Merge remote-tracking branch 'origin/master' into 21324 2017-06-13 19:08:37 +03:00
Menithal
0edb763dac 21324: Formatting and PR Feedback Changes 2017-06-13 19:06:47 +03:00
Stephen Birarda
e68cf09b11 put back defaultAvatar_full.fst mode to 644 2017-06-13 07:19:41 -07:00
Stephen Birarda
6af35be286 change the packet version across the board for avatar mixer 2017-06-13 07:19:34 -07:00
Stephen Birarda
b2805d5f3b push packet version for default mannequin avatar 2017-06-13 07:19:27 -07:00
Stephen Birarda
df4358970e change default avatar to new baked mannequin 2017-06-13 07:19:16 -07:00
Sam Cake
f4ed635725 Fix bug in clearFramebuffer with Stencil Buffer 2017-06-12 22:59:42 -07:00
Brad Hefta-Gaub
cbff1910e2 Merge pull request #10660 from birarda/bug/fileOnUrl 
simplify fileOnUrl to only look for external textures right beside FBX
 2017-06-12 21:59:17 -07:00
Sam Cake
f973f7b5e3 Fix the background not rendering on the second frame, this was imply due to a bug in the GLBackend 2017-06-12 21:25:27 -07:00
Brad Davis
db8bdbc0a6 Merge pull request #10659 from samcake/orange 
simple Render Engine refactors coming from the Spectator Cam project
 2017-06-12 20:31:07 -07:00
Brad Hefta-Gaub
0a84a75bde Merge pull request #10650 from jherico/web_event_handlers 
Simplify eventBridge mechanism exposing functionality to web pages
 2017-06-12 19:23:01 -07:00
David Rowe
5eee2d8352 Code review 2017-06-13 12:39:46 +12:00
Seth Alves
aeaddd23c7 Merge pull request #10658 from seefo/fb5087 
Resolved FB5087
 2017-06-12 17:25:05 -07:00
Brad Davis
308e7295cc Merge pull request #10657 from jherico/tablet_deadlock 
Attempt to resolve Tablet scripting interface deadlocks
 2017-06-12 17:06:58 -07:00
howard-stearns
3d4f9be05b fix teleport vs stuck-in-floor work 2017-06-12 17:01:13 -07:00
Brad Hefta-Gaub
347742be1b Merge pull request #10601 from birarda/mannequin-avatar 
Update default avatar to baked mannequin
 2017-06-12 16:42:37 -07:00
Zach Pomerantz
7d3bf75f0b wip: sticky devices 2017-06-12 18:48:26 -04:00
Zach Pomerantz
b5dab39f83 sticky mic meter / noise reduction 2017-06-12 18:41:32 -04:00
Zach Pomerantz
8dac83d3fe add reverb to qml Audio 2017-06-12 18:11:08 -04:00
Zach Pomerantz
b37a0239b0 up to reverb (needs cherry-picking) 2017-06-12 18:00:52 -04:00
Bradley Austin Davis
1968ecbc8f Simplify eventBridge mechanism exposing functionality to web pages 2017-06-12 14:46:37 -07:00
Zach Pomerantz
858b980c16 add qml Separator 2017-06-12 15:18:16 -04:00
Chris Collins
123ed81e20 Merge pull request #10664 from zfox23/FB5260_PotentialFontCrash 
Potentially fix a crash in font loading
 2017-06-12 11:49:08 -07:00
Andrew Meadows
321e307c9f Merge pull request #10609 from 1P-Cusack/21317 
WL21317 helper functions for getting into avatar coordinate space
 2017-06-12 11:18:29 -07:00
seefo
cb5a114145 Fixed Ubuntu warning 2017-06-12 10:47:55 -07:00
Zach Fox
e96c55956f First pass at the fix 2017-06-12 09:53:14 -07:00
David Rowe
3e126c0517 Smoothly ease hands from uncontrolled to controlled positions 2017-06-12 17:14:13 +12:00