Seth Alves
46a741be7b
Merge pull request #12068 from vladest/move_to_qqc2
...
Move to qqc2
2018-04-12 11:26:55 -07:00
John Conklin II
67b1313fb6
Merge pull request #12669 from ElderOrb/FB13143
...
Fix several styling/alignment/overlapping issues in 'Add to world' and 'Rename' dialogs in Asset Browser
2018-04-12 10:34:58 -07:00
John Conklin II
213c35dab4
Merge pull request #12790 from WolfGangS/bugfix/12759-editoverlay-subimage
...
Bugfix for #12759 Overlays.editOverlay not applying subImage property
2018-04-12 10:34:17 -07:00
Zach Fox
0c9d65bc15
Merge pull request #12758 from zfox23/commerce_fixCertificateInfoError
...
Commerce: Fix Certificate Info error
2018-04-11 09:38:43 -07:00
Clément Brisset
c62a701a2d
Merge pull request #12838 from highfidelity/RC66
...
RC66 merge back to master
2018-04-09 13:17:12 -07:00
John Conklin II
890a63afb4
Merge pull request #12833 from ElderOrb/FB14015_RC66
...
Close 'goto' app on pressing 'forward' / 'backward' buttons
2018-04-09 11:42:17 -07:00
Alexander Ivash
faddc556d7
FB14015 - Go To app does not close when selecting forward and back arrows on desktop
2018-04-07 17:57:22 +03:00
Zach Fox
0c48ccefa4
Clean up failResponse to make it better
2018-04-06 11:41:17 -07:00
Zach Fox
af5a68b282
Merge branch 'master' of github.com:highfidelity/hifi into commerce_fixCertificateInfoError
2018-04-06 10:58:32 -07:00
Stephen Birarda
1d76dea9f6
Merge pull request #12818 from highfidelity/RC66
...
Merge back RC66 to master
2018-04-06 10:43:01 -07:00
Alexander Ivash
25a44edfce
fix conditional bindings
...
note: unfortunately there is no way to understand whether the item was anchored as even not anchored item has some anchors
2018-04-06 13:22:27 +03:00
Alexander Ivash
3ce00acd16
rebased to the master
2018-04-06 13:22:27 +03:00
Alexander Ivash
c34a6fd000
Fix styling issues - make TabletQueryDialog more consistent with TabletCustomQueryDialog
2018-04-06 13:22:27 +03:00
Alexander Ivash
91488bbbeb
align combobox to accept/cancel buttons, otherwise stretch to buttons area
2018-04-06 13:22:22 +03:00
Alexander Ivash
557b7ded66
fix for closed query dialogs auto-reopening (FB13962 Import Entity URL Dialogue Box Will not Disappear)
...
Signed-off-by: Alexander Ivash <elderorb@gmail.com>
2018-04-06 03:00:44 +03:00
Alexander Ivash
9ec10bbb7e
Make keyboard's 'raisedHeight' to include 'mirror text' height
...
note: this is necessary becasue all the dialogs rely on 'raisedHeight', so without 'mirror text' they will use wrong keyboard geometry during calculations
2018-04-06 00:18:19 +03:00
WolfGang
787127b149
move subImage recalculation to it's own method
2018-04-04 22:10:54 +01:00
Howard Stearns
3a428bc44f
Merge pull request #12776 from zfox23/fixHmdPreviewAgain_1
...
Fix 'Private' HMD preview texture enable/disable...again
2018-04-04 10:03:18 -07:00
WolfGang
f9bcd23463
make subimage update the image anchors
2018-04-04 17:28:55 +01:00
Seth Alves
2df334c50e
Merge pull request #12663 from ElderOrb/FB12870
...
Fix for not updating checkbox state on 'baking' / 'unbaking'.
2018-04-04 09:03:03 -07:00
Clément Brisset
3d4490f3fd
Merge pull request #12737 from highfidelity/RC66
...
RC66 mergeback
2018-04-03 15:39:16 -07:00
howard-stearns
01d90ea1a5
Introduce safeLoading.
2018-04-03 13:49:09 -07:00
Zach Fox
f20eddefc8
Fix 'Private' HMD preview texture enable/disable...again
2018-04-03 13:46:02 -07:00
Alexander Ivash
ccea3efe1e
FB13789 - Log in/Sign up dialog is missing "Forgot Username?" and "Forgot Password?" links
2018-04-03 21:43:40 +03:00
John Conklin II
53a5261905
Merge pull request #12712 from zfox23/newUpdateCertLocation
...
Fix cert location for content sets; handle .content.zip content sets
2018-04-03 09:10:11 -07:00
Zach Fox
5441767442
Better cert display
2018-04-02 12:22:41 -07:00
Seth Alves
e8a62d2943
Merge pull request #12740 from druiz17/fix-scope
...
Fix name conflict with c++ class and qml file(master)
2018-03-30 15:41:42 -07:00
Zach Fox
32e5e9986f
Merge branch 'master' of github.com:highfidelity/hifi into newUpdateCertLocation
2018-03-30 10:10:43 -07:00
Alexander Ivash
814cfa4587
fix TabletAssetServer
2018-03-30 00:09:28 +03:00
Alexander Ivash
e5da59a62f
FB12870 - Tablet UI ->Asset Browser unresponsive when enabling/disabling "use baked version"
2018-03-29 23:01:59 +03:00
John Conklin II
d6b652bdf3
Merge pull request #12735 from druiz17/RC66
...
Fix name conflict with c++ class and qml file(RC66)
2018-03-29 12:06:15 -07:00
Dante Ruiz
f7a081c9ec
minimize diff
2018-03-29 11:24:31 -07:00
Dante Ruiz
420672a769
fix-qml-confict
2018-03-29 11:24:08 -07:00
Dante Ruiz
0bdf26faaf
minimize diff
2018-03-29 09:29:01 -07:00
Dante Ruiz
8cdb59413d
fix-qml-confict
2018-03-29 09:26:05 -07:00
Liv Erickson
387ff680d5
support deleted scenario
2018-03-28 18:12:30 -07:00
Liv Erickson
b78f00342e
Merge branch 'master' of github.com:highfidelity/hifi into feat/disable-add-without-url
2018-03-28 17:53:42 -07:00
vladest
70ce1b2bf7
Fix invalid scrolling detection
2018-03-28 21:48:44 +02:00
Cristian Luis Duarte
f0bcaa47c8
Merge remote-tracking branch 'hifi/master' into android_ui_not_move_camera
2018-03-28 16:47:21 -03:00
Zach Fox
0175028a88
Ensure location is correctly updated when replacing set from Checkout page
2018-03-28 11:31:51 -07:00
vladest
001b6d23ff
Merge branch 'master' into move_to_qqc2
2018-03-28 20:16:26 +02:00
Zach Fox
ca2fba675d
Merge branch 'master' of github.com:highfidelity/hifi into newUpdateCertLocation
2018-03-28 10:28:32 -07:00
Brad Hefta-Gaub
16df773de4
Merge pull request #12721 from highfidelity/RC66
...
RC66 - Mergeback
2018-03-28 09:55:46 -07:00
John Conklin II
586fb4829c
Merge pull request #12637 from druiz17/fix-asset-server-qml
...
Fix asset server qml sorting
2018-03-28 09:35:53 -07:00
Seth Alves
46fb2033f2
Merge pull request #12574 from druiz17/remap-keybaord
...
changing keyboard mapping
2018-03-27 19:00:05 -07:00
Dante Ruiz
ad9ca0da20
fix tablet version
2018-03-27 16:03:06 -07:00
John Conklin II
a258a330d3
Merge pull request #12676 from druiz17/fix-keyboard
...
fixing AddressManager keyboard when switching domains
2018-03-27 15:34:23 -07:00
John Conklin II
0862f345fe
Merge pull request #12717 from sethalves/workaround-dialog-crash
...
fix -- work around asset-upload dialog crash
2018-03-27 13:35:50 -07:00
Seth Alves
4f7d856a1c
don't free dialogs to avoid crash in setKeyboardRaised
2018-03-27 09:28:55 -07:00
vladest
096b56395e
Fix crash on startup
2018-03-27 18:22:56 +02:00
