Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-25 09:57:53 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
53340 commits 25 branches 0 tags 1.1 GiB
Commit graph

205 commits

Author SHA1 Message Date
Dante Ruiz
cde9310f3e goto home button fix 2017-04-07 21:35:28 +01:00
Dante Ruiz
909fda98a4 git goto button toggle hightlight 2017-04-07 21:01:53 +01:00
Dante Ruiz
a89081601c fix merge issues 2017-04-06 22:31:47 +01:00
Dante Ruiz
52fd446d4d toggle goto in tablet 2017-04-06 22:27:37 +01:00
Seth Alves
3c6429cdf3 Merge pull request #10103 from vladest/master-qml-bugfixes 
Master qml bugfixes
 2017-04-06 14:22:06 -07:00
Dante Ruiz
34f3c4abee removed mousearea 2017-04-05 18:08:03 +01:00
Dante Ruiz
de8b7eeb27 removed commented code 2017-04-05 18:02:55 +01:00
Dante Ruiz
24b89275f2 fix new model dialog textInput 2017-04-05 18:00:43 +01:00
Seth Alves
fbf2014f04 Merge pull request #10102 from vladest/tablet-ui-goto 
Put current address to location instead of inputfield
 2017-04-03 16:09:58 -07:00
Vladyslav Stelmakhovskyi
156166ce4a Fixed another warning in TabletAddressDialog.qml 
(cherry picked from commit 73c923bb522ad711380a2fcdaa9babe9f01a639a)
 2017-04-03 19:33:13 +02:00
Vladyslav Stelmakhovskyi
9e96888534 Fixed warning: TabletAddressDialog.qml:546: Error: Cannot assign to non-existent property 'shown' 
(cherry picked from commit e70c2cdcc74f9fd43273dca268433cdefd9ecf40)
 2017-04-03 19:32:09 +02:00
Vladyslav Stelmakhovskyi
6b7f3f7125 Fixed warning: TabletAddressDialog.qml:282:13: QML ListView: Cannot specify top, bottom, and verticalCenter anchors at the same time. 
(cherry picked from commit b11e245cb1b19149ff00f16b718ff4088b856f3e)
 2017-04-03 19:32:09 +02:00
Vladyslav Stelmakhovskyi
849d65f95f Fixed warning: Tablet.qml:205: TypeError: Cannot read property of null 
(cherry picked from commit b1dc14b355bc6053a0e264a057a799a4d446e347)
 2017-04-03 19:32:09 +02:00
Vladyslav Stelmakhovskyi
d207dae5b7 Put current address to location instead of inputfield 2017-04-02 20:02:40 +02:00
Dante Ruiz
9658e1b8ac better web view handling 2017-03-31 19:25:03 +01:00
Dante Ruiz
8f402c73b0 saving work 2.0 2017-03-31 01:18:31 +01:00
Dante Ruiz
cb8660c699 saving work 2017-03-30 01:34:14 +01:00
Vladyslav Stelmakhovskyi
9822193644 Set z-order of comboboxes to make sure lowest will no overlap higher ones 2017-03-29 14:41:18 +02:00
Dante Ruiz
a76e5ef8d9 improve the design of the tablet goto 2017-03-28 23:02:23 +01:00
Dante Ruiz
b8eac7abef revoming useless code 2017-03-27 16:17:50 +01:00
Dante Ruiz
2a59139c76 trying to fix focus issue 2017-03-25 01:17:37 +01:00
Dante Ruiz
9e2768cc84 saving work 2017-03-25 01:06:21 +01:00
Dante Ruiz
d9046a1982 goto on the tablet 2017-03-24 23:54:54 +01:00
Dante Ruiz
a078121c46 saving work 2017-03-24 00:23:13 +01:00
Dante Ruiz
ae111ff2e9 Merge branch 'tablet-goto' of github.com:fayeli/hifi into tablet-goto 2017-03-23 18:25:31 +01:00
Dante Ruiz
af97c7275e Use loadQMlSource if no stack is aviable 2017-03-23 17:03:24 +01:00
Faye Li
9cab8b6c4a end of day commit 2017-03-20 17:04:29 -07:00
Faye Li
1d095b8158 added back forward and back button on nav bar 2017-03-20 15:57:59 -07:00
Faye Li
b6bf58d5be rearrange layout of main tablet go to screen 2017-03-20 15:28:30 -07:00
Seth Alves
2e29ff3114 Merge pull request #9934 from fayeli/edit-import-entities 
Adding Import Entities button on the Create tab of Edit
 2017-03-20 09:13:08 -08:00
Vladyslav Stelmakhovskyi
5335bf8862 Menu items in Tablet UI now wrapped 2017-03-18 15:58:16 +01:00
Faye Li
33a7ff825e indicate expecting json file on button text 2017-03-17 11:37:38 -07:00
Faye Li
6531efffbc hook up qml button to edit.js 2017-03-17 11:22:07 -07:00
David Rowe
07e4b0ce41 Fix title menu icon getting stuck on white 2017-03-17 11:28:14 +13:00
David Rowe
069e66b875 Fix stack functions 2017-03-17 11:19:50 +13:00
David Rowe
f1947769d6 Fix tablet settings dialogs' titles and make QML consistent 2017-03-17 11:15:56 +13:00
Faye Li
10ebb6efd7 simplify asset server button 2017-03-15 16:55:21 -07:00
Faye Li
42216b6986 create import entities button on create tab 2017-03-15 16:47:31 -07:00
Anthony J. Thibault
3a788d31de Tablet Running Scripts dialog fixes 
* The "Currrently Running" section is now visible by default, this includes the "Reload All" and "Remove All" buttons
* The entire dialog is flickable/scrollable.  We need to do this because the entire dialog is too tall to fit on the tablet.
* The keyboard now appears when the filter edit text has focus.
  The content is scrolled in such away that the focus edit field, and the tree view are above the keyboard.
 2017-03-14 15:38:53 -07:00
Dante Ruiz
4c686eaa67 fix tablet menu stack focus issue 2017-03-14 21:20:41 +01:00
Vladyslav Stelmakhovskyi
0accce5337 TabletComboBoxPreference.qml not needed anymore 2017-03-14 15:53:41 +01:00
Vladyslav Stelmakhovskyi
ee7dd458ca Merge branch 'tablet-ui' into tablet-ui-graphics 2017-03-14 15:37:36 +01:00
Seth Alves
f8a6a82371 Merge pull request #9881 from ctrlaltdavid/21197 
Browse for avatar in Marketplace from tablet avatar settings dialog
 2017-03-14 05:33:11 -08:00
David Rowe
43687d4773 Tidying 2017-03-14 21:41:04 +13:00
David Rowe
d141d5b683 Add keyboard 2017-03-14 21:36:57 +13:00
David Rowe
f3a99a2437 Implement avatar browser for tablet avatar settings 2017-03-14 15:36:51 +13:00
David Rowe
01c313ad60 Fix QML errors 2017-03-14 13:33:20 +13:00
David Rowe
4dd7667fd7 Merge branch 'tablet-ui' into 21209 
# Conflicts:
#	interface/resources/qml/hifi/tablet/tabletWindows/TabletPreferencesDialog.qml
#	interface/src/ui/overlays/Web3DOverlay.cpp
 2017-03-14 08:50:01 +13:00
Seth Alves
4f71a5b234 Merge pull request #9864 from vladest/tablet-ui-lod-settings 
Add LOD settings to Tablet UI
 2017-03-13 08:59:40 -08:00
Vladyslav Stelmakhovskyi
d70943dd6c Add Graphics preferences to Tablet. Use TabletComboBox instead of desktop ComboBox for Tablet preferences 2017-03-11 12:23:31 +01:00