Commit graph

56025 commits

Author SHA1 Message Date
Zach Fox
70569021a8 Merge pull request #10697 from zfox23/spectatorCamera_HMDOnly
Make the Spectator button only appear in HMD (also add a debug mode for devs)
2017-06-15 13:20:56 -07:00
Zach Fox
68662bb209 Bugfixes 2017-06-15 10:20:17 -07:00
Zach Fox
a795822919 Comments and disable camera when switching 2017-06-15 10:09:28 -07:00
Zach Fox
498ed4cbe8 showSpectatorInDesktop true for now 2017-06-15 10:09:28 -07:00
Zach Fox
0114962e75 Make the Spectator button only appear in HMD (with debug mode) 2017-06-15 10:09:28 -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
Brad Hefta-Gaub
035a9e898f Merge pull request #10684 from howard-stearns/avatar-whitelist
avatar whitelist
2017-06-15 08:45:16 -07: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
Brad Hefta-Gaub
c807827a36 Merge pull request #10693 from seefo/master
Incomplete sandbox content updates are now removed and reperformed
2017-06-14 19:32:01 -07:00
Andrew Meadows
9c928f16b2 Merge pull request #10632 from Atlante45/fix/node-leak
Fix SharedNodePointer leak
2017-06-14 17:03:52 -07:00
Andrew Meadows
becb968a75 Merge pull request #10685 from ctrlaltdavid/21327-b
Use HMD roll angle to turn while flying or walking in HMD
2017-06-14 16:56:29 -07:00
seefo
9fa21fc79f Incomplete sandbox content updates are now removed and reperformed 2017-06-14 14:45:25 -07:00
Zach Fox
f214712b33 Merge pull request #10678 from zfox23/spectatorCamera_improvements1
Secondary camera and rendering improvements
2017-06-14 14:39:38 -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
Zach Fox
6b6b6026a4 Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera 2017-06-14 13:44:13 -07:00
Brad Davis
7a6df850c5 Fix crash on exit when tablet is open 2017-06-14 13:22:53 -07:00
Zach Fox
8a217acd2b Defaults for camera projection parameters 2017-06-14 12:19:38 -07:00
howard-stearns
665870b846 comment per cr 2017-06-14 12:06:29 -07:00
howard-stearns
2deb26551f typos in comments/help-strings 2017-06-14 11:56:47 -07:00
Zach Fox
03c61e2191 vFoV and clipping plane distances now come from config 2017-06-14 11:53:05 -07:00
Atlante45
5777b5e805 Create one packet per node 2017-06-14 11:42:25 -07:00
Atlante45
3cc2396021 CR 2017-06-14 11:42:25 -07:00
Atlante45
a15660993d Fix comment 2017-06-14 11:42:25 -07:00
Atlante45
61eb93af35 Fix SharedNodePointer leak 2017-06-14 11:42:25 -07:00
howard-stearns
b3091de536 forgot proper initial value of flag after changing whitelist to be actual
list
2017-06-14 11:16:55 -07:00
Stephen Birarda
1baff8af33 Merge pull request #10686 from seefo/fb4958
Resolved FB4958
2017-06-14 11:14:37 -07:00
Zach Fox
ec3b488897 Remove SECONDARY_CAMERA_RENDER_MODE for now 2017-06-14 10:27:08 -07:00
Howard Stearns
15a5464bab Merge pull request #10682 from zfox23/PAL_fixTabBackgroundColor
Make the PAL's tab background color white
2017-06-13 20:50:13 -07:00
David Rowe
e3b4e4aa20 Disable print statements 2017-06-14 15:37:36 +12: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
seefo
74066647c6 Resolved FB4958 2017-06-13 18:01:53 -07:00
David Rowe
395d40f0f9 Fix script default to match C++ default 2017-06-14 12:21:19 +12:00
David Rowe
be2bcb1c13 Turn with head roll in HMD when walking or flying 2017-06-14 12:20:46 +12:00
Zach Fox
bae27ec209 Merge pull request #10680 from zfox23/ZachRenderingImprovements1
Small rendering improvements based on spectator-camera changes
2017-06-13 17:18:43 -07:00
howard-stearns
6271b8ee7c avatar whitelist 2017-06-13 16:56:18 -07:00
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
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
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
9017738a8d start device check timer 2017-06-13 18:00:41 -04:00
Zach Fox
0d86d4f0cb It's working! 2017-06-13 14:30:32 -07: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 Fox
8962c7bf6a Viewfinder re-flip, add comments regarding why it's necessary 2017-06-13 13:06:03 -07:00
Anthony Thibault
0d46b78bff Merge pull request #10541 from Menithal/21324
Reworked Particle Editor UI
2017-06-13 13:00:54 -07: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
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