Dante Ruiz
a89081601c
fix merge issues
2017-04-06 22:31:47 +01:00
Dante Ruiz
52fd446d4d
toggle goto in tablet
2017-04-06 22:27:37 +01: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
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
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
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
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
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
Dante Ruiz
5bb4edf18c
Merge branch 'master' of github.com:highfidelity/hifi into goto-fix
2017-04-06 00:16:59 +01:00
Dante Ruiz
90f5d02c99
goto toggle option
2017-04-06 00:13:53 +01: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
Dante Ruiz
81ae3e44fd
Merge branch 'master' of github.com:highfidelity/hifi into oculus-tracking
2017-04-04 22:11:08 +01:00
Dante Ruiz
a31812821a
oculus lost tracking, delay hand to side
2017-04-04 22:10:47 +01:00
samcake
8b4696f4ec
Merge and solve conflicts
2017-04-04 13:28:03 -07:00
samcake
6385a702cd
FIxing the bug for image3D overlay drawn in scene
2017-04-04 12:56:43 -07:00
Howard Stearns
fa7baaa5ba
Merge pull request #10124 from howard-stearns/send-initial-path
...
send initial path in location update (e.g., on login)
2017-04-04 12:40:09 -07:00
howard-stearns
6f79b2eaeb
send initial path in location update (e.g., on login)
2017-04-04 12:05:43 -07:00
samcake
b18d82bd19
adding different shaders for transparent for simpel
2017-04-04 11:50:38 -07:00
Anthony J. Thibault
c58fdb590a
Fix for sliding feet when leaning in HMD mode.
2017-04-04 11:00:34 -07:00
Seth Alves
b0b214012c
Merge pull request #10118 from hyperlogic/bug-fix/tablet-restart-scripts
...
Fix broken eventBridge on tablet after Reload All Scripts.
2017-04-04 10:45:08 -07:00
Howard Stearns
b0fa784267
Merge pull request #10108 from davidkelly/dk/PalImprovementsMostlyZach
...
Dk/pal improvements mostly zach
2017-04-04 10:03:10 -07:00
David Kelly
08ac25473f
wording change
2017-04-04 09:53:09 -07:00
Vladyslav Stelmakhovskyi
aa487faad1
Fixed No such signal QmlWindow_QMLTYPE_490::resized(QSizeF) and No such signal QmlWindow_QMLTYPE_490::moved(QVector2D) warnings
2017-04-04 16:59:09 +02:00
Vladyslav Stelmakhovskyi
367555acdb
Fixed BasicTableView.qml:610:17: QML Item: Binding loop detected for property width. width must be explicitly set
2017-04-04 16:35:21 +02:00
Vladyslav Stelmakhovskyi
332f9bb283
Fixed TabletMenuStack.qml:56: Error: Cannot assign [undefined] to QString. Fixed keyboardRaised undefined error
2017-04-04 16:22:40 +02:00
Vladyslav Stelmakhovskyi
072e024d9a
Fixed warning in JSConsole
2017-04-04 16:10:37 +02:00
trent
362ffba117
Fixes to OBJReader.cpp style inconsistencies.
2017-04-03 21:54:19 -04:00
samcake
a882beb2fd
Trying to fix the overlay Image3D shading pipeline used
2017-04-03 17:35:28 -07:00
Thijs Wenker
2b85563413
Merge pull request #10115 from sethalves/fix-fast-talking
...
Fix fast talking
2017-04-04 02:13:09 +02:00
Brad Davis
9942770761
Merge pull request #10105 from samcake/ambient
...
Fixing the bad rendering of the instanced primitives on 4.1
2017-04-03 17:04:56 -07:00
David Kelly
4d6886d1f4
cr feedback, plus changed 'People' to 'Connections' in a couple places
2017-04-03 17:03:14 -07:00
trent
5cc87ccc4a
Fixed warning for subtly-stupid unused variable.
2017-04-03 19:38:34 -04:00
