John Conklin II
236e75b6c6
Merge pull request #12903 from druiz17/add-more-hmd-data
...
Get the correct device name connect to OpenVr
2018-04-24 13:29:41 -07:00
vladest
60115752ad
Fixed saving after editing
2018-04-21 20:18:24 +02:00
vladest
0e28e41107
Fix various issues with SpinBox-es and Sliders
2018-04-20 19:15:29 +02:00
vladest
b8577bd791
Merge branch 'master' into fix_spinbox
2018-04-20 18:09:16 +02:00
Howard Stearns
6d151f022d
Merge pull request #12910 from zfox23/MS12217_letterboxMessageFix
...
Only dismiss letterbox when clicking on grey areas
2018-04-19 11:47:10 -07:00
vladest
663af09605
Fix SpinBox. attempt 1
2018-04-19 20:43:48 +02:00
Zach Fox
e01e7cc7bc
Be a bit more efficient
2018-04-18 16:34:02 -07:00
Dante Ruiz
9d6fc13a04
Merge branch 'master' of github.com:highfidelity/hifi into more-tablet-changes
2018-04-18 13:06:51 -07:00
Dante Ruiz
a65f5f7917
making tablet changes
2018-04-18 13:06:26 -07:00
Zach Fox
3b8e52ea41
Merge pull request #12862 from zfox23/discovery_April2018
...
Discovery: April 2018 (Huge PR; see description)
2018-04-17 15:11:50 -07:00
Zach Fox
93cf399fd6
Only dismiss letterbox when clicking on grey areas
2018-04-16 15:09:19 -07:00
Zach Fox
02aa8ac566
Bugfixes per QA
2018-04-16 11:53:37 -07:00
John Conklin II
5705bac87f
Merge pull request #12723 from ctrlaltdavid/21801
...
HMD API JSDoc
2018-04-16 11:12:26 -07:00
Zach Fox
ee9519bf1b
Merge branch 'discovery_April2018' of github.com:zfox23/hifi into discovery_April2018
2018-04-16 10:12:34 -07:00
Zach Fox
071bf35683
Merge branch 'master' of github.com:highfidelity/hifi into discovery_April2018
2018-04-16 10:11:44 -07:00
Dante Ruiz
5af1ea54d3
Merge branch 'master' of github.com:highfidelity/hifi into add-more-hmd-data
2018-04-16 10:10:55 -07:00
Sam Gondelman
7c65c9c444
Merge pull request #12888 from SamGondelman/statsAssert
...
Rollback some recent QML changes on Android
2018-04-13 16:35:28 -07:00
SamGondelman
8005547d03
rollback some qml changes on android
2018-04-13 14:28:00 -07:00
John Conklin II
008c7be369
Merge pull request #12787 from druiz17/fix-offscreen-windows
...
hide desktop windows when switching into HMD mode
2018-04-13 12:17:15 -07:00
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
David Rowe
7a9e3388fa
Merge branch 'master' into 21801
2018-04-12 09:48:51 +12:00
Zach Fox
539fd42324
Reduce logging from some Commerce/Discovery features
2018-04-11 09:41:47 -07:00
Zach Fox
feec52b4bb
Cleanup 'Private' HMD Preview State Machine Logic
2018-04-11 09:41:47 -07:00
Zach Fox
dc3e1751cb
Commerce: Gifts
2018-04-11 09:41:47 -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
Zach Fox
095b4ba5f2
Reduce logging from some Commerce/Discovery features
2018-04-10 16:02:58 -07:00
Zach Fox
a2f5891a0b
Cleanup 'Private' HMD Preview State Machine Logic
2018-04-10 16:00:18 -07:00
Zach Fox
ffab27d442
Commerce: Fix Certificate Info error
2018-04-10 15:54:55 -07:00
Zach Fox
a9b9a1cb10
Commerce: Gifts
2018-04-10 15:54:19 -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
Dante Ruiz
31783726a8
fix toolbar disappearing
2018-04-04 16:30:06 -07:00
WolfGang
787127b149
move subImage recalculation to it's own method
2018-04-04 22:10:54 +01:00
Dante Ruiz
475a3a29ac
remvoe debug statement
2018-04-04 11:14:53 -07:00
Dante Ruiz
09ced24710
hide desktop windows when switching into HMD mode
2018-04-04 11:05:25 -07: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
