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

2399 commits

Author SHA1 Message Date
Andrew Meadows
6b3b3a7448 Merge pull request #11382 from ElderOrb/case6618 
6618 [Worklist] Add Input Field On Top of Keyboard
 2017-09-21 08:54:11 -07:00
Ryan Huffman
a56303a3fe Merge pull request #11379 from highfidelity/feat/auto-bake 
Add auto baking to Asset Server and mesh compression for FBXs
 2017-09-21 08:33:51 -07:00
vladest
c48aba423a Rename check box 2017-09-20 22:48:39 +02:00
vladest
7a36894f76 Make sure audio device not gets unchecked 2017-09-19 23:25:41 +02:00
vladest
10f7f08171 Added peak model, missed during merging 2017-09-19 21:42:52 +02:00
vladest
6297448e90 Build fix 2017-09-19 19:49:19 +02:00
vladest
6c32783a09 Merge branch 'master' into audio_devices_split 2017-09-19 17:43:03 +02:00
Seth Alves
765031bf89 Merge pull request #11377 from vladest/create_resize 
Add resizable flag. Use the flag for Create only
 2017-09-16 11:14:40 -07:00
Seth Alves
04b99ef8a5 Merge pull request #11352 from 1P-Cusack/FogBugz/Case_6107 
[QML] Fixes FogBugz Case 6107: Can't sort on import menu (details below).
 2017-09-16 11:08:59 -07:00
beholder
871b169128 6618 [Worklist] Add Input Field On Top of Keyboard 2017-09-16 16:17:36 +03:00
Atlante45
a37642ba44 Pull Auto-Baking changes to TabletAssetServer.qml 2017-09-15 14:43:15 -07:00
Atlante45
c4d018504b Pull Auto-Baking changes to TabletAssetServer.qml 2017-09-15 13:28:51 -07:00
vladest
de4f34aacb Add resizable flag. Use the flag for Create only 2017-09-15 21:49:38 +02:00
Atlante45
8711823a9b Sync up AssetServer.qml and TabletAssetServer.qml 2017-09-15 11:44:08 -07:00
Atlante45
ae14f1f88e Merge branch 'master' of https://github.com/highfidelity/hifi into feat/auto-bake 2017-09-14 15:34:20 -07:00
LaShonda Hopper
24b6cd71fc [Case 6107] Fixes Tablet import sorting (details below). 
This ports the fix from FileDialog to TabletFileDialog.

* There appears to be 2 versions of this file:
    * qml/dialogs/TabletFileDialog.qml
    * qml/hifi/tablet/tabletWindows/TabletFileDialog.qml

Testing the tablet within desktop mode works without this fix most
likely because it uses qml/hifi/tablet/tabletWindows/TabletFileDialog.qml
which didn't receive the same refactor pass via d3282a4e.

Tested on Vive:  Menu -> Edit -> Import Entities

Changes Committed:
	modified:   interface/resources/qml/dialogs/TabletFileDialog.qml
 2017-09-14 14:49:49 -04:00
Seth Alves
10494cf3e0 Merge pull request #11359 from vladest/fix_runningscripts_selection 
use selection model of TreeView
 2017-09-14 11:22:08 -07:00
Seth Alves
11df5a447e Merge pull request #11310 from ElderOrb/case6718 
6718 PR11082: Help text cannot be dismissed by clicking on the text i…
 2017-09-14 11:17:48 -07:00
vladest
7233c47257 use selection model of TreeView 2017-09-14 15:36:12 +02:00
LaShonda Hopper
33c8e90e34 [QML] Fixes FogBugz Case 6107: Can't sort on import menu (details below). 
Looking through the log revealed the following warning:
".../qml/dialogs/FileDialog.qml:489: Error: Cannot assign to non-existent property 'sortOrder'"

There was some refactoring to address some HMD functionality in 51b44d90
which resulted in an update to fileTableView's model.  This appears to be the point
at which sorting stopped working.

This updates the fileTableView's sorting methods to use fileTableModel as opposed
to fileTableView's model(filesModel).  This appears safe given fileTableModel internally wraps
around filesModel and is responsible for updating its value.  I'm relatively new
to QML/Qt; any comments or suggestions are welcome.

Tagging @vladest since they may want to be aware given 51b44d90.

Case Link:
https://highfidelity.fogbugz.com/f/cases/6107

Reviewed-by: Leander Hasty <leander@1stplayable.com>

Changes Committed:
	modified:   interface/resources/qml/dialogs/FileDialog.qml
 2017-09-13 16:25:36 -04:00
Atlante45
c04a6b5b88 Add error tooltip 2017-09-13 09:54:56 -07:00
Atlante45
2e84f48539 Fix QML errors 2017-09-13 09:54:55 -07:00
Atlante45
9f2b0258e9 Update baking status with the correct checkmark glyph 2017-09-13 09:54:55 -07:00
vladest
92a83328c0 Follow naming convention 2017-09-12 19:17:49 +02:00
vladest
08deba35ae Take in account current WebEngine profile to make sure all features are in place, like download 2017-09-12 16:22:53 +02:00
vladest
17a923b9de Temporarily disable WebView flickable until new solution will be investigated 2017-09-12 15:48:47 +02:00
Howard Stearns
54deef8f32 Merge pull request #11329 from davidkelly/dk/walletSSLFix 
fix wallet for new openssl
 2017-09-11 10:07:12 -07:00
Andrew Meadows
a9feca18ca Merge pull request #11317 from vladest/fix_flickable_on_wheel 
Add flickable on mouse wheel to web pages
 2017-09-11 09:32:31 -07:00
David Kelly
1903f65e45 oops 2017-09-08 16:58:12 -07:00
David Kelly
0a3958f743 cr feedback 2017-09-08 16:06:30 -07:00
David Kelly
99cdbbe306 and lets fix the purchases flow too 2017-09-08 14:00:09 -07:00
David Kelly
db0ecb61fd Merge pull request #11325 from davidkelly/dk/UserHfcAccountRework 
Use new hfc account endpoint
 2017-09-08 09:03:53 -07:00
David Kelly
45c8dd9dd4 cr feedback 2017-09-08 05:28:41 -07:00
David Kelly
efdc340c5c Use new hfc account endpoint 2017-09-07 18:15:04 -07:00
Stephen Birarda
5e1decb02b Merge branch 'master' of github.com:highfidelity/hifi into feat/auto-bake 2017-09-07 12:06:53 -07:00
Brad Hefta-Gaub
c5098abfb9 Merge pull request #10937 from kencooke/zzmp-audio/peak-values 
Add peak values for all input devices in selection dialog
 2017-09-07 11:58:50 -07:00
Howard Stearns
a0ae9ee747 Merge pull request #11311 from davidkelly/dk/walletCleanup 
wallet cleanup
 2017-09-06 14:29:24 -07: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
vladest
31a23acb1a Add flickable on mouse wheel to web pages 2017-09-06 23:04:58 +02:00
vladest
e17f05a337 Correct UI 2017-09-06 14:52:08 +02:00
vladest
57643bd904 Merge branch 'master' into audio_devices_split 2017-09-06 14:20:41 +02:00
David Kelly
89cda8d306 oops -- === not == 2017-09-05 17:15:25 -07:00
David Kelly
1fd30b1e0f fix passphrase reset 2017-09-05 17:03:11 -07:00
David Kelly
350cee5f35 Wallet cleanup 2017-09-05 16:33:16 -07:00
beholder
41d014ca0c 6718 PR11082: Help text cannot be dismissed by clicking on the text inside the box. 2017-09-06 02:11:40 +03:00
vladest
85a3771a98 Remove commented out code 2017-09-05 22:19:38 +02:00
vladest
dd6d530853 Merge branch 'master' into flickable_web_pages 2017-09-05 22:14:52 +02:00
Dante Ruiz
e69227aef8 Merge pull request #11209 from vladest/tablet_login_button 
Added login button to Tablet
 2017-09-05 12:59:02 -07:00
David Kelly
3bc45aefb1 Reset passphrase fix 2017-09-05 10:04:16 -07:00
beholder
b5faa8ac56 7382 Create Menu does not Work on Tablet 2017-09-02 18:20:00 +03:00