NissimHadar
c6580f642a
Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork
2018-02-22 13:45:00 -08:00
Liv
478ec48b63
Merge pull request #12463 from misslivirose/fix/edit-bugs
...
Fix two bugs with Create Menu
2018-02-22 09:43:50 -08:00
vladest
7d7c3bb1f5
Change new material dialog to QQC2
2018-02-22 10:30:42 +01:00
Liv Erickson
aba1cae36d
get rid of magic number
2018-02-21 16:19:50 -08:00
Liv Erickson
68f0c0391a
Initial fix - need a little style fixing
2018-02-21 15:44:23 -08:00
Nissim Hadar
b519ebd6f1
Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork
2018-02-21 12:36:56 -08:00
SamGondelman
4dde178b93
fix new material UI
2018-02-21 10:33:15 -08:00
Seth Alves
220d9abbfc
Merge pull request #12435 from vladest/fix_flickable_tablethome
...
Make sure Flickable for GridView for TabletHome will not flick
2018-02-21 09:21:45 -08:00
Nissim Hadar
6f84e4c977
Moved shadows and ambient occlusion to menu checkboxes.
2018-02-20 23:45:07 -08:00
vladest
c320761900
Merge branch 'master' into move_to_qqc2
2018-02-20 06:01:59 +01:00
Sam Gateau
fd49c0d100
Merge pull request #12401 from SamGondelman/decals
...
Material Entities
2018-02-19 10:58:02 -08:00
vladest
e5f953c103
Make sure Flickable for GridView for TabletHome will not flick
2018-02-17 16:52:32 +01:00
Dante Ruiz
a194c8bc03
Merge branch 'master' of github.com:highfidelity/hifi into fix-qml-tablet-apps
2018-02-15 15:46:16 -08:00
SamGondelman
324eefc914
remove fresnel, add unlit, fix overlays, cleanup
2018-02-14 17:02:07 -08:00
Dante Ruiz
119a7554ee
Prevent add the same tablet url app to the tabletApps list
2018-02-13 14:33:15 -08:00
SamGondelman
4500ed17e7
merge from master
2018-02-13 13:58:39 -08:00
vladest
e8959b4cc0
Merge branch 'master' into move_to_qqc2
2018-02-13 22:01:16 +01:00
SamGondelman
84cd0e1529
wip live material swapping on model entities, model overlays, avatars,
...
and albedo swap on shape entities
2018-02-09 12:00:08 -08:00
SamGondelman
4d4294dd6a
Merge remote-tracking branch 'upstream/master' into decals
2018-02-02 16:50:01 -08:00
SamGondelman
d7f4b033e8
wip finish adding material entity
2018-02-02 16:49:33 -08:00
Elisa Lupin-Jimenez
d7a847930d
added image icon
2018-02-02 10:27:44 -08:00
Elisa Lupin-Jimenez
d390e20139
removed extraneous commenting and image class
2018-02-02 10:27:42 -08:00
Elisa Lupin-Jimenez
fdca8ab93e
added image button to edit.js, working on connecting to cpp
2018-02-02 10:08:39 -08:00
vladest
1c63bcf02e
Merge branch 'master' into move_to_qqc2
2018-01-31 22:13:52 +01:00
Seth Alves
600cc1b48e
Merge pull request #12250 from druiz17/fix-multihighlight
...
Don't manually highlight tablet buttons from swipeview.
2018-01-31 09:33:33 -08:00
Dante Ruiz
be42f0cfb1
finally fix the multihighlighting
2018-01-26 13:24:44 -08:00
Dante Ruiz
f3e20e72cb
really fix multi-highlighing
2018-01-25 15:09:03 -08:00
John Conklin II
e081808ace
Merge pull request #12235 from luiscuenca/assetBrowserFix
...
RC63 Fix Edit/Asset Browser in HMD mode
2018-01-25 09:38:23 -08:00
Dante Ruiz
c73c0487a0
min diff
2018-01-24 16:41:19 -08:00
Dante Ruiz
6149630ccd
don't manually highlight tablet buttons from swipeview, since the tablet button highligh themselves
2018-01-24 16:36:08 -08:00
luiscuenca
29dd24b05f
Fix GoTo app in HMD mode
2018-01-23 15:50:32 -07:00
luiscuenca
fddbf13796
Fix Asset Browser access from Create
2018-01-23 11:12:22 -07:00
vladest
b3b7a7636f
Merge branch 'master' into move_to_qqc2
2018-01-16 21:08:49 +01:00
Melissa Brown
991dad18ba
Merge pull request #12160 from ElderOrb/FB11241
...
FB11241 Changing options in menu causes the title “Menu” to change to…
2018-01-15 10:46:37 -08:00
Zach Fox
6920e57613
Fix 'Browse Avatars' button from Avatar Settings
2018-01-12 13:31:58 -08:00
Alexander Ivash
11e918681a
FB11241 Changing options in menu causes the title “Menu” to change to “root”
...
note: fix is based on removing duplicated top-level menu entry from stack view
2018-01-12 02:08:10 +03:00
vladest
cff80e86b6
Temporarily disable magnification until further notice
2018-01-11 22:18:22 +01:00
vladest
45144bece6
Fix Properties does not fit in Create tab
2018-01-11 22:05:11 +01:00
vladest
d8d12e362f
Merge branch 'master' into move_to_qqc2
2018-01-11 21:55:08 +01:00
Anthony Thibault
8d5e7dbeff
Merge pull request #12140 from hyperlogic/bug-fix/master-snapshot-app-settings
...
Fix for black screen when clicking Settings from Snap app
2018-01-11 09:58:10 -08:00
vladest
b5f3631c21
Merge branch 'master' into move_to_qqc2
2018-01-11 18:54:40 +01:00
Seth Alves
363b9bfe11
Merge pull request #12127 from SamGondelman/freeze
...
Comment out TabletAddressDialog logging of long messages
2018-01-10 18:07:18 -08:00
Anthony J. Thibault
1deb75daf7
Fix for black screen when clicking Settings from Snap app
...
(cherry picked from commit d5e3b97c93
2018-01-10 16:31:51 -08:00
vladest
04d45be0a9
Merge branch 'master' into move_to_qqc2
2018-01-10 21:21:03 +01:00
SamGondelman
a42b0cf485
comment out logging
2018-01-09 14:58:23 -08:00
Melissa Brown
19802b33eb
Merge pull request #12109 from vladest/tablet_page_indicator
...
Page indicator visible only when pages more than one
2018-01-09 14:05:32 -08:00
Seth Alves
87dfe0efc3
Merge pull request #12097 from vladest/tablet_pagination_magnify
...
Tablet pagination magnify
2018-01-09 08:08:02 -08:00
vladest
891663bae9
Page indicator visible only when pages more than one
2018-01-08 23:07:09 +01:00
vladest
00b1d4b0ea
Merge branch 'master' into move_to_qqc2
2018-01-05 23:40:36 +01:00
vladest
02972c92f0
Merge branch 'master' into tablet_pagination_magnify
2018-01-05 19:12:13 +01:00
Seth Alves
2071d42d25
Merge pull request #12088 from ElderOrb/FB11008
...
11008 GoTo app does not focus on address bar when opened
2018-01-05 10:07:36 -08:00
Andrew Meadows
c33c637f07
Merge pull request #12041 from vladest/case_10854_fix_not_loading_dialogs
...
Adopt path to certain Tablet dialogs to new loading subsystem and pat…
2018-01-05 09:07:54 -08:00
vladest
67ca76baa1
Magninfication
2018-01-04 23:11:42 +01:00
Alexander Ivash
7ab7a46530
11008 GoTo app does not focus on address bar when opened
2018-01-04 23:38:10 +03:00
vladest
2fbd0a41b1
Move Slider
2017-12-28 15:39:22 +01:00
vladest
afc3082593
Cleanup. Errors checks
2017-12-28 13:16:51 +01:00
vladest
35fee739c5
Use buttons index
2017-12-27 23:50:15 +01:00
vladest
ffcccacfa5
Selection consistency #2
2017-12-25 23:46:06 +01:00
vladest
cb7472c270
Selection consistency #1
2017-12-25 20:14:31 +01:00
vladest
a497047666
Refactored using new GridView approach
2017-12-23 17:44:26 +01:00
vladest
7985c39f2a
Adopt path to certain Tablet dialogs to new loading subsystem and path resolver
2017-12-21 22:14:15 +01:00
vladest
2bca0939b3
Preliminary proxy model
2017-12-21 19:32:13 +01:00
vladest
d6e1a3ea41
Merge conflicts solved
2017-12-21 09:02:04 +01:00
vladest
79f9b54f6a
Store button list in the resources section of fake item instead of C++ space
2017-12-20 22:59:07 +01:00
vladest
29a17d366e
Merge branch 'master' into move_to_qqc2
2017-12-18 20:57:04 +01:00
vladest
38453afb3b
Create pages and store in global array, makes sure it will not be cleared by garbage collector whe out of scope
2017-12-18 14:56:33 +01:00
vladest
62a762b879
Merge branch 'master' into tablet_home_paginate
2017-12-16 20:32:21 +01:00
vladest
cdb9d72387
Added smart pointer for qml buttons. removed extra modifiers. page changed using left and right buttons
2017-12-16 20:27:19 +01:00
Zach Fox
3764445272
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist
2017-12-13 14:12:08 -08:00
vladest
e052784431
Code style
2017-12-12 14:12:03 +01:00
vladest
cc78fc1f53
Added buttons list mutex protection. Reworked keyboard tablet navigation. no more double selections
2017-12-11 17:50:16 +01:00
Alexander Ivash
cb471582e5
10334 Unable to type in Go To app search bar after UI reappears from moving Avatar
2017-12-10 01:34:03 +03:00
vladest
9b3db0725b
Retreive buttons list from tablet proxy
2017-12-07 22:36:34 +01:00
Zach Fox
b2bafed2bb
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist
2017-12-07 11:21:24 -08:00
vladest
3c11d29a7f
Something intermediate
2017-12-07 19:13:39 +01:00
vladest
fd9539a9e4
Using Flickable signals to remove hover state instead of timer. No more delays
2017-12-02 13:57:12 +01:00
vladest
570be69fcf
Fix warnings after apps closed
2017-12-01 09:52:45 +01:00
vladest
f510b4bcd8
Swipe area expanded to whole tablet. Icons doesnt stick together anymore
2017-11-30 21:10:12 +01:00
vladest
69264a6ea8
Merge with master. Conflicts solved
2017-11-30 15:34:21 +01:00
vladest
8c9e530adf
Merge branch 'master' into move_to_qqc2
2017-11-29 16:33:59 +01:00
MiladNazeri
83d13717fe
Merge pull request #11752 from Menithal/21539
...
21539: Add "None" option in Head Tracking section when "Use Vive in Desktop Mode" is selected
2017-11-27 16:02:01 -08:00
Menithal
693da50a68
21539: Fixed None Checkmark being on Desktop mode
2017-11-27 07:59:04 +02:00
Menithal
5d52b9936b
21539: Updated Logic to match request
2017-11-27 07:42:18 +02:00
Menithal
ba1cd74ffe
21539: Moved Desktop HMD to None
2017-11-26 21:58:16 +02:00
vladest
f20a723a7d
Merge branch 'master' into move_to_qqc2
2017-11-20 17:04:26 +01:00
vladest
6b640bd028
Resolve merge conflicts
2017-11-19 20:52:39 +01:00
Brad Hefta-Gaub
e070033ce4
Merge pull request #11793 from ElderOrb/FB9032
...
9032 - Current display mode can be deselected in the toolbar/tablet menu
2017-11-19 11:25:35 -08:00
Brad Hefta-Gaub
1de6ecec30
Merge pull request #11830 from ElderOrb/FB8244
...
8244 Rename captionColorOverride to captionColor
2017-11-18 14:28:32 -08:00
vladest
19f9af0576
Port avatar preferences
2017-11-18 23:03:52 +01:00
vladest
d92f461f12
Port ControllerSettings
2017-11-18 20:44:52 +01:00
vladest
34fe517c67
Merge conflicts
2017-11-18 18:48:33 +01:00
Zach Fox
7d34b3fe67
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist
2017-11-17 15:45:03 -08:00
vladest
dbd6ec0dff
Port Edit.qml to QQC2 as well as some tablet preferences compinents
2017-11-17 20:46:21 +01:00
Dante Ruiz
4de0fdf7d1
Merge pull request #11768 from ctrlaltdavid/21596
...
Add instructions and cursor to GOTO dialog input
2017-11-17 11:45:40 -08:00
Alexander Ivash
c5d2f598d7
8244 Rename captionColorOverride to captionColor
2017-11-16 15:46:49 +03:00
Brad Davis
26a745be6f
Merge remote-tracking branch 'upstream/master' into feature/qml_whitelist_tablet
2017-11-15 11:59:06 -08:00
vladest
0e53afc346
Merge branch 'master' into move_to_qqc2
2017-11-15 20:53:14 +01:00
Brad Davis
1167be4102
Reverting tablet API rename, cleaning up duplicated code
2017-11-15 11:52:55 -08:00
Dante Ruiz
d83f3152dd
Merge pull request #11809 from ElderOrb/FB8984
...
8984 Opening tablet with "Enter" key displays the audio menu
2017-11-15 11:16:49 -08:00
Zach Fox
c42003a374
Merge pull request #11794 from ElderOrb/FB4684_3
...
4684 Add collapse button on the virtual keyboard
2017-11-14 12:22:42 -08:00
Alexander Ivash
e201e203b8
8984 Opening tablet with "Enter" key displays the audio menu
2017-11-14 22:18:48 +03:00
Brad Davis
8f85c7650b
Make sure loaded components get the right parent context
2017-11-13 14:16:04 -08:00
Brad Davis
5cf9c1bb33
Merge remote-tracking branch 'upstream/master' into feature/qml_whitelist_tablet
2017-11-13 10:48:21 -08:00
vladest
4c1bbdacec
Fix merge conflicts
2017-11-13 16:45:10 +01:00
vladest
0c13c2b6e2
Remove unused QQC1 imports
2017-11-13 16:37:28 +01:00
vladest
50ea08f3d5
VR stylus and laser need longer timeout than mouse
2017-11-11 16:10:00 +01:00
vladest
9dbcff040d
Tune press delay to be able to swipe tablet pages easier
2017-11-11 09:43:34 +01:00
Brad Davis
7bf1b176d7
Renaming Tablet API to Tablets, supporting dev-mode QML loading from filesystem
2017-11-10 14:21:24 -08:00
beholder
fb14e4dc4d
Fixed programmatical lowering of 'TabletAddressDialog'
2017-11-10 21:20:00 +03:00
beholder
87519cd26f
use conditional bindings to avoid intermediate binding states
2017-11-10 19:53:54 +03:00
beholder
908faa1334
refactoring: simplify code & fix the issue with menu-es sometimes losing checked state
2017-11-10 19:53:54 +03: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
Brad Davis
25df649b44
Fix desktop mode script URL injection
2017-11-08 14:55:34 -08:00
David Rowe
c5c1ead400
Fix GOTO dialog's connection status and location not always updating
2017-11-09 10:51:21 +13:00
Brad Davis
1a58aee385
Fix scripting URL injection, I hope
2017-11-08 12:00:29 -08:00
David Rowe
055470296d
Move current location in GOTO dialog and add placeholder text to input
2017-11-08 17:13:40 +13:00
Brad Davis
b7f31eb5b9
Fixing desktop QML loading, tablet clickthrough bugs
2017-11-07 12:42:26 -08:00
Menithal
ac1df7b815
21539: Allow HMD to turned off in Desktop Mode
2017-11-05 01:02:08 +02:00
Brad Davis
d162e1cff6
Whitelist functionality for tablet apps
2017-11-04 15:14:06 -07:00
vladest
659afcc43b
Make page indicators non clickable. Attempt to enable swipe even over buttons
2017-11-03 14:38:46 +01:00
vladest
215e64d702
Merge branch 'master' into tablet_home_paginate
2017-11-01 18:51:01 +01:00
Ryan Downe Karpf
28a99fe685
Merge pull request #11655 from dback2/tabletcontextualmode
...
add a tablet contextual mode flag to HMDScriptingInterface used to keep tablet in place
2017-10-30 08:56:26 -07:00
vladest
b1601dcd4c
fix typo in tablet avatar browser
2017-10-28 12:07:29 +02:00
vladest
505c281cd3
Merge branch 'master' into tablet_home_paginate
2017-10-25 21:19:16 +02:00
Zach Fox
7998984d8e
Missed tons of spots!
2017-10-24 14:30:47 -07:00
Zach Fox
c64c2e17c8
First pass at consolidation
2017-10-24 12:01:05 -07:00
David Back
b5f1793863
add a tablet contextual mode flag to HMDScriptingInterface used to keep tablet in place
2017-10-23 14:21:18 -07:00
vladest
b791dcba7f
Add sound cues to create app
2017-10-22 14:59:53 +02:00
vladest
fa349a694c
Code style fixes
2017-10-20 15:12:09 +02:00
vladest
f2847168a4
Use MouseArea for interacting instead of default one to be able interact in HMD mode
2017-10-13 19:12:42 +02:00
vladest
b965049651
Do not produce sound and highlight on disabled items and menu separators
2017-10-12 18:39:26 +02:00
vladest
145149fedd
Merge branch 'master' into tablet_extended_sounds
2017-10-12 18:01:23 +02:00
vladest
85f2606582
Merge branch 'master' into tablet_home_paginate
2017-10-11 22:16:42 +02:00
vladest
726377db45
Refactor to SwipeView
2017-10-11 22:14:01 +02:00
Dante Ruiz
742cf0debe
Merge pull request #11383 from ElderOrb/case7384
...
7384 On Domains without Edit Access, Create Button Text still Highlights
2017-10-10 14:30:49 -07:00
vladest
999e9aafa9
Merge branch 'master' into tablet_home_paginate
2017-10-08 16:12:07 +02:00
vladest
f2abb369c8
Tablet paginator initial
2017-10-08 16:09:01 +02:00
vladest
e360c1363e
Merge branch 'master' into tablet_extended_sounds
2017-10-02 18:03:49 +02:00
David Rowe
0daa5012ca
Enable toolbar and tablet icons to load from local script directory
2017-09-30 15:00:15 +13:00
vladest
1a2d38e31f
Removed sounds for tablet in and out, added sounds for stylus instead. Added logging for testing semi-pressed laser and keyboard sounds
2017-09-25 17:11:44 +02:00
vladest
4d530ef173
Make sure menu items vill be created even its not visible at the moment. Cleanup warnings on app close
2017-09-22 21:08:34 +02:00
vladest
e26118254f
Implemented Audio injector in Tablet scripting interface. Added missed sound events
2017-09-18 19:40:06 +02:00
vladest
bb214d7bf3
Merge branch 'master' into tablet_extended_sounds
2017-09-17 16:16:03 +02:00
beholder
353bab5277
7384 On Domains without Edit Access, Create Button Text still Highlights
...
(override color in states if captionColorOverride was specified)
2017-09-16 16:50:45 +03:00
vladest
de4f34aacb
Add resizable flag. Use the flag for Create only
2017-09-15 21:49:38 +02:00
vladest
832e4aa5eb
Introducong tablet audio events
2017-09-08 09:51:10 +02:00
anshuman64
94e1545e58
Merge pull request #11298 from ElderOrb/case7382
...
7382 Create Menu does not Work on Tablet
2017-09-06 14:09:41 -07:00
beholder
b5faa8ac56
7382 Create Menu does not Work on Tablet
2017-09-02 18:20:00 +03:00
