vladest
cfacf3b47d
Port web glyph button to QQC2
2017-11-16 21:58:09 +01:00
vladest
2aae8edde0
Merge branch 'master' into move_to_qqc2
2017-11-16 19:08:15 +01:00
vladest
b4f6c25f4d
Implement QQC1-compatible Action component
2017-11-16 19:04:35 +01:00
Ryan Huffman
60a222e4b4
Merge pull request #11810 from Atlante45/fix/stuck-acs
...
Fix stuck ACs
2017-11-15 14:59:51 -08:00
Zach Fox
9f80a5f081
Merge pull request #11817 from zfox23/commerce_rezFix
...
Fix rezzing non-JSON marketplace items
2017-11-15 14:17:05 -08:00
vladest
0e53afc346
Merge branch 'master' into move_to_qqc2
2017-11-15 20:53:14 +01:00
vladest
2852375285
Make QueryDioalogs buttons works
2017-11-15 20:32:28 +01:00
Zach Fox
e8c4878c8f
Fix rezzing non-JSON marketplace items
2017-11-15 11:25:18 -08:00
Atlante45
e68ce97697
Remove the number of socket change tracking
2017-11-15 11:19:54 -08:00
Dante Ruiz
d83f3152dd
Merge pull request #11809 from ElderOrb/FB8984
...
8984 Opening tablet with "Enter" key displays the audio menu
2017-11-15 11:16:49 -08:00
John Conklin II
8592f3fd4d
Merge pull request #11764 from luiscuenca/case7587
...
7587 Lasers resize with avatar
2017-11-15 09:31:45 -08:00
Howard Stearns
1c293c4c48
Merge pull request #11813 from zfox23/commerce_removeEditJSDependency
...
Remove Marketplace's dependency on Edit.js for REZ/WEAR
2017-11-14 16:33:35 -08:00
Zach Fox
f5994375cf
Remove Marketplace's dependency on Edit.js for rez
2017-11-14 14:29:49 -08:00
Zach Fox
c42003a374
Merge pull request #11794 from ElderOrb/FB4684_3
...
4684 Add collapse button on the virtual keyboard
2017-11-14 12:22:42 -08:00
Alexander Ivash
e201e203b8
8984 Opening tablet with "Enter" key displays the audio menu
2017-11-14 22:18:48 +03:00
luiscuenca
489e244342
More accurate scale from SensorToWorldScale
2017-11-14 09:56:23 -07:00
vladest
6b732804eb
Button as QQC2
2017-11-13 21:15:31 +01:00
Zach Fox
641c4656c4
Fix bug with disappearing certificate info
2017-11-13 10:53:16 -08:00
Ryan Downe Karpf
3ea6ecf104
Merge pull request #11747 from luiscuenca/case8495
...
8495 No mirror camera in HMD mode
2017-11-13 09:09:34 -08:00
vladest
4c1bbdacec
Fix merge conflicts
2017-11-13 16:45:10 +01:00
vladest
0c13c2b6e2
Remove unused QQC1 imports
2017-11-13 16:37:28 +01:00
Ryan Downe Karpf
f8b1c7978c
Merge pull request #11772 from 1P-Cusack/FogBugz/Case_6569
...
[Case 6569]: Silent failure is possible during Model Creation
2017-11-12 08:36:10 -08:00
Sam Gateau
ecf67cc331
Merge pull request #11650 from Zvork/outline
...
Multiple Outline Groups
2017-11-10 15:45:03 -08:00
luiscuenca
d53a29b958
correction
2017-11-10 12:24:19 -07:00
luiscuenca
bf576e63fe
move constant to class definition
2017-11-10 11:54:53 -07:00
Anthony J. Thibault
ba4c0f189e
code review feedback
...
removed discontinuity in safeDeltaTime, which is used to prevent division by zero.
2017-11-10 10:25:29 -08:00
beholder
d1969d649a
fix not collapsing keyboard
2017-11-10 21:20:00 +03:00
beholder
0bc95998c4
a few more adjustments based on discussion with Mukul
2017-11-10 21:20:00 +03:00
beholder
4d11f9a434
increase font pixel size for 'collapse keyboard' to 34px
2017-11-10 21:20:00 +03:00
beholder
db3ed81513
adjust to changed requirements:
...
1. The keyboard collapse button is moved to the lower right, replacing the keys there
2. The button next to m is a hyphen instead of a underscore, it turns to a underscore when the user clicks on shift
3. The input text at the top occupies the full width and is center aligned, when you start typing the text moves in both directions the left and the right
2017-11-10 21:20:00 +03:00
beholder
eb4214fb4c
add API for unfocusing input fields in HTML, unfocus WebEngine-based QML items on lowering keyboard
2017-11-10 21:20:00 +03:00
beholder
fb14e4dc4d
Fixed programmatical lowering of 'TabletAddressDialog'
2017-11-10 21:20:00 +03:00
beholder
a9fe3596cf
4684 Add collapse button on the virtual keyboard
2017-11-10 21:20:00 +03:00
Anthony J. Thibault
4169e11e77
Merge branch 'master' into bug-fix/div-by-zero
2017-11-10 10:15:26 -08:00
luiscuenca
255a40ce31
Corrections
2017-11-09 18:38:04 -07:00
luiscuenca
055fe16677
Allow script to change to mirror camera in HMD
2017-11-09 18:27:16 -07:00
Sam Gondelman
9010a02bee
Merge pull request #11790 from SamGondelman/overlayFlash
...
Fix laser end not disappearing
2017-11-09 17:10:07 -08:00
luiscuenca
7dfdc8da59
Redesign and clean of unused lineWidths
2017-11-09 17:50:38 -07:00
Anthony Thibault
38cc56db7f
Merge pull request #11785 from luiscuenca/case6944
...
6944 Avatar scale is preserved across domains
2017-11-09 16:38:45 -08:00
SamGondelman
9188ae9fb5
fix laser end not disappearing
2017-11-09 16:26:37 -08:00
luiscuenca
355b465109
make leaveDomain slot private
2017-11-09 16:05:53 -07:00
David Kelly
31dc140ea6
Merge pull request #11771 from zfox23/commerce_seedingFrontend
...
Commerce: Seeding Frontend
2017-11-09 14:45:10 -07:00
Sam Gondelman
d1e41e6bf0
Merge pull request #11786 from SamGondelman/overlayFlash
...
Fix overlay flash on visibility and position change
2017-11-09 13:36:49 -08:00
SamGondelman
224386317d
send overlay visibility through transaction
2017-11-09 12:14:40 -08:00
luiscuenca
10f484c668
6944 Avatar scale is saved across domains
2017-11-09 12:21:23 -07:00
Elisa Lupin-Jimenez
1e526605ba
Merge pull request #11778 from elisa-lj11/blocks
...
Fixed Blocks downloads (now Google Poly)
2017-11-08 17:53:26 -08:00
luiscuenca
1791ed01ca
add width param to vertex shader
2017-11-08 18:35:26 -07:00
Zach Fox
19b7c6e025
Remove machine fingerprint from receiveAt
2017-11-08 17:15:27 -08:00
LaShonda Hopper
0e90c92cf5
[Case 6569] Minor: Break up line to pass column count guidelines.
...
Changes Committed:
modified: interface/resources/qml/hifi/tablet/NewModelDialog.qml
2017-11-08 18:35:12 -05:00
LaShonda Hopper
a057cb914f
[Case 6569] Fixes clipping of cancel button by window edge.
...
Changes Committed:
modified: interface/resources/qml/hifi/tablet/NewModelDialog.qml
2017-11-08 18:27:25 -05:00
