Commit graph

2622 commits

Author SHA1 Message Date
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
Zach Fox
e8c4878c8f Fix rezzing non-JSON marketplace items 2017-11-15 11:25:18 -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
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
Zach Fox
641c4656c4 Fix bug with disappearing certificate info 2017-11-13 10:53:16 -08: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
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
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
LaShonda Hopper
dac2ae19a4 [Case 6569] Add protection for dynamic vs static collision type (details below).
When creating a model, it was possible to elect Exact collision with the dynamic
property even though this combination is prohibited.  This combination would silently
fail rather than notifying the user of the error.

This commit implements safeguards against the invalid combination:
    * If the user elects the Exact collision type and the dynamic field is unchecked, then dynamic field is disabled.
    * If the user elects a different collision type and the dynamic filed is unchecked, then the dynamic field is enabled.
    * If the user has checked the dynamic field and subsequently elects the Exact collision type, then the selection is
      void and the previous collision selection is retained; however, an error dialog is presented informing the user of the error.

Changes Committed:
    modified:   interface/resources/qml/hifi/tablet/NewModelDialog.qml
2017-11-08 18:27:24 -05:00
Zach Fox
38fde43009 ...simplify your life 2017-11-08 13:19:47 -08:00
Zach Fox
3190fe1f32 Use keyfilepath instead of cached public keys 2017-11-08 12:30:48 -08:00
Zach Fox
72fa0823ba Logic changes 2017-11-08 11:01:54 -08:00
Zach Fox
b7163bb8fc Frontend changes 2017-11-08 10:25:11 -08:00
Zach Fox
f248eb5518 Change wallet home when 0 transactions 2017-11-07 11:30:09 -08:00
David Rowe
9db0dd6fea Fix Asset Browser's "Copy URL" context menu 2017-11-05 20:38:37 +13:00
Brad Hefta-Gaub
c1dfa24c12
Merge pull request #11743 from kencooke/audio-peakmeters-bugfix
Fix the audio input device peak meters
2017-11-04 13:55:08 -07:00
Melissa Brown
a14e98053e
Merge pull request #11138 from Nex-Pro/21466
Fix Avatar Rotation upon Teleporting Using PAL
2017-11-03 11:58:15 -07:00
Nex-Pro
3171418173
Update NameCard.qml 2017-11-03 17:21:35 +00:00
Ken Cooke
babaef8399 Fix the audio input device peak meters 2017-11-03 05:59:59 -07:00
Zach Fox
6f3c61c4e0 Slightly modify invalid cert language 2017-11-02 17:59:36 -07:00
Zach Fox
19945c5991 Update cert UI 2017-11-02 10:22:00 -07:00
Zach Fox
56cb98d96f Make inspection cert work 2017-11-01 12:02:57 -07:00
Zach Fox
b335ba9a75 Timeout timer 2017-11-01 11:34:29 -07:00
Ryan Downe Karpf
28a99fe685
Merge pull request #11655 from dback2/tabletcontextualmode
add a tablet contextual mode flag to HMDScriptingInterface used to keep tablet in place
2017-10-30 08:56:26 -07:00
vladest
b1601dcd4c fix typo in tablet avatar browser 2017-10-28 12:07:29 +02:00
Brad Hefta-Gaub
8322631a6d
Merge pull request #11695 from luiscuenca/case6719
6719 Avatar attachment window will update when attachments are modified
2017-10-27 17:01:05 -07:00
Brad Hefta-Gaub
d61ede2a4e
Merge pull request #11697 from ElderOrb/FB8211
8211 Add very short haptic feedback when highlighting letters on keyboard
2017-10-27 13:26:41 -07:00
Zach Fox
5ab737f66d
Merge pull request #11658 from zfox23/pop_dynamicTestsMaster
Commerce: Owner Verification for Certified Entities
2017-10-27 12:28:04 -07:00
Zach Fox
9481824d0a Fix enabled status of wear button 2017-10-26 17:02:09 -07:00
beholder
6093cef6f0 add comments to explain '-1' 2017-10-27 01:25:26 +03:00
beholder
f6fa85fed2 adjust to coding standards 2017-10-27 01:25:25 +03:00
Zach Fox
3e95484c4c Merge branch 'master' of https://github.com/highfidelity/hifi into stagingSetting 2017-10-26 13:58:50 -07:00
beholder
5969e0b118 8211 Add very short haptic feedback when highlighting letters on keyboard 2017-10-26 23:03:06 +03:00
luiscuenca
f0eab58ebd Bug 6719 fixed 2017-10-26 09:41:24 -07:00
Ken Cooke
4eb8b826c2 Merge pull request #11681 from luiscuenca/case6443
6443 Audio Menu Sample Sound won't play while domain is loading
2017-10-26 08:40:30 -07:00
luiscuenca
3d3077978e Simplyfied and fixed null pointer 2017-10-25 18:47:10 -07:00
luiscuenca
a1c9285c90 Fixed bug on case 6443 2017-10-25 13:13:50 -07:00
Zach Fox
14150c09ac Merge branch 'master' of https://github.com/highfidelity/hifi into stagingSetting 2017-10-25 12:59:36 -07:00
Brad Hefta-Gaub
18a74cea91 Merge pull request #11659 from zfox23/mergeRC57IntoMaster_20171023
2017-10-23: Merge RC57 into Master
2017-10-24 21:19:01 -07:00
Zach Fox
7998984d8e Missed tons of spots! 2017-10-24 14:30:47 -07:00