Commit graph

48917 commits

Author SHA1 Message Date
Atlante45
588fdd6efa Add steamworks to interface externals 2016-12-14 16:07:33 -08:00
Atlante45
bfc789f072 CR - CLI text 2016-12-14 15:44:00 -08:00
Atlante45
0dec97fc03 Make Steamworks a plugin 2016-12-14 15:37:49 -08:00
Stephen Birarda
1829f540cf Merge pull request #9206 from Atlante45/controller-mapping
Fix Oculus Touch flags check
2016-12-14 11:17:03 -08:00
Clément Brisset
1aec8c5a65 Merge pull request #9205 from ZappoMan/avatarMixerTweaks
drop avatar data rate to 45hz & bump default per client bandwidth from mixer
2016-12-13 18:25:35 -08:00
Atlante45
07802eb284 Fix Oculus Touch flags check 2016-12-13 17:08:00 -08:00
Brad Hefta-Gaub
92632e72b6 make default avatar mixer send bandwidth 5mbps 2016-12-13 17:04:25 -08:00
Brad Hefta-Gaub
e3bc49c302 drop avatar data rate to 45hz 2016-12-13 16:51:59 -08:00
Brad Hefta-Gaub
a2ba03284e Merge pull request #9186 from ZappoMan/kinectPlugin
Kinect Plugin
2016-12-13 15:29:41 -08:00
David Kelly
97a5c0ef4b Merge pull request #9200 from zfox23/fix_bubble_audio_bug
Fix audio injector bug after space bubble changes
2016-12-13 14:23:01 -08:00
Zach Fox
2c97d7f9c2 Merge pull request #9199 from jazmincano/jazmin_bubble_improvements
Bubble visualization improvements
2016-12-13 13:21:11 -08:00
Zach Fox
44c6eb303b Fix the bug 2016-12-13 12:46:31 -08:00
Jazmin
b7b4c685e7 Fixed typo 2016-12-13 11:48:06 -08:00
Jazmin
4effdd0394 Update Bubble model in script 2016-12-13 11:46:40 -08:00
Jazmin
0a031e204e Delete old bubble model 2016-12-13 11:46:22 -08:00
Jazmin
efc9f6549b Add new bubble model 2016-12-13 11:45:50 -08:00
Jazmin
d9fbde2f66 Update bubble height
This height allows my friends to stay in my view comfortably, even when the space bubble is on.  Even though it's significantly lower, I don't think anyone is not going to look down when someone starts to shrink down in front of them.
2016-12-13 11:43:09 -08:00
Seth Alves
f905acf010 Merge pull request #9143 from huffman/fix/bow
Add marketplace bow to repo, plus a few fixes
2016-12-13 07:06:27 -08:00
Clément Brisset
050c0fe14a Merge pull request #9188 from kencooke/audio-wav-parser
Fix and improve the WAV file loader
2016-12-12 17:51:20 -08:00
Brad Hefta-Gaub
1d07711937 CR feedback 2016-12-12 17:36:01 -08:00
Brad Hefta-Gaub
37a4253d20 Merge pull request #9192 from sethalves/es-leak
use smart pointers to avoid leaking EntityTreeElementExtraEncodeData
2016-12-12 17:16:00 -08: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
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
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
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
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
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
Thijs Wenker
3ec06b1a6e Remove redundant parentheses 2016-12-10 00:21:20 +01:00