Commit graph

61562 commits

Author SHA1 Message Date
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
Olivier Prat
8b6a2eeb24 Merge branch 'master' of git://github.com/highfidelity/hifi into shadow 2017-11-10 10:19:32 +01: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
Anthony Thibault
de9eeff7d2
Merge pull request #11783 from hyperlogic/bug-fix/rig-skeleton-dangling-pointer
Fix for address sanitizer warning
2017-11-09 14:19:03 -08:00
David Kelly
31dc140ea6
Merge pull request #11771 from zfox23/commerce_seedingFrontend
Commerce: Seeding Frontend
2017-11-09 14:45:10 -07:00
Ken Cooke
c324f342b4 Fix to check ANDROID before UNIX 2017-11-09 13:39:13 -08: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
Elisa Lupin-Jimenez
119c662899 fixed null file path in file dialog call 2017-11-09 11:46:19 -08:00
luiscuenca
10f484c668 6944 Avatar scale is saved across domains 2017-11-09 12:21:23 -07:00
Anthony J. Thibault
9724a5e5b8 Fix for address sanitizer warning
This fixes a potential null pointer dereference.
2017-11-09 10:53:36 -08:00
Ken Cooke
9a1386bf0d Fix build errors on Linux 2017-11-09 10:34:52 -08:00
Anthony J. Thibault
5507bcea3c Remove hack for missing inttypes.h header on VS2010 2017-11-09 10:34:01 -08:00
Olivier Prat
4f7ed38e98 Fixed potential link errors on Mac 2017-11-09 11:26:08 +01:00
Ken Cooke
6d019b4302 Update the audio codecs 2017-11-08 18:16:42 -08:00
Clément Brisset
40baca6ee1
Merge pull request #11756 from ctrlaltdavid/21592
Fix import from URL adding multiple copies of imported entities
2017-11-08 18:01:48 -08:00
Clément Brisset
57202126ae
Merge pull request #11766 from ctrlaltdavid/21595
Label models.json.gz paths in server Content tab with operating system
2017-11-08 18:00:06 -08: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
Seth Alves
b9652dd114
Merge pull request #11775 from misslivirose/feat/emit-scale-change
add skeleton scale change signal so scripts can detect scaling change
2017-11-08 16:57:52 -08:00
Nissim Hadar
7cb9514feb Converted 'Glare Angle' control to a slider. 2017-11-08 16:50:44 -08:00
Nissim Hadar
5a56ea5894 Merge branch 'master' into hazeUIFix 2017-11-08 16:44:59 -08:00
Nissim Hadar
5c7ebc0af3 Converted 'Glare Angle' control to a slider. 2017-11-08 16:44:05 -08:00
Zach Fox
72ba892dbd
Merge pull request #11777 from zfox23/commerce_injectionTempFix
Revert 11728 and fix marketplace JS injection - should revisit
2017-11-08 16:37:57 -08:00
Nissim Hadar
2920c6f9a9 Merge branch 'master' into hazeUIFix 2017-11-08 15:42:20 -08:00
Nissim Hadar
c1b5d00993 Converted 'Background Blend' control to a slider. 2017-11-08 15:41:24 -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
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
Elisa Lupin-Jimenez
45b9a150dc updated blocks url refs in application to fix download issue 2017-11-08 15:21:48 -08:00
Zach Fox
33b6a13a4d Revert 11728 and fix marketplace JS injection - should revisit 2017-11-08 15:21:36 -08:00
Brad Hefta-Gaub
d608d6ebf4
Merge pull request #11763 from Atlante45/new-master
Merge stable back into master
2017-11-08 15:10:06 -08:00
Elisa Lupin-Jimenez
796388dfb4 reverted a line to match current master 2017-11-08 14:50:15 -08:00
Elisa Lupin-Jimenez
e4c7958585 Merge branch 'master' of https://github.com/highfidelity/hifi into blocks 2017-11-08 14:36:07 -08:00
MissLiviRose
45e58b93e5 add skeleton scale change signal so scripts can detect scaling change 2017-11-08 14:23:49 -08:00
Seth Alves
34500fdf18
Merge pull request #11773 from vladest/fix_avatar_new_attachment
Remove checking of empty model url and add sanity for checking modelU…
2017-11-08 14:15:17 -08:00
Zach Fox
38fde43009 ...simplify your life 2017-11-08 13:19:47 -08:00