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

18082 commits

Author SHA1 Message Date
Anthony J. Thibault
79d9bbe6c5 Merge branch 'master' into feature/pole-vector 2017-06-22 13:37:55 -07:00
samcake
96a10d2e95 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2017-06-22 09:32:49 -07:00
David Kelly
34edd95926 Merge pull request #10776 from davidkelly/dk/avatarUrlSwitch 
new switches to override avatarURL
 2017-06-22 07:11:29 -07:00
David Kelly
5da01f0074 updated comments 2017-06-22 07:09:24 -07:00
David Rowe
6ff8aed5e3 Merge branch 'master' into 21396 2017-06-22 23:54:15 +12:00
David Rowe
c54a5d8506 Tidying 2017-06-22 23:32:16 +12:00
David Rowe
3bdf267900 Implement fingers control 2017-06-22 23:32:06 +12:00
samcake
9ae2861ee6 Moving the stage objects under the scene umbrella and creating a cear task to update the scene elements 2017-06-21 18:29:38 -07:00
Seth Alves
c70365d04a Merge pull request #10729 from druiz17/hand-pucks 
Hand pucks and Calibration UI
 2017-06-21 18:10:15 -07:00
samcake
2919607f86 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2017-06-21 17:20:44 -07:00
Howard Stearns
ea5b074f6e Merge pull request #10758 from howard-stearns/event-installer-interface-options 
Event installer interface options
 2017-06-21 16:46:06 -07:00
David Kelly
92cbb86e8b remove debugging 2017-06-21 16:09:08 -07:00
David Kelly
94a33fea94 new switches to override avatarURL 2017-06-21 16:03:05 -07:00
Anthony J. Thibault
2dcca2125b Merge branch 'master' into feature/pole-vector 2017-06-21 15:50:03 -07:00
Chris Collins
f3ae1d8078 Merge pull request #10750 from Atlante45/master 
Stable -> Master
 2017-06-21 13:34:28 -07:00
samcake
56d5f4ec5c Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2017-06-21 11:25:07 -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
David Kelly
f30b12fca6 still doesn't work, pushing just to save it 2017-06-21 10:28:18 -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
Thijs Wenker
47643e1efe Expose location API to Agent scripts (side-effect, agents now can teleport) 2017-06-21 06:31:36 +02: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
5e82b13d65 removed double include 2017-06-21 01:15:17 +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
Atlante45
6bd1946e96 Merge branch 'stable' of https://github.com/highfidelity/hifi 2017-06-20 16:36:57 -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
David Kelly
06b59fe13e still broken, but added initial cut of GLsync stuff 2017-06-20 15:02:05 -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
Zach Pomerantz
f55d842fac add SoundCache to tablet for PlaySampleSound 2017-06-20 12:16:08 -07:00
Matti Lahtinen
256484cd21 Removed Whitespace 2017-06-20 21:44:32 +03:00
Zach Pomerantz
8436d0cc6b rm unused AvatarInputs props 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
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
howard-stearns
d71666f337 Remove useless command line arg for steam, but add one for version. 2017-06-20 09:59:15 -07:00
howard-stearns
974768390c Merge branch 'master' of https://github.com/highfidelity/hifi into event-installer-interface-options 2017-06-20 09:47:52 -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
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
Zach Pomerantz
4bff925506 rm unused bools 2017-06-19 17:01:39 -07:00
Anthony J. Thibault
c236afe68c Simplify passing data from MySkeletonModel to Rig 2017-06-19 16:54:39 -07:00
Zach Pomerantz
3d80774317 clean up select_audio_device 2017-06-19 15:57:24 -07:00
samcake
653ce89e08 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2017-06-19 15:48:46 -07:00
Zach Pomerantz
837f37220a log selected_audio_device 2017-06-19 15:11:02 -07:00
Zach Pomerantz
5f236bd025 simplify device settings 2017-06-19 15:11:02 -07:00
Zach Pomerantz
5c0e9e7496 improve wording for MyAvatar.qmlPosition doc 2017-06-19 14:52:32 -07:00
David Kelly
b4c75c3f87 working, except tablet issue 2017-06-19 14:41:42 -07:00
Zach Pomerantz
a7e1b75909 stopgap with MyAvatar.qmlPosition 2017-06-19 14:41:01 -07:00
howard-stearns
91656a5fe5 Merge branch 'master' of https://github.com/highfidelity/hifi into event-installer-interface-options 2017-06-19 14:22:12 -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
Brad Davis
ed6620fc51 Merge pull request #10718 from jherico/frame_thread 
Cleanup and refactoring
 2017-06-19 13:31:44 -07:00
howard-stearns
c6d66d439b report and quit command line switches 2017-06-19 12:57:26 -07:00
Matti Lahtinen
82df64d5e7 flyingAllowed to zoneAllowsFlying 2017-06-19 21:44:43 +03:00
Seth Alves
39fb94d76d fix bug that causes hmd avatar eyes to be all the way to the side when there's not another avatar to look at 2017-06-19 11:21:08 -07:00
Zach Fox
08eb07242d Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera 2017-06-19 10:31:31 -07:00
samcake
ebc4745df0 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2017-06-19 09:27:35 -07:00
Vladyslav Stelmakhovskyi
59a77c16bd Cleanup 2017-06-18 20:59:22 +02:00
Matti Lahtinen
600a39c9b2 Fixed Zone overriding Client. 2017-06-18 13:14:01 +03:00
Vladyslav Stelmakhovskyi
f34faa3ee7 Fix backward compatibility with Qt 5.6 2017-06-18 10:54:59 +02:00
Vladyslav Stelmakhovskyi
a1475bc65f Forgot if statement 2017-06-17 23:02:52 +02:00
Vladyslav Stelmakhovskyi
b8bb8026ca Merge branch 'master' into fix_tablet_buttons_qt59 2017-06-17 22:30:00 +02:00
Vladyslav Stelmakhovskyi
5a0783c38c Send mouse events before touch event. It seems the order is important for Qt 5.9 2017-06-17 22:24:27 +02:00
David Kelly
c7e4649ec2 add override to avoid warnings in ubuntu/mac 2017-06-17 13:15:22 -07:00
Brad Davis
a69cf31f4b PR feedback and cmake fixes 2017-06-16 16:59:58 -07:00
Dante Ruiz
da29157a3c fixed merge conflict' 2017-06-17 00:40:50 +01:00
David Kelly
6dd1e6e069 Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into dk/spectatorCameraPreview 2017-06-16 16:24:30 -07:00
Zach Fox
7a76c9cf7f Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera 2017-06-16 14:59:23 -07:00
Zach Fox
416ebaa2e8 Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera 2017-06-16 10:08:10 -07:00
David Kelly
9b5b99c2b9 not as buggy. Still need ogl work, major cleanup, etc... 2017-06-16 08:59:57 -07:00
David Kelly
6d64261e94 working but often the spectator camera texture is not right. 2017-06-16 08:40:18 -07:00
Brad Davis
fece438602 Cleanup and refactoring 2017-06-15 18:58:56 -07:00
David Kelly
f75cbfa087 Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into dk/spectatorCameraPreview 2017-06-15 15:45:03 -07:00
David Kelly
3d922f5db6 works, sorta, but blinks like crazy, cursor gets f-ed up... 2017-06-15 14:17:43 -07:00
Zach Pomerantz
3093a73ce1 Merge branch 'master' of github.com:highfidelity/hifi into audio/parity 2017-06-15 15:04:06 -04:00
Zach Fox
47e5fb56d3 Show MyAvatar's head in the SpectatorCamera view! 2017-06-15 11:31:20 -07:00
Zach Fox
60549075dd Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera 2017-06-15 10:09:07 -07:00
ZappoMan
d352163d77 fix no audio device from previously removed audio device 2017-06-15 09:24:14 -07:00
Brad Hefta-Gaub
035a9e898f Merge pull request #10684 from howard-stearns/avatar-whitelist 
avatar whitelist
 2017-06-15 08:45:16 -07:00
Dante Ruiz
d65c0dfbac Merge branch 'master' of github.com:highfidelity/hifi into controller-ui 2017-06-15 16:24:59 +01:00
druiz17
347f020b04 Merge pull request #10692 from jherico/fix_tablet_crash 
Fix crash on exit when tablet is open
 2017-06-15 08:15:02 -07:00
NeetBhagat
a6b1b17d45 Merge branch 'master' into 21369 2017-06-15 11:04:22 +05:30
David Rowe
a8501a7ac6 Remove old Leap Motion code 2017-06-15 14:45:40 +12:00
samcake
d8380923f0 Introducing the SCeneUpdtate job to the engine to take care of performing transactions and introducing the stages 2017-06-14 18:06:42 -07:00
David Kelly
54dfc33b38 initial skeleton of qml objects 2017-06-14 14:36:37 -07:00
David Rowe
16bebdd409 Rename identifiers 2017-06-15 09:20:55 +12:00
David Rowe
55e0082792 Code review 2017-06-15 09:10:08 +12:00
Brad Davis
7a6df850c5 Fix crash on exit when tablet is open 2017-06-14 13:22:53 -07:00
Menithal
112f186304 Added minor Comments 2017-06-14 22:24:18 +03:00
Zach Fox
8a217acd2b Defaults for camera projection parameters 2017-06-14 12:19:38 -07:00
Zach Fox
03c61e2191 vFoV and clipping plane distances now come from config 2017-06-14 11:53:05 -07:00
Zach Fox
ec3b488897 Remove SECONDARY_CAMERA_RENDER_MODE for now 2017-06-14 10:27:08 -07:00
Menithal
a1c2f71f30 Added couple of state getters 
This allow scripts to check if avatar is flying or if the avatar is in
air (but not flying). Both of these allows one to distinguish if the
avatar is flying or falling or just jumping with Velocity
 2017-06-14 20:19:04 +03:00
Menithal
66d43b80e2 Added getters for State if in Air or Flying 2017-06-14 19:53:08 +03:00
Menithal
c92e22fd20 21384: Added Menu Option 2017-06-14 19:05:00 +03:00
Menithal
53fe5736d8 21384: Initial Disable Flying 2017-06-14 18:24:45 +03:00
Zach Pomerantz
969582c23d clean audio device names 2017-06-14 09:04:22 -04:00
Howard Stearns
87f3ce7699 reset avatar on domain change if the last domain imposed something on us 2017-06-13 19:30:01 -07:00
David Rowe
be2bcb1c13 Turn with head roll in HMD when walking or flying 2017-06-14 12:20:46 +12:00
David Rowe
05f19d54f4 Add HMD roll control JavaScript API 2017-06-14 11:55:04 +12:00
Zach Pomerantz
b24681125d rm debugging 2017-06-13 18:16:16 -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
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
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
NeetBhagat
9646eba873 Complete console.trace and added a testcases for all 13 functions. 2017-06-13 23:52:48 +05:30
Zach Fox
4acbb81413 Checkpoint 2017-06-13 10:22:48 -07:00
Zach Fox
ec162327a2 Merge branch 'spectator-camera' into flash 2017-06-13 10:22:02 -07: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
NeetBhagat
b0e9c62c12 Merge branch 'master' of https://github.com/highfidelity/hifi into 21369 2017-06-13 10:10:44 +05:30
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
Seth Alves
aeaddd23c7 Merge pull request #10658 from seefo/fb5087 
Resolved FB5087
 2017-06-12 17:25:05 -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
Dante Ruiz
e4e261287a Merge branch 'master' of github.com:highfidelity/hifi into controller-ui 2017-06-12 22:01:57 +01: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
Dante Ruiz
1b13cd6d45 saving work 2017-06-12 17:31:02 +01:00
Dante Ruiz
067fc9bb98 fixed merge conflict 2017-06-12 16:45:34 +01:00
NeetBhagat
e6a5930365 Merge branch 'master' into 21369 2017-06-12 11:17:26 +05:30
Chris Collins
4b6c13bc1f Merge pull request #10646 from ZappoMan/debugAudioProblems 
Fix for no-audio on clean install
 2017-06-10 11:32:42 -10:00
samcake
bb38938534 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2017-06-09 14:34:25 -07:00
ZappoMan
6fe20f90a3 add better debugging for audio problems 
use OS default device if settings have no values
 2017-06-09 13:36:12 -07:00
seefo
0343d4e443 Resolved FB5087 2017-06-09 13:33:46 -07:00
Seth Alves
3f425a5f02 Merge pull request #10649 from sethalves/fix-head-puck-broken-eyes 
Fix head puck broken eyes
 2017-06-09 12:50:53 -07:00
Zach Fox
fd50434d86 New camera model; Cleanup; Bashing head :against desk 2017-06-09 11:42:16 -07:00
Zach Fox
5114fd8e1f Rename correctly? 2017-06-09 11:39:28 -07:00
Zach Fox
7aef4dab4c Variable renaming pass 2017-06-09 11:39:28 -07:00
Zach Fox
a4f5d327a2 Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera 2017-06-09 11:38:35 -07:00
Zach Fox
12e5fc20f7 Merge pull request #10653 from samcake/flash 
Spectator-camera : Provide a way to render the side camera always mono
 2017-06-09 11:34:37 -07:00
Seth Alves
5b62c9e83b try again to get forward not-looking-at-anyone gaze to work right 2017-06-09 10:45:04 -07:00
seefo
dc02e34782 Resolved FB#5009 2017-06-09 10:23:53 -07:00
Seth Alves
197fb620d4 Merge branch 'master' of github.com:highfidelity/hifi into fix-head-puck-broken-eyes 2017-06-09 09:28:07 -07:00
Chris Howe
08d93173f0 Minor code feedback changes, moving test scripts to developer/tests. 2017-06-09 11:07:56 -04:00
NeetBhagat
c5d8268007 Merge branch 'master' of https://github.com/highfidelity/hifi into 21369 2017-06-09 18:04:34 +05:30
samcake
4c8eec4e16 Introducing a way to prevent a frame to render in stereo accross batches 2017-06-08 17:38:26 -07:00
Seth Alves
485df396ef Merge pull request #10628 from jherico/qt59 
Fixes for Qt 5.9 compatibility
 2017-06-08 16:51:08 -07:00
Seth Alves
ce4c3e1601 fix bug that causes hmd avatar eyes to be all the way to the side when there's not another avatar to look at 2017-06-08 13:55:30 -07:00
Seth Alves
3b47142592 fix bug that causes hmd avatar eyes to be all the way to the side when there's not another avatar to look at 2017-06-08 10:28:38 -07:00
samcake
3664655512 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2017-06-07 17:43:50 -07:00
howard-stearns
9cf027a68c pr feedback 2017-06-07 16:44:13 -07:00
howard-stearns
fa74daf875 Merge branch 'master' of https://github.com/highfidelity/hifi into do-not-get-stuck-in-floor 2017-06-07 16:43:25 -07:00
howard-stearns
51982b1294 display textures in plugins 2017-06-07 14:39:18 -07:00
Seth Alves
69520ff3db pull from upstream, code review 2017-06-07 10:28:02 -07:00
Seth Alves
b1c7c251ac Merge branch 'master' of github.com:highfidelity/hifi into head-controller 2017-06-07 10:09:46 -07:00
Zach Fox
d1719fade6 Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera 2017-06-07 09:46:04 -07:00
NeetBhagat
ead0d42cf3 Merge branch 'master' into 21369 
# Conflicts:
#	libraries/gl/src/gl/OffscreenQmlSurface.cpp
#	libraries/gl/src/gl/OffscreenQmlSurface.h
 2017-06-07 15:47:19 +05:30
NeetBhagat
904e25c9e3 intial commit #21369 Working on clear method of console 2017-06-07 14:37:18 +05:30
Brad Hefta-Gaub
e5ac3eeea7 Merge pull request #10548 from NeetBhagat/21255 
On Oculus Rift on/off, switch automatically to/from desktop mode
 2017-06-06 18:05:56 -07:00
samcake
bac66ee4c7 Introducing the renderview task 2017-06-06 18:00:41 -07:00
David Kelly
06527ac0a2 Merge pull request #10611 from davidkelly/dk/4873 
protect _text member of Text3DOverlay with mutex
 2017-06-06 16:50:57 -07:00
Bradley Austin Davis
fc6a278217 Fixing dangling thread issues, consolidating thread management 2017-06-06 15:02:16 -07:00
Brad Davis
171d3212fe Merge pull request #10623 from jherico/qml_engine_singleton 
Migrate to single QML engine
 2017-06-06 15:00:43 -07:00
Zach Pomerantz
d416464b62 add Audio to tablet context 2017-06-06 17:55:19 -04:00
Zach Pomerantz
67288528da add Audio.context 2017-06-06 17:55:06 -04:00
Zach Pomerantz
2b99f299c8 testing 2017-06-06 17:54:52 -04:00
Dante Ruiz
8d6e4bf28c Merge branch 'master' of github.com:highfidelity/hifi into controller-ui 2017-06-06 21:09:19 +01:00
Stephen Birarda
0ccd0d3fd6 Merge pull request #10621 from highfidelity/stable 
Merge Stable back into Master
 2017-06-06 10:39:03 -07:00
NeetBhagat
c3621d7c32 Resolved two issues: 
1) While in HMD mode -> open Tablet -> Click Desktop.  Desktop mode will be on.
2) Menu sync problem while switching modes.
 2017-06-06 22:31:14 +05:30
Chris Howe
8166fec0e0 Minor changes based on code review feedback 
See https://worklist.net/21317,
https://github.com/highfidelity/hifi/pull/10609 and
https://github.com/highfidelity/hifi/pull/10609#pullrequestreview-42090197
 2017-06-06 12:11:57 -04:00
Dante Ruiz
038ffe920a fixing merge conflicts 2017-06-06 16:42:08 +01:00
NeetBhagat
ae9a928740 Merge branch 'master' into 21255 
# Conflicts:
#	interface/src/Application.cpp
 2017-06-06 19:06:50 +05:30
NeetBhagat
e79fd9c5cb Merge branch 'master' into 21369 2017-06-06 15:26:40 +05:30
NeetBhagat
0f9cd5d0c7 intial commit hifi: #21369 Implement parts of the JS "console" object 2017-06-06 15:20:08 +05:30
Howard Stearns
3de243b093 Include the radius of the sphere at the avatar's feet. 2017-06-05 18:48:11 -07:00
Seth Alves
20c9228050 Merge branch 'head-controller' of github.com:sethalves/hifi into head-controller 2017-06-05 15:53:23 -07:00
Seth Alves
7a276f027f fix orientation used for 3d audio 2017-06-05 15:53:01 -07:00
Bradley Austin Davis
995fe11c05 Migrate to single QML engine 2017-06-05 15:14:44 -07:00
Brad Hefta-Gaub
51e00b9de9 Merge pull request #10614 from samcake/brown 
Introduce a stencil mask pass in the rendering to optimize HMD
 2017-06-05 14:14:11 -07:00
Zach Pomerantz
d8815d1dce prep audio menu 2017-06-05 16:24:00 -04:00
Zach Pomerantz
7cb38d22c3 fix AudioBuffers to work in tablet 2017-06-05 15:06:47 -04:00
Zach Pomerantz
9395de1873 add nop notify signals to Audio(Devices) 2017-06-05 14:57:44 -04:00
Seth Alves
3ab67cf27e fix forward gaze in HMD while not looking at anyone 2017-06-05 11:44:27 -07:00
howard-stearns
4ccfef9702 Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into spectator-camera-prototype 2017-06-05 11:18:40 -07:00
Zach Fox
87fca16e0d Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera 2017-06-05 10:48:12 -07:00
Chris Collins
6cc6cd3bf6 Merge pull request #10604 from highfidelity/RC-42 
Beta Release 42 - Includes up to Developer Release 6626
 2017-06-05 09:13:19 -07:00
Seth Alves
27669d44a7 in deriveBodyFromHMDSensor, avoid using invalid head pose 2017-06-05 08:58:40 -07:00
Howard Stearns
ca526e0776 git rid of a lambda 2017-06-05 07:11:25 -07:00
Howard Stearns
05f41fb4f8 cleanup 2017-06-04 08:13:12 -07:00
Howard Stearns
a0ea306aed cleanup, and include missing allowBackface parameter 2017-06-04 07:55:23 -07:00
Howard Stearns
fd01258c76 cleanup 2017-06-03 16:02:58 -07:00
Howard Stearns
02c46080f7 we don't need to force, but we do need some extra room for confined spaces 2017-06-03 15:43:14 -07:00
Howard Stearns
c48b729527 Merge branch 'master' of https://github.com/highfidelity/hifi into do-not-get-stuck-in-floor 2017-06-02 18:05:20 -07:00
Ryan Huffman
52c60b35df Add startup_sent_to user activity event 2017-06-02 17:57:40 -07:00
Seth Alves
1b719ee654 Merge branch 'master' of github.com:highfidelity/hifi into head-controller 2017-06-02 16:31:23 -07:00
Dante Ruiz
f0f10f74c6 inpput configutration stub 2017-06-03 00:30:00 +01:00
manapa01
8e1577d3d3 Merge pull request #10596 from manapa01/Snapshot-Sound 
Snapshot sound
 2017-06-02 16:07:05 -07:00
David Kelly
12cbc206d2 cr feedback 2017-06-02 15:59:15 -07:00
Clément Brisset
c636922a5d Merge pull request #10590 from huffman/fix/running-marker 
Update server-console to watch interface via pid rather than marker
 2017-06-02 15:57:44 -07:00
David Kelly
9b34abeb40 oops initializer order... 2017-06-02 15:43:29 -07:00
Seth Alves
3359a0a794 work on fixing some head to eye offsets. MyHead::getHmdOrientation to MyHead::getHeadOrientation 2017-06-02 15:29:20 -07:00