Commit graph

56031 commits

Author SHA1 Message Date
David Rowe
05f19d54f4 Add HMD roll control JavaScript API 2017-06-14 11:55:04 +12:00
Zach Fox
37e72f25a3 Make the PAL's tab background color white 2017-06-13 16:04:14 -07:00
David Rowe
570ec8457d Refactor 2017-06-14 10:45:30 +12:00
Anthony J. Thibault
03a6f7082e Merge branch 'master' into feature/pole-vector 2017-06-13 15:37:59 -07:00
Brad Hefta-Gaub
88929c7bd7 Merge pull request #10679 from zzmp/audio/check-timer
start device check timer
2017-06-13 15:37:50 -07:00
Anthony J. Thibault
f20c03fa6e Pole vectors can be controlled via anim vars. 2017-06-13 15:36:05 -07:00
Zach Fox
79b6dc3f78 Remove one more instance of FramebufferCache 2017-06-13 15:26:07 -07:00
Zach Fox
52ea7e7994 Rendering improvements based on spectator-camera changes 2017-06-13 15:19:29 -07:00
Zach Pomerantz
b24681125d rm debugging 2017-06-13 18:16:16 -04:00
Zach Pomerantz
9017738a8d start device check timer 2017-06-13 18:00:41 -04:00
Zach Pomerantz
0e2976620d start device check timer 2017-06-13 18:00:09 -04:00
Zach Pomerantz
607379980e update plugin api 2017-06-13 17:59:46 -04:00
Zach Pomerantz
d4797dc9f8 update shift-x 2017-06-13 17:44:59 -04:00
Zach Pomerantz
a8f69bb2e0 Merge branch 'master' of github.com:highfidelity/hifi into audio/parity 2017-06-13 17:41:52 -04:00
Zach Pomerantz
e7da007acd only show Audio menu title when appropriate 2017-06-13 17:13:39 -04:00
Brad Hefta-Gaub
ae81738f1f Merge pull request #10675 from jherico/vive_audio
Add support for querying the desired output audio device for OpenVR
2017-06-13 13:25:58 -07:00
Zach Pomerantz
20c0dac8e8 update QML with Audio.muted 2017-06-13 16:10:16 -04: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
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
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 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
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
Anthony J. Thibault
7521d6124e WIP: added blend between hips and foot for knee pole vector 2017-06-12 17:23:23 -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