David Kelly
cb092d67dd
Merge branch 'master' of https://github.com/highfidelity/hifi into dk/3995
2017-04-07 09:01:59 -07:00
samcake
700c319953
Merge pull request #10158 from highfidelity/revert-10157-brown
...
Revert "Fixing the rendering bug triggered with Nvidia driver 381.65"
2017-04-07 02:03:51 -07:00
samcake
ab3d39951e
Revert "Fixing the rendering bug triggered with Nvidia driver 381.65"
2017-04-07 02:03:31 -07:00
samcake
ac9b181786
Merge pull request #10157 from samcake/brown
2017-04-07 02:01:05 -07:00
Sam Cake
b1a4bc329b
Introducing a fix to the graphics bug
2017-04-07 01:10:18 -07:00
Sam Cake
da1355dc32
Introducing a fix to the graphics bug
2017-04-07 01:03:07 -07:00
samcake
aae7349c40
trying to understand the bug with nvidia new driver
2017-04-06 18:31:03 -07:00
samcake
0254c3372f
Merge pull request #10143 from jherico/ktx_crash
...
Don't crash if KTX file is invalid
2017-04-06 16:28:19 -07:00
Chris Collins
4e9e3cccea
Merge pull request #10116 from birarda/bug/rel-ext-textures
...
fix relative/absolute path handling for external FBX textures
2017-04-06 15:58:02 -07:00
Seth Alves
ec2ebc00c0
Merge pull request #10145 from hyperlogic/feature/openvr-1.0.6
...
OpenVR: upgrade to version 1.0.6, for better generic tracker support
2017-04-06 15:53:49 -07:00
David Kelly
a1c211395b
Merge pull request #10152 from howard-stearns/fix-sort-by-connections-friend-column
...
fix sorting by pal connections-tab friends column
2017-04-06 15:43:21 -07:00
Seth Alves
b1a015affd
Merge pull request #10117 from huffman/fix/unlock-propagation
...
Fix entity "unlock" edits not being propagated to clients
2017-04-06 15:28:05 -07:00
David Kelly
179a445f59
updated connection instructions
2017-04-06 15:21:10 -07:00
Howard Stearns
67f2cc3567
Merge pull request #10148 from davidkelly/dk/3936
...
pal selection changes
2017-04-06 14:58:46 -07:00
Clément Brisset
da27cd1c8b
Merge pull request #10149 from mittens/patch-1
...
Link to coding standards.
2017-04-06 14:46:45 -07:00
howard-stearns
9577102c22
fix sorting by pal connections-tab friends column
2017-04-06 14:45:08 -07:00
David Kelly
331f2da4f8
Merge branch 'master' of https://github.com/highfidelity/hifi into dk/3936
2017-04-06 14:22:08 -07:00
Seth Alves
3c6429cdf3
Merge pull request #10103 from vladest/master-qml-bugfixes
...
Master qml bugfixes
2017-04-06 14:22:06 -07:00
Howard Stearns
f7ef587c61
Merge pull request #10138 from davidkelly/dk/3935
...
Now you can forget connections
2017-04-06 14:05:25 -07:00
Chris Collins
494c8d868e
Merge pull request #10126 from samcake/brown
...
Fixing the rendering of Image3D overlay when drawn in the scene
2017-04-06 13:40:09 -07:00
Anthony J. Thibault
4e49774d0e
Moved device class check into handleTrackedObject
2017-04-06 13:20:00 -07:00
Trent Polack
d163b34368
Link to coding standards.
2017-04-06 15:57:32 -04:00
David Kelly
46a7d28e16
Merge pull request #10144 from howard-stearns/notice-login-change-in-pal
...
notice login/logout change in pal
2017-04-06 12:57:22 -07:00
David Kelly
e0a1422345
pal selection changes
2017-04-06 12:07:51 -07:00
howard-stearns
1d60a55d5f
notice login/logout change in pal
2017-04-06 11:20:08 -07:00
David Kelly
85c78da839
updated, plus fixed some annoying errors in logs from Pal.qml
2017-04-06 11:16:51 -07:00
David Kelly
34a2cefb98
Merge pull request #10132 from davidkelly/dk/analyticsForConnections
...
initial analytics for connections
2017-04-06 10:45:39 -07:00
druiz17
01204f845f
Merge pull request #10141 from vladest/tabletwebview-focus
...
TabletWebView redesigned to single WebView instance
2017-04-06 10:40:24 -07:00
Brad Davis
057a9feaf1
Don't crash if KTX file is invalid
2017-04-06 10:09:57 -07:00
Vladyslav Stelmakhovskyi
16fa7988f6
TabletWebView redesigned to single WebView instance
2017-04-06 17:53:46 +02:00
David Kelly
a92162dea9
no mo useless debug statements
2017-04-06 08:50:22 -07:00
Anthony J. Thibault
42262aac78
OpenVR: upgrade to version 1.0.6, for better generic tracker support
2017-04-05 18:41:43 -07:00
David Kelly
06bd9c97bf
remove info button from avatar image
2017-04-05 18:21:54 -07:00
David Kelly
61ece265f4
now you can forget connections
2017-04-05 18:16:16 -07:00
Anthony Thibault
be2fdd9388
Merge pull request #10063 from hyperlogic/feature/vive-tracked-objects
...
Vive: Expose all 16 tracked poses to the controller system
2017-04-05 16:53:47 -07:00
Stephen Birarda
e4021c168e
add special handling for abs drive letter paths from windows
2017-04-05 16:52:22 -07:00
Philip Rosedale
5e91d578c2
Merge pull request #10129 from hyperlogic/bug-fix/teleport-improvements
...
Recenter body on teleport, also it works more consistently.
2017-04-05 16:45:41 -07:00
samcake
309c6b8d9b
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
2017-04-05 13:11:12 -07:00
Seth Alves
b0ccbae552
Merge pull request #10131 from druiz17/tablet-edit-box
...
Fix the text input for edit's newModelDialog
2017-04-05 12:37:26 -07:00
Seth Alves
b58fe6ee90
Merge pull request #10127 from druiz17/oculus-tracking
...
Use old controller data for 3 seconds when losing track of touch controllers
2017-04-05 12:34:43 -07:00
David Kelly
1b6bf90843
initial analytics for connections
2017-04-05 11:10:06 -07:00
Dante Ruiz
34f3c4abee
removed mousearea
2017-04-05 18:08:03 +01:00
Dante Ruiz
de8b7eeb27
removed commented code
2017-04-05 18:02:55 +01:00
Dante Ruiz
fa95842c76
Merge branch 'master' of github.com:highfidelity/hifi into tablet-edit-box
2017-04-05 18:01:21 +01:00
Dante Ruiz
24b89275f2
fix new model dialog textInput
2017-04-05 18:00:43 +01:00
Anthony J. Thibault
c33f10ca1b
Recenter body on teleport, also it works more consistently.
...
If your avatar happens to be squatting, your body will stand up straight after you teleport.
Also, setting MyAvatar.position can sometimes fail due to the multi-threaded nature of scripting.
Instead, teleport.js uses goToPosition to move the avatar, as a result teleport feels much more responsive now.
2017-04-04 18:05:46 -07:00
Seth Alves
384f404602
Merge pull request #10109 from mittens/21240
...
OBJ Loader Rewrite to Support Multiple Materials
2017-04-04 15:56:44 -07:00
Philip Rosedale
b59d0bcd59
Merge pull request #10122 from hyperlogic/bug-fix/fix-sliding-feed-in-HMD-mode
...
Fix for sliding feet when leaning in HMD mode.
2017-04-04 15:32:46 -07:00
Stephen Birarda
70eada0f76
replace backslashes in parsed fbx relative filepaths
2017-04-04 15:01:18 -07:00
Stephen Birarda
0b57b98970
change readFBX calls to use QUrl where possible
2017-04-04 14:53:14 -07:00
