Chris Collins
8a00efde72
Merge pull request #10922 from highfidelity/revert-10835-bug/invisible-avatars
...
Revert "fix for invisible avatars after radius ignore"
2017-07-07 16:51:06 -07:00
Stephen Birarda
420e9233b6
Revert "fix for invisible avatars after radius ignore"
2017-07-07 16:50:28 -07:00
druiz17
6e44c95d53
Merge pull request #10906 from druiz17/audio-qml-fix
...
Made the output audio listview dynamically change height base on content size
2017-07-07 16:48:15 -07:00
Stephen Birarda
f07ce6d294
Merge pull request #10835 from birarda/bug/invisible-avatars
...
fix for invisible avatars after radius ignore
2017-07-07 16:06:44 -07:00
Andrew Meadows
665aa92da2
Merge pull request #10877 from sethalves/atp-client
...
Atp client
2017-07-07 14:04:50 -07:00
Zach Fox
3d14d3755e
Merge pull request #10898 from 1P-Cusack/21425
...
Add View->Enter First Person Mode in HMD checkbox.
2017-07-07 14:01:36 -07:00
Andrew Meadows
57842ce5a5
Merge pull request #10878 from mnafees/21355
...
CR for Job #21355 - Clean up and remove menu hotkeys
2017-07-07 14:01:21 -07:00
1P-Cusack
77001712ab
Default 'Enter First Person Mode in HMD' to true.
2017-07-07 15:35:32 -04:00
Ryan Huffman
84345e6db1
Merge pull request #10915 from birarda/bug/bake-with-ext-textures
...
fix for FBX baking with external textures
2017-07-07 10:57:35 -07:00
Zach Fox
e222753aac
Merge pull request #10911 from zfox23/PAL_adminFix2
...
Set admin status even if QML can't find user in PAL
2017-07-07 10:24:53 -07:00
Andrew Meadows
2349057306
Merge pull request #10879 from AndrewMeadows/avoid-null-shape
...
fix crash in ObjectMotionState::handleEasyChanges()
2017-07-07 10:22:05 -07:00
Stephen Birarda
bff54d260e
fix for baking FBX with external textures
2017-07-07 10:11:13 -07:00
Zach Fox
ea77557e38
Correctly close PAL when switching domains
2017-07-07 08:09:19 -07:00
Seth Alves
fc8b7c7cc5
Merge pull request #10904 from druiz17/window-root-spam
...
fixed log spamming from windowRoot.qml in toolbar mode
2017-07-07 07:17:08 -07:00
Seth Alves
81cc46beb4
Merge pull request #10909 from jherico/overlay_crashes
...
Fixing overlay crashes, for real
2017-07-07 07:11:52 -07:00
Zach Fox
ee9cdaff90
Set admin status even if QML can't find user in PAL
2017-07-06 23:26:40 -07:00
Seth Alves
baf63181d2
Merge pull request #10900 from hyperlogic/bug-fix/pucks-in-desktop
...
Can now use chest, hips, shoulder & feet pucks in desktop mode.
2017-07-06 19:53:44 -07:00
Brad Davis
f8b76d65ab
Fixing overlay crashes, for real
2017-07-06 18:01:26 -07:00
Seth Alves
b8875a8902
Merge branch 'master' of github.com:highfidelity/hifi into atp-client
2017-07-06 17:28:55 -07:00
Stephen Birarda
d22b146370
Merge pull request #10845 from birarda/bug/domain-cookie-restart
...
fix for OAuth OPTIONS firing every XHR 302
2017-07-06 17:22:03 -07:00
Stephen Birarda
6d98d20b12
cleanup bad QEventLoop::exec() OAuth handling code
2017-07-06 16:19:47 -07:00
Dante Ruiz
1ac415aa14
dynamic listview height
2017-07-06 23:50:32 +01:00
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
Dante Ruiz
b0130896d1
fixed spamming from windowRoot.qml
2017-07-06 22:01:08 +01: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
Anthony J. Thibault
eb486c8f47
comments
2017-07-06 11:03:03 -07:00
Anthony J. Thibault
4e9b8c1ef9
updated comments
2017-07-06 11:01:59 -07:00
Anthony J. Thibault
dee9769be3
Can now use chest, hips, shoulder & feet pucks in desktop mode.
...
* Fixed bug where head puck would sometimes not work properly when other vive trackers were enabled.
* Fixed calibration to work in sensor space instead of avatar space, this was necessary because
the sensor to world matrix is unreliable when in desktop mode.
2017-07-06 10:54:03 -07:00
Anthony J. Thibault
8c15d1bab9
delete-trailing-whitespace
2017-07-06 10:54:02 -07:00
Dante Ruiz
9e4b5693c7
fixed merge conflicts
2017-07-06 18:49:46 +01:00
Seth Alves
645cfce828
Merge branch 'master' of github.com:highfidelity/hifi into atp-client
2017-07-06 10:45:34 -07: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
Andrew Meadows
2299bb7718
supply minimum shape rather than null
2017-07-06 10:37:44 -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
