David Rowe
1f3045ad30
Merge branch 'master' into 21089
...
Conflicts:
interface/src/Application.cpp
2016-12-13 14:05:24 +13:00
Stephen Birarda
b4f43e01b1
Merge pull request #9189 from huffman/feat/help-touch
...
Add support for oculus touch in help menu
2016-12-12 16:48:00 -08:00
Ryan Huffman
7c441ac3ee
Remove advanced controls from oculus help image
2016-12-12 16:45:52 -08:00
howard-stearns
712543a39a
Merge branch 'master' of https://github.com/highfidelity/hifi into pal-proto
2016-12-12 16:37:41 -08:00
howard-stearns
4b5aae3c55
pal prototype
2016-12-12 16:37:16 -08:00
David Rowe
efb784f703
Code review
2016-12-13 13:11:21 +13:00
Seth Alves
6fe35ac0da
use smart pointers to avoid leaking EntityTreeElementExtraEncodeData
2016-12-12 16:04:41 -08:00
samcake
9155f11b3d
Merge pull request #9190 from jherico/test_mode
...
Add test mode to interface
2016-12-12 15:37:05 -08:00
Philip Rosedale
9370c8af6b
Added ability to rescale avatar
2016-12-12 15:26:53 -08:00
Chris Collins
4ce1bb3abc
Merge pull request #9172 from thoys/avatarFinderBeacon
...
avatarFinderBeacon.js -- Find other avatars more easily
2016-12-12 15:25:36 -08:00
Brad Davis
2a43f5fbef
Add test mode to interface
2016-12-12 14:51:11 -08:00
Ryan Huffman
3e5d67f28b
Update oculus help image to swap menu buttons
2016-12-12 14:23:29 -08:00
Ryan Huffman
47c2af975b
Remove extraneous logging from help.html
2016-12-12 14:22:59 -08:00
Zach Fox
7030c7b0a6
Space bubble improvements ( #9142 )
...
* The space bubble around a player's avatar is now visualized. When another avatar enters a player's bubble, The bubble visualization will appear, a soft tone will play, and the "Bubble" HUD button will flash.
* The space bubble radius setting has been removed. Space bubble size now scales based on avatar scale.
* Space bubble collision detection is now more accurate and reliable.
* CTRL + N toggles the bubble.
* The "Bubble" HUD button has been moved to the proper location.
2016-12-12 14:22:54 -08:00
Ryan Huffman
9f166d82ce
Add support for oculus touch in help menu
2016-12-12 13:44:09 -08:00
Clément Brisset
84bf93b0fc
Merge pull request #9154 from highfidelity/revert-9144-revert-9129-audio-dll
...
Restores "Select Audio DLL at runtime"
2016-12-12 13:38:34 -08:00
Stephen Birarda
dddb4c5412
Merge pull request #9175 from birarda/signup-from-interface
...
add account sign up to Interface
2016-12-12 13:21:21 -08:00
Stephen Birarda
5111256a9e
resize the sign up dialog when showing errors
2016-12-12 13:04:14 -08:00
David Kelly
3f3d922eca
No longer applying volume when reading audio injector buffer
...
Since we also apply the gain in HRTF (on both server and client), the
mono sources sort of had volume^2 applied to them.
2016-12-12 12:01:02 -08:00
Brad Hefta-Gaub
1b047d6901
fix cmake snafu
2016-12-12 11:39:10 -08:00
David Kelly
8719d36cd9
Merge pull request #9125 from kencooke/audio-ambisonics
...
First-order Ambisonic renderer
2016-12-12 11:36:12 -08:00
Stephen Birarda
a0663bdf31
fix resizing of LoginDialog and friends
2016-12-12 11:32:19 -08:00
Philip Rosedale
a142c830fa
Merge branch 'master' of git://github.com/highfidelity/hifi into rescale
2016-12-12 09:41:34 -08:00
Philip Rosedale
8572950a09
Both grip buttons enable rescale for a held object
2016-12-12 09:39:32 -08:00
Brad Hefta-Gaub
87e8b6bfeb
only consider standard poses written if the pose was valid
2016-12-12 09:23:01 -08:00
Brad Hefta-Gaub
b57c1fe198
remove debug spam
2016-12-12 08:48:24 -08:00
Brad Hefta-Gaub
d51b408c12
more work on hand tracking
2016-12-12 08:46:21 -08:00
David Rowe
8a399c7cc0
Fix model auto-scaling to 1% not being seen by observers take 2
2016-12-12 17:01:02 +13:00
David Rowe
14ecb24986
Remove extra browse history item created by Clara download
2016-12-11 17:43:55 +13:00
David Rowe
4f0c429e7f
Fix model auto-scaling to 1% not being seen by observers
2016-12-11 17:08:36 +13:00
samcake
06b7388930
Merge pull request #9182 from fayeli/photobooth
...
Photobooth Improvements - Stage, Camera Angles, and Lights
2016-12-10 20:04:40 -08:00
Faye Li Si Fi
78c96293a7
Staging cameras, lights, and backdrop
2016-12-09 17:25:18 -08:00
Faye Li Si Fi
c078751946
Merge remote-tracking branch 'refs/remotes/highfidelity/master' into photobooth
2016-12-09 17:23:54 -08:00
Stephen Birarda
e4810a5643
Merge pull request #9179 from Atlante45/controller-mapping
...
Update Xbox controller mapping to have the menu on Start
2016-12-09 17:13:45 -08:00
Ken Cooke
a4cbf6be8a
Fix to preserve localOnly from script when not ambisonic
2016-12-09 16:55:53 -08:00
Stephen Birarda
691ce4312e
fix resizing for keyboard changes in body loaded qml
2016-12-09 16:49:53 -08:00
Atlante45
5def039bd4
Swap start/back xbox controller mapping to conform to Oculus standard
2016-12-09 16:41:42 -08:00
Stephen Birarda
f0f10d837c
fix indents, fix resize for keyboard changes
2016-12-09 16:04:42 -08:00
Chris Collins
c912d77a95
Merge pull request #9167 from Atlante45/feat/oculus-reorient-quit
...
Honor reorient and quit request from OVR
2016-12-09 16:03:41 -08:00
David Rowe
c87149cfc2
Tidying
2016-12-10 12:59:01 +13:00
Thijs Wenker
3ec06b1a6e
Remove redundant parentheses
2016-12-10 00:21:20 +01:00
David Rowe
a52d8d1982
Merge branch 'master' into 21089
2016-12-10 11:47:43 +13:00
Seth Alves
dd3f3957a9
Merge pull request #9164 from fayeli/last-edited-property
...
Exposing last edited property of Entity to Javascript
2016-12-09 13:13:11 -08:00
Faye Li Si Fi
b3ac62bb56
Merge remote-tracking branch 'refs/remotes/highfidelity/master' into last-edited-property
2016-12-09 12:44:17 -08:00
Thijs Wenker
4d467deb5e
Fix if statement to match style rule 4.2.8
2016-12-09 21:26:59 +01:00
samcake
7f73f61e25
Merge pull request #9174 from fayeli/photobooth
...
Photobooth MVP - Dev tool for taking standardized product pictures
2016-12-09 11:01:51 -08:00
Stephen Birarda
89016f4f15
Merge pull request #9171 from Atlante45/updater
...
No updater command line argument
2016-12-09 10:56:29 -08:00
Chris Collins
ec4edf5030
Merge pull request #9130 from zzmp/feat/audio-threading
...
Threaded Audio
2016-12-09 10:46:54 -08:00
Thijs Wenker
3f9aa00fd6
Increased show-radius to 20 meters
2016-12-09 19:39:48 +01:00
Brad Davis
3f9ffd1f9c
Merge pull request #9177 from samcake/blue
...
Fix the missing lighting on AMD
2016-12-09 09:28:31 -08:00
