Howard Stearns
ba8b585368
Merge pull request #9202 from howard-stearns/pal-proto
...
People Action List prototype
2016-12-15 13:56:12 -08:00
Seth Alves
26639aac15
Merge pull request #8789 from Atlante45/fix/settings
...
Use JSON for application Settings
2016-12-15 07:00:46 -08:00
howard-stearns
ae4064f445
Merge branch 'master' of https://github.com/highfidelity/hifi into pal-proto
2016-12-14 17:04:52 -08:00
howard-stearns
4503855ae8
don't keep selection while things are disappearing
2016-12-13 17:00:24 -08:00
howard-stearns
a50b731faa
fix broken search for myself
2016-12-13 16:52:18 -08:00
Brad Hefta-Gaub
e3bc49c302
drop avatar data rate to 45hz
2016-12-13 16:51:59 -08:00
howard-stearns
773bbc4ef1
update canKick whenever we get new data, instead of just at first use.
2016-12-13 16:30:16 -08:00
howard-stearns
00653b6b19
missing the ban button
2016-12-13 16:23:43 -08:00
howard-stearns
03d3e0b550
Merge branch 'master' of https://github.com/highfidelity/hifi into pal-proto
2016-12-13 16:03:00 -08:00
Brad Hefta-Gaub
a2ba03284e
Merge pull request #9186 from ZappoMan/kinectPlugin
...
Kinect Plugin
2016-12-13 15:29:41 -08:00
howard-stearns
b0a69468d2
Don't show admin columns if you can't kick.
2016-12-13 15:16:18 -08:00
howard-stearns
adbfa0752a
no debug printing
2016-12-13 15:09:46 -08:00
howard-stearns
c9827d1521
checkpoint
2016-12-13 15:05:08 -08:00
howard-stearns
86010af828
checkpoint
2016-12-13 13:01:45 -08:00
howard-stearns
6fc27ac8d6
Merge branch 'master' of https://github.com/highfidelity/hifi into pal-proto
2016-12-13 09:39:51 -08:00
Howard Stearns
7c92ad5ced
checkpoint
2016-12-13 09:15:28 -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
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
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
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
Stephen Birarda
a0663bdf31
fix resizing of LoginDialog and friends
2016-12-12 11:32:19 -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
Brad Hefta-Gaub
4959a88581
first cut at kinect input plugin
2016-12-08 22:13:56 -08:00
Stephen Birarda
673e03aae4
add a spinner to sign up
2016-12-08 17:29:29 -08:00
Stephen Birarda
370de667d5
add a spinner to the login dialog
2016-12-08 17:23:39 -08:00
Stephen Birarda
396c2bc28f
add error for login after signup, fix link style
2016-12-08 17:00:47 -08:00
Stephen Birarda
9445fc2898
fix for display of multiple sign up errors
2016-12-08 16:28:16 -08:00
Stephen Birarda
b66ddbdbdb
add email field, error handling for sign up inputs
2016-12-08 16:16:37 -08:00
Stephen Birarda
556ccb90f7
make a SignUpBody loaded by LoginDialog
2016-12-08 14:35:41 -08:00
Stephen Birarda
801a384607
a simple signup dialog copied from login dialog
2016-12-07 16:14:20 -08:00
Seth Alves
a04b486dfc
Merge pull request #9123 from druiz17/touchBug
...
fixed context menu showing up in the correct location with oculus touch
2016-12-06 10:34:00 -08:00
Bradley Austin Davis
f112d345e8
Add dead zone to yaw controls
2016-12-06 09:38:30 -08:00
Anthony J. Thibault
89ae3b3d6e
Revert "Merge pull request #8691 from highfidelity/out-of-body-experience"
...
This reverts commit efe9571ab8
, reversing
changes made to 333e9ec7f4
.
2016-12-05 15:18:03 -08:00
Seth Alves
efe9571ab8
Merge pull request #8691 from highfidelity/out-of-body-experience
...
Room Scale HMD comfort features.
2016-12-01 11:09:39 -08:00
Atlante45
1d8c97b337
Merge branch 'master' of https://github.com/highfidelity/hifi into fix/settings
2016-11-30 10:22:16 -08:00
Dante Ruiz
2d28ae1ffe
fixed context menu showing up in the correct location
2016-11-29 18:15:40 +00:00
Anthony J. Thibault
cbf514a738
PreferenceDialogs now preserve the sort order of their showCategories.
...
Specifically, this was to fix the issue with the Neuron plugin preferences being
the top section in the General Preferences dialog, now it is the last.
2016-11-23 10:11:28 -08:00
Anthony J. Thibault
9b0ce556e7
Added preferences for the Perception Neuron plugin.
...
By default this plugin is disabled.
The server address and port number are also configurable.
2016-11-23 10:10:00 -08:00
David Kelly
dcda5d50a0
Merge pull request #9106 from howard-stearns/animate-suggestions-when-available
...
animate suggestions when available
2016-11-22 09:24:48 -08:00
howard-stearns
81786bf819
animate suggestions when available
2016-11-21 16:46:10 -08:00
howard-stearns
2beed7e70b
proper include_actions for 'places' tab.
2016-11-21 16:22:02 -08:00
Atlante45
3035d43772
Merge branch 'master' of https://github.com/highfidelity/hifi into fix/settings
2016-11-21 13:05:08 -08:00