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 |
|
Howard Stearns
|
67f2cc3567
|
Merge pull request #10148 from davidkelly/dk/3936
pal selection changes
|
2017-04-06 14:58:46 -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 |
|
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 |
|
Vladyslav Stelmakhovskyi
|
16fa7988f6
|
TabletWebView redesigned to single WebView instance
|
2017-04-06 17:53:46 +02: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 |
|
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
|
24b89275f2
|
fix new model dialog textInput
|
2017-04-05 18:00:43 +01:00 |
|
howard-stearns
|
6f79b2eaeb
|
send initial path in location update (e.g., on login)
|
2017-04-04 12:05:43 -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
|
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 |
|
Thijs Wenker
|
2b85563413
|
Merge pull request #10115 from sethalves/fix-fast-talking
Fix fast talking
|
2017-04-04 02:13:09 +02:00 |
|
David Kelly
|
4d6886d1f4
|
cr feedback, plus changed 'People' to 'Connections' in a couple places
|
2017-04-03 17:03:14 -07:00 |
|
Seth Alves
|
cb787c2862
|
Merge pull request #10104 from druiz17/tablet-webView3.0
Remove unnecessary prints and code for tabletWebView.qml
|
2017-04-03 16:10:54 -07:00 |
|
Seth Alves
|
fbf2014f04
|
Merge pull request #10102 from vladest/tablet-ui-goto
Put current address to location instead of inputfield
|
2017-04-03 16:09:58 -07:00 |
|
Seth Alves
|
d1827cf12c
|
Merge pull request #10002 from fayeli/tablet-photobooth
Photobooth Improvements: Using Tablet & Ability to Rotate Model
|
2017-04-03 16:05:13 -07:00 |
|
David Kelly
|
4629accc9c
|
style updates
|
2017-04-03 15:35:53 -07:00 |
|
Seth Alves
|
55c2d36752
|
math fixes, cleanups
|
2017-04-03 15:30:06 -07:00 |
|
Seth Alves
|
2a43c41954
|
Merge branch 'master' of github.com:highfidelity/hifi into fix-fast-talking
|
2017-04-03 14:44:13 -07:00 |
|
Seth Alves
|
7ac09398be
|
include deltaTime in audioAttack running average
|
2017-04-03 14:44:05 -07:00 |
|
Andrew Meadows
|
66ff551a7c
|
Merge pull request #10080 from ZappoMan/footActions
add foot IK targets as actions, map Kinect feet to foot targets
|
2017-04-03 12:06:14 -07:00 |
|
Seth Alves
|
7f1095c590
|
use deltaTime rather than calling usecTimestampNow
|
2017-04-03 11:55:08 -07:00 |
|
Seth Alves
|
9e08925d7e
|
involve clock time in _mouthTime calculation
|
2017-04-03 11:34:29 -07:00 |
|
David Kelly
|
2f1b6be24d
|
Merge branch 'PAL_v2_Zach_new' of https://github.com/zfox23/hifi
|
2017-04-03 10:55:55 -07:00 |
|
Dante Ruiz
|
3090629f77
|
clean up code
|
2017-04-03 18:51:39 +01:00 |
|
Anthony Thibault
|
999bd0d339
|
Merge pull request #10075 from sethalves/tablet-ui
Tablet ui -- misc changes + landscape mode
|
2017-04-03 10:43:34 -07:00 |
|
Vladyslav Stelmakhovskyi
|
990e1379e3
|
Fix warning in Audio page. Revert commented out assert in OffscreenGLCanvas: move to separate task
(cherry picked from commit d966979c2368b159cf5b96c5fd535411cda019b8)
|
2017-04-03 19:33:41 +02:00 |
|
Vladyslav Stelmakhovskyi
|
156166ce4a
|
Fixed another warning in TabletAddressDialog.qml
(cherry picked from commit 73c923bb522ad711380a2fcdaa9babe9f01a639a)
|
2017-04-03 19:33:13 +02:00 |
|
Vladyslav Stelmakhovskyi
|
9e96888534
|
Fixed warning: TabletAddressDialog.qml:546: Error: Cannot assign to non-existent property 'shown'
(cherry picked from commit e70c2cdcc74f9fd43273dca268433cdefd9ecf40)
|
2017-04-03 19:32:09 +02:00 |
|
Vladyslav Stelmakhovskyi
|
6b7f3f7125
|
Fixed warning: TabletAddressDialog.qml:282:13: QML ListView: Cannot specify top, bottom, and verticalCenter anchors at the same time.
(cherry picked from commit b11e245cb1b19149ff00f16b718ff4088b856f3e)
|
2017-04-03 19:32:09 +02:00 |
|
Vladyslav Stelmakhovskyi
|
849d65f95f
|
Fixed warning: Tablet.qml:205: TypeError: Cannot read property of null
(cherry picked from commit b1dc14b355bc6053a0e264a057a799a4d446e347)
|
2017-04-03 19:32:09 +02:00 |
|
Seth Alves
|
c45514a557
|
Merge pull request #10066 from vladest/tablet-ui-connection-dialog
Implemented no connection dialog for Tablet UI
|
2017-04-03 09:57:00 -07:00 |
|
Seth Alves
|
98a54d9119
|
Merge pull request #10101 from ctrlaltdavid/21252
Fix tablet scrolling getting stuck to mouse pointer
|
2017-04-03 09:52:45 -07:00 |
|
Seth Alves
|
0f936f7511
|
Merge pull request #10078 from hyperlogic/feature/avatar-skeleton
Expose Avatar Skeleton to JavaScript
|
2017-04-03 09:39:35 -07:00 |
|
Seth Alves
|
43e1cec8a3
|
merge from upstream
|
2017-04-03 06:28:59 -07:00 |
|
Vladyslav Stelmakhovskyi
|
d207dae5b7
|
Put current address to location instead of inputfield
|
2017-04-02 20:02:40 +02:00 |
|
David Rowe
|
2b4afdb987
|
Fix tablet window getting stuck to pointer if release mouse off tablet
|
2017-04-02 12:58:11 +12:00 |
|
Chris Collins
|
3c62826ef9
|
Merge pull request #10091 from ctrlaltdavid/21248
Fix HTML controls not working properly in the tablet
|
2017-04-01 08:41:44 -07:00 |
|
Chris Collins
|
cc8b52fff4
|
Merge pull request #10095 from druiz17/tablet-webView2.0
Tablet webview now uses mobile format
|
2017-04-01 08:33:09 -07:00 |
|