druiz17
|
b4182fe7ac
|
Merge pull request #10899 from druiz17/calibration-update-2.0
Updates to the Calibration UI
|
2017-07-06 14:24:45 -07:00 |
|
utkarshgautamnyu
|
d961a0c4ad
|
Merge pull request #10887 from highfidelity/bug/5950
Bug/5950
|
2017-07-06 14:04:38 -07:00 |
|
Clément Brisset
|
34e3f56002
|
Merge pull request #10843 from birarda/bug/user-activities-interface-only
disable user activity logger in DS/AC/ac-client
|
2017-07-06 14:01:49 -07:00 |
|
Zach Fox
|
8945b75cda
|
Merge pull request #10903 from zfox23/PAL_fixAdminColumn
Ensure admins see PAL admin column
|
2017-07-06 13:38:10 -07:00 |
|
Dante Ruiz
|
1fcb3b32d6
|
fixed letter cap
|
2017-07-06 20:55:19 +01:00 |
|
utkarshgautamnyu
|
d5c88bc6de
|
Merge branch 'master' into bug/5950
|
2017-07-06 12:52:13 -07:00 |
|
Seth Alves
|
0374d24b15
|
Merge pull request #10901 from druiz17/goto-keyboard-fix
Fixed the keyboard not showing up for goto in HMD mode
|
2017-07-06 12:46:13 -07:00 |
|
Stephen Birarda
|
29d7784fef
|
Merge pull request #10895 from highfidelity/bug/5976
Bug/5976
|
2017-07-06 12:43:15 -07:00 |
|
Zach Fox
|
a5c7324ec5
|
Ensure admins see PAL admin column
|
2017-07-06 12:15:44 -07:00 |
|
Dante Ruiz
|
2d876377d5
|
keyboard know disappears when you click of the address line
|
2017-07-06 20:04:44 +01:00 |
|
Stephen Birarda
|
bdcdff3dbc
|
force _isSet to be set before isSet() called
|
2017-07-06 12:01:08 -07:00 |
|
Dante Ruiz
|
de5802418f
|
fixed some keybaord logic
|
2017-07-06 19:27:48 +01:00 |
|
Clément Brisset
|
4f8b5b7c8a
|
Merge pull request #10607 from ZappoMan/godview
god view app
|
2017-07-06 11:27:24 -07:00 |
|
Dante Ruiz
|
4e3dba1767
|
goto HMD keyboard fix
|
2017-07-06 19:12:52 +01:00 |
|
Dante Ruiz
|
9e4b5693c7
|
fixed merge conflicts
|
2017-07-06 18:49:46 +01:00 |
|
ZappoMan
|
c3c9df0cd0
|
restore old camera state
|
2017-07-06 10:41:46 -07:00 |
|
anshuman64
|
e384f6d1b7
|
Merge pull request #10866 from druiz17/vive-in-desktop
Allowing Vive controllers and trackers to be used in desktop mode
|
2017-07-06 10:40:56 -07:00 |
|
Stephen Birarda
|
916f57772b
|
default the UAL off for all targets, enable manually for Interface
|
2017-07-06 10:21:07 -07:00 |
|
Dante Ruiz
|
6e1f9d275c
|
chnaged default head offset
|
2017-07-06 17:54:06 +01:00 |
|
David Kelly
|
1ccf0da7d8
|
Merge pull request #10897 from davidkelly/dk/cacheSwitchFix
redo cache switch
|
2017-07-06 09:53:01 -07:00 |
|
ZappoMan
|
10341af819
|
Merge branch 'master' of https://github.com/highfidelity/hifi into godview
|
2017-07-06 09:39:33 -07:00 |
|
Dante Ruiz
|
258c21838e
|
finished calibration-ui updates
|
2017-07-06 17:32:40 +01:00 |
|
Andrew Meadows
|
4fad9d9b1a
|
Merge pull request #10858 from jherico/trace_cores
Additional threaded tracing of CPU cores
|
2017-07-06 08:23:21 -07:00 |
|
David Kelly
|
936c21e849
|
remove unnecessary cacheDir member
|
2017-07-06 07:24:58 -07:00 |
|
Brad Davis
|
d91516c630
|
Merge pull request #10894 from jherico/acclient_fix
Fix ACClient on Linux
|
2017-07-05 18:26:15 -07:00 |
|
utkarshgautamnyu
|
9d2fe8da9c
|
Update DomainServer.cpp
|
2017-07-05 18:02:44 -07:00 |
|
Seth Alves
|
c058a166d4
|
Merge pull request #10888 from jherico/overlay_crashes
Trying to fix overlay crashes again
|
2017-07-05 17:16:53 -07:00 |
|
David Kelly
|
4a22fbca1b
|
redo cache switch
|
2017-07-05 17:01:31 -07:00 |
|
utkarshgautamnyu
|
8c96d00f14
|
Update DomainServerSettingsManager.cpp
|
2017-07-05 16:59:47 -07:00 |
|
utkarshgautamnyu
|
9b7a561c28
|
Update describe-settings.json
|
2017-07-05 16:56:21 -07:00 |
|
Brad Davis
|
2409c83d5d
|
Fix ACClient on Linux
|
2017-07-05 16:53:42 -07:00 |
|
Dante Ruiz
|
6c15dffb9d
|
added new glyph
|
2017-07-06 00:45:59 +01:00 |
|
utkarshgautamnyu
|
f824290a4c
|
Update describe-settings.json
|
2017-07-05 14:38:06 -07:00 |
|
utkarshgautamnyu
|
25773fcf5a
|
Update describe-settings.json
|
2017-07-05 14:36:17 -07:00 |
|
utkarshgautamnyu
|
872751bb16
|
Update describe-settings.json
|
2017-07-05 14:30:48 -07:00 |
|
Brad Davis
|
7f1bc07d04
|
Trying to fix overlay crashes again
|
2017-07-05 14:30:01 -07:00 |
|
utkarshgautamnyu
|
c069c13ebb
|
Update DomainServerSettingsManager.cpp
|
2017-07-05 14:12:18 -07:00 |
|
utkarshgautamnyu
|
1385ef80a7
|
Update DomainServerSettingsManager.cpp
|
2017-07-05 13:56:40 -07:00 |
|
utkarshgautamnyu
|
7b79e8c41e
|
Update describe-settings.json
|
2017-07-05 13:53:04 -07:00 |
|
Zach Fox
|
64a443ee0d
|
Merge pull request #10883 from zfox23/snapshots_TweakShareButton
Tweak the Snapshot 'Share' button to make its purpose more clear
|
2017-07-05 13:27:51 -07:00 |
|
Zach Fox
|
6f2e7f5b83
|
Tweak the Snapshot 'Share' button to make its purpose more clear
|
2017-07-05 12:39:15 -07:00 |
|
Dante Ruiz
|
07d098b95b
|
coding standard fix
|
2017-07-05 19:45:52 +01:00 |
|
Dante Ruiz
|
275f48b65a
|
another requested change made
|
2017-07-05 19:22:19 +01:00 |
|
Dante Ruiz
|
e567cf0196
|
made requested changes
|
2017-07-05 19:04:34 +01:00 |
|
Brad Davis
|
1bcfe1eaba
|
Merge pull request #10880 from samcake/hobbes
Fixing the bug appearing on Nvidia 384.76
|
2017-07-05 10:56:03 -07:00 |
|
Dante Ruiz
|
27a9880eff
|
removed double add of head offset
|
2017-07-05 18:34:33 +01:00 |
|
Dante Ruiz
|
b86a8b8338
|
Merge branch 'master' of github.com:highfidelity/hifi into vive-in-desktop
|
2017-07-05 18:27:33 +01:00 |
|
Dante Ruiz
|
691b59ffff
|
remove debug statments
|
2017-07-05 18:26:58 +01:00 |
|
Sam Gateau
|
48b4b5f49c
|
Fixing the bug appearing on Nvidia 284.76
|
2017-07-05 18:39:09 +02:00 |
|
Seth Alves
|
fad686571a
|
Merge pull request #10874 from jherico/overlay_mutex
Restore mutex in overlay interface
|
2017-07-03 17:25:42 -07:00 |
|