Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-05-08 06:38:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
44507 commits 25 branches 0 tags 1.1 GiB
Commit graph

717 commits

Author SHA1 Message Date
howard-stearns
b22844dc97 Merge branch 'master' of https://github.com/highfidelity/hifi into button-state 2016-06-30 16:24:36 -07:00
howard-stearns
ff55644fe8 stateful hud toolbar buttons 2016-06-30 16:24:11 -07:00
Brad Davis
5a9be817df PR comments 2016-06-29 10:28:55 -07:00
Brad Davis
962f9d5f22 Don't update the shown state of the tool window when it's already invisible 2016-06-28 18:10:06 -07:00
howard-stearns
68be819ea2 fix crash when hmd context menu triggers a modal 2016-06-27 14:07:13 -07:00
Brad Davis
f90a351400 Don't reposition windows prior to selecting the initial display plugin 2016-06-24 16:31:24 -07:00
howard-stearns
baa9139881 Merge branch 'vive-ui' of https://github.com/highfidelity/hifi into vive-ui 2016-06-21 17:02:23 -07:00
Brad Davis
f3bad3a63b Don't trigger keyboard on revealing the overlay layer 2016-06-21 16:04:06 -07:00
howard-stearns
8421931c56 Merge branch 'master' of https://github.com/highfidelity/hifi into vive-ui 2016-06-21 14:47:45 -07:00
Brad Davis
0bc4beeffd Fix initial toolbar positioning 2016-06-20 17:09:30 -07:00
Brad Davis
37e9f66639 Additional toolbar work 2016-06-20 15:41:21 -07:00
Bradley Austin Davis
ec615caa80 Support toolbar API 2016-06-17 13:06:42 -07:00
Bradley Austin Davis
33e9caa636 Simplify overlay conductor, menu interation 2016-06-15 17:24:39 -07:00
Bradley Austin Davis
71bf9384ce Merge remote-tracking branch 'upstream/master' into vive-ui 2016-06-15 10:45:51 -07:00
David Rowe
3c2b98b15a Let user choose an existing file in the file save dialog 2016-06-15 11:28:38 +12:00
Brad Hefta-Gaub
1c391e626f Merge pull request #8054 from ctrlaltdavid/20957 
fix model export continued
 2016-06-14 10:57:25 -07:00
Bradley Austin Davis
175dbb8924 Merge remote-tracking branch 'upstream/master' into vive-ui 2016-06-14 09:48:56 -07:00
Brad Hefta-Gaub
7da29daf9d Merge pull request #8036 from ctrlaltdavid/20955 
Fix image2d overlay color property
 2016-06-13 19:21:59 -07:00
Brad Davis
0ddee876c3 Merge remote-tracking branch 'upstream/master' into vive-ui 2016-06-13 13:03:46 -07:00
David Rowe
098432152d Merge branch 'master' into 20957 2016-06-13 16:16:12 +12:00
David Rowe
f7578f084f Fix buttons on warning message box when can't export a file 2016-06-13 15:21:59 +12:00
David Rowe
546699da03 When choosing a directory default selection to default directory 2016-06-13 15:06:10 +12:00
David Rowe
d74f1c8b5d Fix default directory for Settings directory preference fields 2016-06-13 14:51:14 +12:00
Brad Hefta-Gaub
92909af52c Merge pull request #8044 from ctrlaltdavid/20957 
fix model export
 2016-06-12 19:43:51 -07:00
Brad Davis
472a3540d7 Merge remote-tracking branch 'upstream/master' into vive-ui 
Conflicts:
	scripts/system/controllers/handControllerGrab.js
 2016-06-10 10:43:09 -07:00
David Rowe
5352bd4b76 Fix height of Load Defaults button 2016-06-09 17:15:17 +12:00
David Rowe
cf6945b403 Fix selecting directory directly from dropdown 2016-06-09 17:11:00 +12:00
David Rowe
4176940e24 Don't highlight first drive in table when choose "This PC" from dropdown 2016-06-09 17:02:43 +12:00
David Rowe
d346d4c731 When choosing a directory make the dropdown update the path value 2016-06-09 16:41:51 +12:00
David Rowe
b4543cc579 Unhighlight directory in table when type filename to save 2016-06-09 16:29:15 +12:00
David Rowe
3780b18cc0 Fix a QML error 2016-06-09 15:15:32 +12:00
David Rowe
0ef13e6c01 Fix action button label to be "Save" when saving a file 2016-06-09 15:15:31 +12:00
David Rowe
4ae018400d Give table focus after using dropdown 2016-06-09 15:15:30 +12:00
David Rowe
358355cfbf Clear file selection and disabled Open button when change directory 2016-06-09 15:15:29 +12:00
Brad Davis
0565d3aea1 Merge remote-tracking branch 'upstream/master' into vive-ui 2016-06-08 14:59:58 -07:00
Howard Stearns
bf48099286 Merge pull request #8032 from jherico/pin-button 
Add a constant hud toggle button to the UI
 2016-06-08 10:33:11 -07:00
Brad Hefta-Gaub
d0e946c907 Merge pull request #8034 from ctrlaltdavid/20953 
fix colors of buttons in Asset Browser dialog
 2016-06-08 07:47:34 -07:00
Brad Davis
ca6e86e767 Merge remote-tracking branch 'upstream/master' into vive-ui 
Conflicts:
	interface/resources/qml/hifi/dialogs/RunningScripts.qml
 2016-06-07 21:51:47 -07:00
David Rowe
f9d6a7ba8d Fix image2d overlay color property 2016-06-08 14:04:02 +12:00
David Rowe
a87483dfff Fix colors of buttons in Asset Browser dialog 2016-06-08 10:55:14 +12:00
Brad Davis
ba61491ee6 PR feedback 2016-06-07 15:33:00 -07:00
Brad Davis
b9ee0c087e Add a constant hud toggle button to the UI 2016-06-07 13:45:23 -07:00
David Rowe
b6af46cac9 Add "Load Defaults" button to Running Scripts dialog 
And rename "Stop All" to "Remove All".
 2016-06-07 11:30:07 +12:00
Brad Davis
4e49f3f942 Fix browser and update dialogs 2016-06-02 19:54:25 -07:00
Brad Davis
e9b359feb1 Make QML overlays disappear, use fade for non-window types 2016-06-02 19:15:19 -07:00
Brad Davis
ed5d904b3d Hide overlays when driving 2016-06-02 17:24:26 -07:00
Brad Davis
8c13ff4ee1 Pinned UI support 2016-06-02 17:24:25 -07:00
David Rowe
b65938b631 Adjust default and minimum sizes 2016-06-01 16:23:26 +12:00
David Rowe
c4aed1ce06 Remove "Open Folder" button 2016-06-01 16:16:08 +12:00
David Rowe
4da1c0ac4d Click on blank part of dialog to deselect item 2016-06-01 14:25:07 +12:00