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
Cristian Luis Duarte
1a967e45a6
Android View control - Remove limit, use a scale filter, remove deadZone to increase sensitivity
2018-04-04 21:54:12 -03:00
Dante Ruiz
31783726a8
fix toolbar disappearing
2018-04-04 16:30:06 -07:00
Cristian Luis Duarte
ffb8b0a60e
Android fly - Use new asset and screen position
2018-04-04 18:19:01 -03: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
Cristian Luis Duarte
88c83f3bfe
Merge remote-tracking branch 'hifi/master' into android_jump
2018-04-03 19:59:21 -03: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
Seth Alves
a1ce9481bb
Merge pull request #12739 from druiz17/fix-mapping-mistake
...
map flying down back to C key
2018-04-03 12:39:46 -07:00
Cristian Luis Duarte
cbf13c9f8c
Merge remote-tracking branch 'hifi/master' into android_jump
2018-04-03 16:12:17 -03:00
Cristian Luis Duarte
1ea056a8a9
Android - Initial Jump button implementation
2018-04-03 16:07:40 -03: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
e738274e90
map flying down back to C key
2018-03-29 11:10:39 -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
David Rowe
1bcb9738f0
Miscellaneous fixes noticed in passing
2018-03-28 12:26:08 +13: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
John Conklin II
7c505a0b85
Merge pull request #12711 from sethalves/serverless-tutorial-rc66
...
Serverless tutorial rc66
2018-03-27 11:17:07 -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
Zach Fox
db2f3451bd
Support .content.zip content sets
2018-03-26 16:20:29 -07:00
Zach Fox
bf48ecda6d
Fix cert location for content sets
2018-03-26 14:48:05 -07:00
Stephen Birarda
787947b6a8
add a default tutorial json for dev interface
2018-03-26 14:32:26 -07:00
Zach Fox
a588776b47
Fix infinite loading when authing wallet during Checkout
2018-03-26 13:19:40 -07:00
Dante Ruiz
1f23e7ab8b
fixing more edge cases
2018-03-26 10:15:15 -07:00
Dante Ruiz
b8796db1e5
Merge branch 'master' of github.com:highfidelity/hifi into remap-keybaord
2018-03-26 09:13:58 -07:00
Cristian Luis Duarte
6cb5cd7f92
Merge remote-tracking branch 'hifi/master' into android_ui_not_move_camera
2018-03-26 11:19:42 -03:00
vladest
56150f8962
Merge branch 'master' into move_to_qqc2
2018-03-24 15:34:49 +01:00
vladest
e0593b7799
Use Flickable instead of ScrollView
2018-03-24 15:32:46 +01:00
vladest
aefda9ef71
Merge branch 'master' into move_to_qqc2
2018-03-24 15:32:04 +01:00
Dante Ruiz
96707a2568
fix mappoing conflicts
2018-03-23 16:43:36 -07:00
Cristian Luis Duarte
686af4ff77
Clean code that manually checked for windows coordinates to disable radar touch
2018-03-23 20:02:51 -03:00
Cristian Luis Duarte
242b009562
Android - Use mouse events for interacting with UI. Now LoginDialog UI interation does not move radar camera. Remove repeated tooggle call in audio.js. Adapt button to simulated mouse events.
2018-03-23 18:59:55 -03:00
Dante Ruiz
28e61bcbb1
fix typo
2018-03-23 11:57:01 -07:00
Dante Ruiz
a14d5c6546
make alternate keys work
2018-03-23 11:55:16 -07:00
John Conklin II
563ff61325
Merge pull request #12661 from SamGondelman/android
...
Android: Stats, disable IK, reduce impact of InputRecorder
2018-03-23 11:08:50 -07:00
John Conklin II
c61ed697df
Merge pull request #12552 from vladest/assetbrowser_cosmetics
...
Wrap text in query dialogs. Add right margins for input field and but…
2018-03-22 17:56:47 -07:00
Dante Ruiz
1d17658c80
Merge branch 'master' of github.com:highfidelity/hifi into remap-keybaord
2018-03-22 16:29:16 -07:00
Howard Stearns
113670e33b
Merge pull request #12638 from zfox23/commerce_upgrades_1
...
Commerce: Item Updates!
2018-03-22 15:40:22 -07:00
Liv Erickson
1244559618
remove spaces for clean-ness
2018-03-22 15:37:12 -07:00
Liv Erickson
0647155c30
re-add experimental image removal
2018-03-22 15:33:23 -07:00
Liv Erickson
f62e1ed54e
disable add button on model until text is entered
2018-03-22 15:29:41 -07:00
Sam Gondelman
bbded2215d
Merge pull request #12665 from gcalero/android_bottombar_resize
...
Android - Resize bottombar after window size changes (to always fill …
2018-03-22 11:15:02 -07:00
John Conklin II
b6920a503c
Merge pull request #12618 from vladest/hificonstants_as_object
...
Hificonstants as object
2018-03-22 11:03:05 -07:00
Dante Ruiz
86cd5ffa30
Merge branch 'master' of github.com:highfidelity/hifi into remap-keybaord
2018-03-21 08:49:25 -07:00
Zach Fox
0b810c3aa8
Various fixes
2018-03-19 14:39:50 -07:00
John Conklin II
47437c9564
Merge pull request #12651 from ctrlaltdavid/21799
...
Fix "text" overlay not clipping to right and bottom margins
2018-03-19 14:12:20 -07:00
Zach Fox
18aa95e0bb
New Checkout flow for updating specific Editions
2018-03-19 13:35:27 -07:00
Zach Fox
daa68768b9
Merge branch 'master' of github.com:highfidelity/hifi into commerce_upgrades_1
2018-03-19 12:18:10 -07:00
Sam Gondelman
b96f398274
Merge pull request #12593 from gcalero/android_joystick_rotate_move
...
Android joystick rotate move
2018-03-16 17:24:15 -07:00
Dante Ruiz
652faaa116
fixing AddressManager keyboard when switching domains
2018-03-16 16:32:37 -07:00
Dante Ruiz
1dcdcffa69
hopefully the last fix
2018-03-16 13:52:08 -07:00
Zach Fox
a792bcc3d3
Merge branch 'master' of github.com:highfidelity/hifi into commerce_upgrades_1
2018-03-16 13:24:17 -07:00
Zach Fox
eb8cfcd8e9
Bugfix
2018-03-16 13:13:38 -07:00
Zach Fox
ad33e775f1
Fix bottom anchor for listView when banner is showing
2018-03-16 11:28:03 -07:00
Cristian Luis Duarte
e6a8b322b1
Android bottom bar - remove extra semicolon
2018-03-16 15:15:00 -03:00
Cristian Luis Duarte
18682d854c
Android bottom bar - Put height up at the top of the Item definition it's clearer where relocateAndResize gets its height from
2018-03-16 15:06:12 -03:00
Cristian Luis Duarte
79ff2df860
Android - Resize bottombar after window size changes (to always fill the screen horizontally)
2018-03-16 13:03:50 -03:00
SamGondelman
0fa73c73ce
stats
2018-03-15 16:05:46 -07:00
Zach Fox
eb2f8aa169
New notification flow for item updates
2018-03-15 16:03:49 -07:00
Atlante45
d96f7553d9
Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master
2018-03-15 15:22:43 -07:00
Cristian Luis Duarte
03cbadece5
Merge remote-tracking branch 'hifi/master' into android_joystick_rotate_move
2018-03-15 17:11:40 -03:00
David Rowe
a7cd5a240a
Fix "text" overlay not clipping to right and bottom margins
2018-03-15 17:31:02 +13:00
Zach Fox
2d57c444b6
Don't auto apply 'updatable' filter
2018-03-14 16:02:33 -07:00
Zach Fox
cc4726b24b
Some bugfixes
2018-03-14 15:47:19 -07:00
Zach Fox
f3efdda6b0
Fix content set filter
2018-03-14 14:34:15 -07:00
Zach Fox
6647475f5c
Wrong sign
2018-03-14 11:19:55 -07:00
vladest
387be7415f
WIP: do not push
2018-03-14 19:00:19 +01:00
