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

1072 commits

Author SHA1 Message Date
Zander Otavka
b8398944ac Fix QML warnings 2016-07-18 13:09:32 -07:00
Zander Otavka
06985f9278 Make combo box go by index, add default values 2016-07-18 12:06:11 -07:00
Zander Otavka
6bd7034c1a Improve scaling of components in dialog 
CustomQueryDialog now better handles the absence of one or more input
fields and scales appropriately.
 2016-07-18 11:14:45 -07:00
Howard Stearns
cf025072e1 Only consider "active" domains for all purposes (which on the back end means at least one person connected). 2016-07-16 09:50:56 -07:00
Howard Stearns
d446e1bcf5 Phone home with suggestions activity usage. 2016-07-15 19:15:58 -07:00
Zander Otavka
c27e1d6fdb Polish dialog behavior and spacing 2016-07-15 17:35:55 -07:00
Zander Otavka
71f62c02fc Add basic implementation of customPrompt 
Still missing the warning and diabling of dynamic checkbox when the
static mesh is selected.
 2016-07-15 17:35:55 -07:00
Brad Davis
9ebc0c28c8 Fix hover states for toolbar buttons 2016-07-15 17:12:49 -07:00
howard-stearns
f73c2b884d Remove now-superflous Column. 2016-07-15 17:01:37 -07:00
howard-stearns
f00114e53e Make it work with laser pointers (selection at least), and fix magic 
numbers.
 2016-07-15 16:46:20 -07:00
Brad Davis
317dee1b23 Fix decoration inflation 2016-07-15 16:15:53 -07:00
howard-stearns
99e9a76803 Merge branch 'master' of https://github.com/highfidelity/hifi into suggestions 2016-07-15 16:14:48 -07:00
howard-stearns
289617d4ce styling 2016-07-15 16:14:29 -07:00
howard-stearns
cc367f7b49 We don't need HorizontalSpacer.qml. 2016-07-15 14:56:31 -07:00
howard-stearns
562446e7b8 use AddressManager, rather than adding a trampoline to hostname in 
AddressBarDialog.
 2016-07-15 14:44:27 -07:00
howard-stearns
87e54482dd check pictures only for the domains that have someone in them, but use all 
domains when filtering (occupied or no, picture or no).
Also, make darn sure we use default picture if no data.
 2016-07-15 14:30:28 -07:00
howard-stearns
6fb2cedfe0 card default image: settable, use to start, and reset when needed 2016-07-15 13:42:31 -07:00
Brad Hefta-Gaub
574aaa9f28 Merge pull request #8248 from jherico/edit_toolbar 
Migrate edit.js toolbar to the new toolbar API
 2016-07-15 12:42:13 -07:00
howard-stearns
99e229467b Don't show the word "suggesions" when there aren't any. 2016-07-15 11:49:21 -07:00
howard-stearns
8faa961c8d all domains, not just the 'active' ones, which turns out to be defined as 
having at least one person in it.
 2016-07-15 11:41:00 -07:00
howard-stearns
e974bad8f0 Merge branch 'master' of https://github.com/highfidelity/hifi into suggestions 2016-07-15 10:36:19 -07:00
howard-stearns
ce99146733 filter by typing 2016-07-15 10:27:52 -07:00
Brad Davis
43e045c22a Restore mouseover events for items in windows 2016-07-14 17:40:05 -07:00
Brad Davis
a6d71f508e Fix edit toolbar button vanishing, persistent edit button 2016-07-14 17:40:04 -07:00
Brad Davis
fdcbf71623 Remove fade effect from toolbar buttons 2016-07-14 17:40:02 -07:00
howard-stearns
1c2d13d1ee Don't show where you are now. 2016-07-14 15:38:22 -07:00
howard-stearns
3132cca482 prototype 2016-07-14 14:49:03 -07:00
Brad Davis
656da16c4d Remove highlight animation duration on menus 2016-07-14 10:30:36 -07:00
James B. Pollack
aacddcf66d fix pop ups 2016-07-13 15:02:51 -07:00
James B. Pollack
c3c9c0cb10 update so HTML5 media apis work again 2016-07-13 14:37:41 -07:00
Brad Davis
6336362d40 Fixing decoration inflation 2016-07-12 17:23:13 -07:00
Brad Davis
f2220288fb Expand frame decoration when mouse is over a window in HMD mode 2016-07-12 16:40:53 -07:00
Brad Hefta-Gaub
b8d79ec263 Merge pull request #8179 from SamGondelman/snapshotFix3 
Various snapshot improvements
 2016-07-12 15:28:51 -07:00
Brad Hefta-Gaub
bcee128de0 Merge pull request #6959 from Triplelexx/20769 
CR for Job #20769 - Touchscreen camera input for Interface
 2016-07-11 14:24:52 -07:00
Brad Davis
829a871d6f Merge pull request #8208 from SamGondelman/qmlFixes 
Fixed issues in Browser.qml and UpdateDialog.qml
 2016-07-07 19:51:37 -07:00
SamGondelman
99fc472d77 fixed errors in Browser.qml and UpdateDialog.qml 2016-07-07 14:06:57 -07:00
Brad Davis
23700dc90f Ensure newly shown windows are popped to the top of the zorder 2016-07-07 13:16:59 -07:00
SamGondelman
b3513b543c fixed snapshot path setting 2016-07-05 18:23:59 -07:00
Ryan Downe Karpf
7eb07cba4c Merge pull request #8171 from jherico/qml_fixes 
Keyboard focus polish for Vive UI
 2016-07-01 16:20:36 -07:00
howard-stearns
1ad9cfde99 make hud button participate in buttonState just like other toolbar 
chicklets
 2016-07-01 13:54:00 -07:00
howard-stearns
71c44f4f93 Merge branch 'master' of https://github.com/highfidelity/hifi into button-state 2016-07-01 13:05:32 -07:00
howard-stearns
02cc6cc567 hover states 2016-07-01 12:18:26 -07:00
SamGondelman
218b26b521 removed snapshot share dialog, ctrl s shouldn't leave you moving 2016-07-01 10:58:55 -07:00
Sam Gondelman
af67d814eb Merge pull request #8163 from ctrlaltdavid/20981 
distinguish between file name and directory as prompt in file chooser
 2016-07-01 10:39:32 -07:00
howard-stearns
125f6d8b63 Merge branch 'master' of https://github.com/highfidelity/hifi into button-state 2016-06-30 16:49:19 -07:00
James B. Pollack
3b57fd1faf Merge pull request #8173 from SamGondelman/snapshotFix2 
Fix snapshot dialog rendering
 2016-06-30 16:48:43 -07:00
howard-stearns
f03f5f3e68 new icons 2016-06-30 16:47:10 -07:00
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
SamGondelman
69ffd63ba7 fix snapshot sharing window 2016-06-30 15:42:48 -07:00
Brad Davis
167cb72a0e Don't auto-focus the filter field in running scripts 2016-06-30 15:18:59 -07:00
Brad Davis
ce54f1b1d1 Improve desktop 'unfocus' functionality 2016-06-30 15:18:14 -07:00
Brad Davis
86f8b57841 Highlight controls based on activeFocus, not focus 2016-06-30 15:16:28 -07:00
David Rowe
759b3065fc Distinguish between file name and directory as prompt in file chooser 2016-06-30 20:48:19 +12: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
Triplelexx
fd4d9761ce merge master and resolve conflicts 
* remove use of jointsCaptured flag in inputDevice update, TouchscreenDevice now locks the userInputMapper * resolve conflict in Application.cpp, userInputMapper no longer loads default mapping
 2016-06-24 03:34:39 +01: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
David Rowe
eddfe4847a Select nothing by default when navigate up/down directory structure 2016-06-01 14:22:54 +12:00
David Rowe
437607998f Adjust minimum size of file browser dialog to keep all buttons visible 2016-05-30 14:20:13 +12:00
David Rowe
fd467caf86 Add "Open Folder" button to file browser dialog 2016-05-30 14:19:25 +12:00
David Rowe
9ec6b77460 Make file browser dialog movable 2016-05-25 13:49:01 +12:00
David Rowe
1c4eed640f Fix up file browser resize handle and outlining 2016-05-25 13:10:26 +12:00
David Rowe
66a90cc3f8 Make file browser dialog resizable 2016-05-25 11:31:39 +12:00
David Rowe
504516b627 Merge branch 'master' into 20917 2016-05-24 08:03:54 +12:00
David Rowe
099a675a18 Remove extra logging 2016-05-24 08:03:29 +12:00
David Rowe
5a27d656c5 Potential OSX fix plus extra logging 2016-05-21 13:03:58 +12:00
Brad Hefta-Gaub
00bd3b2e8a remove more dead code 2016-05-20 13:43:08 -07:00
David Rowe
17b3101ca5 Merge branch 'master' into 20917 2016-05-20 18:50:01 +12:00
David Rowe
b2bbf72be2 Replace drive drop-down plus text field with a paths drop-down 2016-05-20 18:48:51 +12:00
David Rowe
11aeaba114 Capitalize drive letter of chosen file 2016-05-20 11:32:14 +12:00
David Rowe
dac043a52d Provide navigation up to the PC level to display drives in table 2016-05-20 10:49:38 +12:00
David Rowe
41311bc3df Finish decoupling FolderListModel 2016-05-19 17:13:07 +12:00
David Rowe
585467094c Sort files case-insensitively, directories first 2016-05-19 14:16:00 +12:00
David Rowe
862a88cf29 Insert an intermediary ListModel suitable for sorting and drives 2016-05-19 11:29:21 +12:00
David Rowe
551c669883 Move FolderListModel to be stand-alone 2016-05-19 09:24:15 +12:00
David Rowe
e1d885004f Fix carat in drop-down boxes 2016-05-18 13:59:13 +12:00
David Rowe
17d41dd7b9 HiFi glyphs font file update with fixed up/down carats 
Update QML and HTML spinboxes accordingly.
 2016-05-18 13:25:11 +12:00
David Rowe
e0483585b8 Consistently capitalize drive letter for Windows 2016-05-17 14:43:49 +12:00
David Rowe
1fc3d9229c Fix initial drive change and go-up not working properly on first screen 2016-05-17 10:51:42 +12:00
Atlante45
38f74c1843 Remove the last of the glow level 2016-05-14 14:49:31 -07:00
David Rowe
14c733cd6e Make columns sortable 2016-05-14 17:19:18 +12:00
David Rowe
c21087ad87 Add icon to title 2016-05-14 13:04:18 +12:00
David Rowe
3b34b908d7 Tweak level-up and home buttons 2016-05-13 17:39:15 +12:00
David Rowe
7be33a8584 Don't show header or dates and sizes when choosing a directory 2016-05-12 17:25:44 +12:00
David Rowe
d798e562fc Update scrollbar in tree view to match table scrollbar 
Used in Running Scripts and Asset Browser dialogs.
 2016-05-12 17:18:30 +12:00
David Rowe
b6fcb77d6f Update Running Scripts list to use updated QML table control 2016-05-12 17:16:56 +12:00
David Rowe
c29b82e24d Restyle file selection dialog 
First pass
 2016-05-12 17:08:28 +12:00
David Rowe
57fae3fc51 Add FiraSans-Regular font 2016-05-12 09:28:25 +12:00
David Rowe
51d6d99c73 Fix up files list data and basic layout 2016-05-11 09:17:11 +12:00
David Rowe
88207b727b Style directory and navigation controls "as is" 2016-05-10 15:45:10 +12:00
David Rowe
b8c0ec86af Hide file filter if only 1 file type 2016-05-10 15:09:13 +12:00
David Rowe
663a2ddc64 Style path and filter controls 2016-05-10 14:43:54 +12:00
David Rowe
43ee64c251 Upate general layout of file selection dialog 2016-05-10 12:50:32 +12:00
David Rowe
6e59abc8f6 Switch file selection dialog over to using UI Toolkit files 2016-05-10 12:13:46 +12:00
Brad Hefta-Gaub
cddcac60c1 Merge pull request #7768 from ctrlaltdavid/20891 
Add Interface "Home" bookmark function
 2016-05-02 10:14:57 -07:00
David Rowe
6b8109f164 Fix avatar browser top border height and remove separate "close" button 2016-04-29 12:42:10 +12:00
David Rowe
e5ee98ee60 Fix up filenames in headers 2016-04-28 11:19:30 +12:00
David Rowe
16874baf5f Use UI Toolkit border styles for various dialogs 
File > Help...
File > About Interface
Settings > Avatar Settings > Browse
Go To button (directory.js)
Examples button (examples.js)
 2016-04-28 11:14:39 +12:00
David Rowe
f74be226c8 Add "home" button to address bar 2016-04-27 10:28:05 +12:00
Brad Hefta-Gaub
82f905dc84 fix qml issue 2016-04-26 13:29:22 -07:00
Brad Hefta-Gaub
e7d26a8a63 CR feedback magic numbers 2016-04-26 11:45:48 -07:00
Brad Hefta-Gaub
0ae6e9f241 remove debug messages 2016-04-26 11:36:21 -07:00
Brad Hefta-Gaub
716d9e554c removed a bunch of dead code 2016-04-26 09:25:28 -07:00
Brad Hefta-Gaub
4ab7b660d4 fix a bunch of bugs in qml window placement 2016-04-25 20:19:54 -07:00
Brad Hefta-Gaub
f4e4f217e8 Merge pull request #7642 from ctrlaltdavid/20872 
Further restyling of edit.js
 2016-04-22 13:46:26 -07:00
David Rowe
7b9e6b52fb Merge branch 'master' into 20872 
Conflicts:
	interface/resources/qml/hifi/dialogs/RunningScripts.qml
 2016-04-22 13:19:47 +12:00
David Rowe
a7b82e8cae Decouple ui and shared libraries 2016-04-22 12:58:47 +12:00
David Rowe
266e4c998b Don't show "Reveal Scripts Folder" link when open Running Scripts in HMD 2016-04-22 12:29:22 +12:00
David Rowe
6c5335cfa7 Replace button with icon and text 2016-04-21 15:17:06 +12:00
David Rowe
9c9bca546c Add button that opens scripts directory window 2016-04-21 11:52:03 +12:00
David Rowe
54b032f612 Merge branch 'master' into 20872 2016-04-20 08:51:53 +12:00
David Rowe
47b4c36546 Merge branch 'master' into 20872 2016-04-19 12:56:55 +12:00
Brad Hefta-Gaub
f5cddc9962 fix the bug that Omega found 2016-04-18 17:26:12 -07:00
Brad Hefta-Gaub
01907f181f Merge branch 'master' of https://github.com/highfidelity/hifi into improveHMD 2016-04-18 16:01:42 -07:00
Brad Hefta-Gaub
b62f1a135d fix qml to work with rect instead of vec4 2016-04-16 17:29:03 -07:00
Brad Hefta-Gaub
8f3d48190a switch to QRect instead of vec4 2016-04-16 16:59:47 -07:00
Brad Hefta-Gaub
6b5fd1e807 code review feedback 2016-04-16 16:11:36 -07:00
David Rowe
8f6cfb72ea Fix QML warnings at shutdown 2016-04-16 15:23:41 +12:00
Brad Hefta-Gaub
d5a46d3390 handle repositioning of qml windows 2016-04-15 20:01:14 -07:00
Brad Hefta-Gaub
04df84974c handle repositioning of qml windows 2016-04-15 19:50:12 -07:00
David Rowe
bda2f455e5 Add buttons to entities list that toggle locked and visible 2016-04-15 16:26:34 +12:00
David Rowe
43f843f731 Retrofit updated margins and spacing to QML dialogs 2016-04-13 16:39:52 +12:00
David Rowe
b33d28852b Merge branch 'master' into 20872 2016-04-13 13:11:26 +12:00
Brad Hefta-Gaub
3f05ded932 Merge pull request #7611 from zzmp/guard/amd 
Disable gradient QML items on AMD
 2016-04-12 08:32:57 -07:00
David Rowe
f7f5443a44 Merge branch 'master' into 20872 
Conflicts:
	examples/html/entityProperties.html
 2016-04-12 15:40:35 +12:00
David Rowe
d6fcbd2dac Revisit margins and spacing 2016-04-12 15:07:30 +12:00
Zach Pomerantz
1df2fc7809 Disable qml gradient for AMD for ContentSection 2016-04-11 13:59:08 -07:00
Zach Pomerantz
d719b3692e Consolidate qml alpha gradient workaround to desktop 2016-04-11 11:36:42 -07:00
Brad Davis
df8ad57185 Fix FPS counter 2016-04-11 00:25:16 -07:00
Brad Davis
2353daa254 Merge pull request #7614 from ctrlaltdavid/20876 
Disable arrow keys being able to move between HTML form fields
 2016-04-08 13:28:30 -07:00
David Rowe
77e16f62c9 Merge branch 'master' into 20872 
Conflicts:
	examples/html/edit-style.css
 2016-04-08 15:08:34 +12:00
Zach Pomerantz
e54cfce392 Disable qml alpha gradients for AMD 2016-04-07 18:27:36 -07:00
David Rowe
e37e46d34a Disable arrow keys being able to move between HTML form fields 
Moving between form fields with arrow keys makes it to easy to make
unintended changes to adjacent fields.
 2016-04-08 10:30:00 +12:00
David Rowe
3f62702ff0 Add search icon to entity list filter 2016-04-07 13:38:00 +12:00
David Rowe
4e3cdf6569 Update Running Scripts' search to have rounded ends and a search icon 2016-04-07 12:32:27 +12:00
David Rowe
c9c414d5a8 Fix entities editor display of large negative coordinates and angles 2016-04-06 07:45:04 +12:00
Triplelexx
a4775983a2 Merge branch 'master' into 20769 
# Conflicts:
# interface/src/Application.cpp

conflicting line 2528 wheelEvent is now const
 2016-04-04 19:19:55 +01:00
Triplelexx
11af0a421b Merge branch 'master' into 20769 2016-04-03 22:57:55 +01:00
Brad Hefta-Gaub
e5f3ec4600 Merge pull request #7545 from birarda/marketplace-to-examples 
renaming of marketplace icon/window to examples
 2016-04-03 14:25:00 -07:00
Seth Alves
5fa9f662fc Merge pull request #7542 from birarda/refresh-on-asset-connect 
refresh/close the asset browser dialog on domain switch
 2016-04-01 18:08:59 -07:00
Stephen Birarda
6e83ed5ccc use a more generic custom user agent 2016-04-01 15:49:24 -07:00
Stephen Birarda
6df7ddeb16 pass the HighFidelityInterface user agent with WebView 2016-04-01 15:13:28 -07:00
Stephen Birarda
194226103c refresh the Asset Browser when switching domains 2016-04-01 11:13:59 -07:00
David Rowe
13ab854a9d Reduce space between collapsed sections 
In settings dialogs as well as entities editor.
 2016-03-31 15:02:16 +13:00
David Rowe
382b05e00b Make expand/collapse icon larger 2016-03-31 13:13:13 +13:00
David Rowe
db72e3efbb Increase maximum window height 2016-03-30 19:22:34 +13:00
David Rowe
28d0fc677c Update UIT QML control 2016-03-30 12:19:26 +13:00
David Rowe
1cb08952ae Merge branch 'master' into 20855 
Conflicts:
	interface/resources/qml/ToolWindow.qml
 2016-03-30 12:01:45 +13:00
Brad Davis
ae82298e1b Working on the App JS <-> HTML JS communication 2016-03-28 10:09:22 -07:00
David Rowe
ef4d67008b Style x, y, z fields 2016-03-28 11:45:50 +13:00
David Rowe
b9ec5f39d9 Style color RGB fields 2016-03-27 22:12:10 +13:00
Brad Davis
a47614c9b6 Revert "Build a better event bridge" 
This reverts commit a43fde0803.
 2016-03-25 09:48:25 -07:00
David Rowe
42af3ebc4a Style the entity editor's "grid" tab 2016-03-25 14:15:03 +13:00
Brad Hefta-Gaub
d26fe77803 Merge pull request #7454 from jherico/qml_crashes 
Fix async issues related to JS <-> App <-> QML <-> HTML communication
 2016-03-24 17:32:38 -07:00
David Rowe
46df386f0b Fix edit tab display after script reload 2016-03-25 10:18:58 +13:00
David Rowe
9280443425 Merge branch 'master' into 20855 2016-03-25 09:06:20 +13:00
Brad Davis
a43fde0803 Build a better event bridge 2016-03-24 11:01:06 -07:00
David Rowe
51728d14a7 Miscellaneous improvements to Attachments dialog 2016-03-24 21:17:36 +13:00
Brad Hefta-Gaub
3505c14552 Merge pull request #7444 from birarda/uncover-qml 
Attachments Dialog QML updates (from contractor)
 2016-03-23 20:45:50 -07:00
David Rowe
5541dd6732 Change edit window's title and default size 2016-03-24 15:38:26 +13:00
David Rowe
96ce912d3d Fix up tab display post-merge 2016-03-24 11:07:48 +13:00
David Rowe
8d778141ef Merge branch 'master' into 20855 
Conflicts:
	interface/resources/qml/ToolWindow.qml
 2016-03-24 10:39:09 +13:00
David Rowe
454ba50dc1 Tidying 2016-03-24 10:03:47 +13:00
Stephen Birarda
34fb06a7bd changes to attachments dialog from contractor 2016-03-23 13:52:47 -07:00
Brad Davis
a30df07d53 PR feeback, precendence 2016-03-22 09:15:29 -07:00
David Rowe
7e7e421efa Tidy some QML 2016-03-22 19:33:57 +13:00
David Rowe
42b606c09d Merge branch 'master' into 20855 2016-03-22 18:51:07 +13:00
Brad Davis
28f25489f8 Fix occasional crash on creating overlay tool windows 2016-03-21 19:17:31 -07:00
David Rowe
3d2cb6554e Fix QML binding loop 2016-03-19 15:50:16 +13:00
David Rowe
3fa678a652 Style tabs and background 2016-03-19 14:52:40 +13:00
Brad Hefta-Gaub
481a75faca Merge pull request #7366 from markej/ShowDownloadURLs 
Show which URLs are being actively downloaded
 2016-03-18 10:42:01 -07:00
timemarkov
160b4e7ba2 Implement new design of attachment dialog 2016-03-18 12:11:00 +01:00
David Rowe
7eb9420c92 Update tool window to use restyled frame 2016-03-18 16:33:55 +13:00
David Rowe
7ed30048a4 Set up files for restyling tool window frame 2016-03-18 16:27:13 +13:00
David Rowe
bef8c5a807 Fix some QML warnings 2016-03-17 09:51:32 +13:00
David Rowe
48d4316714 Fix typo 2016-03-17 09:34:21 +13:00
David Rowe
5faa7b3e87 Merge branch 'master' into 20851 
Conflicts:
	interface/resources/qml/dialogs/MessageDialog.qml
 2016-03-17 09:29:56 +13:00
Andrew Meadows
6028c3e841 Merge pull request #7318 from birarda/atp 
Asset Transfer Protocol Mappings
 2016-03-15 16:52:36 -07:00
Atlante45
03efde5b3c Change text in case of drag and drop. 2016-03-15 13:53:13 -07:00
Mark Johnson
6094613d06 When truncating the URL, show the first 5 characters (for the protocol) 2016-03-15 13:43:42 -07:00
Atlante45
4a90ec303c Fix drag&drop 2016-03-15 11:22:42 -07:00
Clément Brisset
17e5b441cf Merge pull request #111 from huffman/atp-manager-name 
Add atp filename to entities added to world
 2016-03-15 10:19:53 -07:00
Ryan Huffman
1b81b4f01b Merge branch 'atp' of github.com:birarda/hifi into atp-upload 2016-03-15 10:19:20 -07:00
Atlante45
07d2213628 Remove debug 2016-03-15 09:14:22 -07:00
Atlante45
9b8b1d41e3 Edit in place 2016-03-15 09:14:22 -07:00
Stephen Birarda
72c64532f5 Merge branch 'master' of https://github.com/highfidelity/hifi into atp 2016-03-15 09:12:49 -07:00
Mark Johnson
bc2aea8774 Show the (generally truncated) urls being downloaded 2016-03-14 18:18:33 -07:00
Ryan Huffman
7823882aa1 Add atp filename to entities added to world 2016-03-14 16:13:33 -07:00
David Rowe
ab963b4a4b Fix up script editor's "reload script?" message box 2016-03-15 09:04:23 +13:00
Mark Johnson
2834ff2935 Change Q: -> Pending: 2016-03-14 11:45:05 -07:00
David Rowe
f75aa97728 Grow width of QML message box to accommodate wide title if necessary 2016-03-15 07:22:21 +13:00
Ryan Huffman
4b6dd4636f Merge branch 'atp' of github.com:birarda/hifi into atp-upload 2016-03-13 21:32:25 -07:00
Ryan Huffman
960047f412 Remove right click selection 2016-03-13 21:06:52 -07:00
Ryan Huffman
6c27bd9eb2 Update upload flow and make asset list dynamically sized 2016-03-13 21:04:07 -07:00
Mark Johnson
47d3f418e3 Merge remote-tracking branch 'highfidelity/master' 2016-03-12 17:30:22 -08:00
Mark Johnson
00829db375 Fill in the downloads line of the stats window 
Will show the active download, current download limit and how many
pending requests
 2016-03-12 17:27:43 -08:00
David Rowe
3deb30d699 Remove no longer need font type 2016-03-12 13:06:29 +13:00
David Rowe
3bf1afb80b HMD submenus not allcaps 2016-03-12 12:56:38 +13:00
David Rowe
9da64e540d Add shortcut keys to HMD menu 2016-03-12 12:53:16 +13:00
Stephen Birarda
890266e0bd shrink message dialog to contentWidth 2016-03-11 15:45:57 -08:00
Stephen Birarda
188712a55b select a right-clicked item in asset browser 2016-03-11 15:45:57 -08:00
Stephen Birarda
31f0e4a919 disable the rename and delete buttons if nothing selected 2016-03-11 15:45:57 -08:00
Stephen Birarda
6d6a53a69a use timer for upload click handle to avoid focus issue 2016-03-11 15:45:57 -08:00
David Rowe
ecf67282d5 Add separators to HMD menus 2016-03-12 12:29:52 +13:00
Stephen Birarda
e51aedeb35 fix error handling for diff request types 2016-03-11 11:36:52 -08:00
David Rowe
e175c19754 Style checkbox for menu items 2016-03-11 15:51:27 +13:00
Stephen Birarda
7ccba8b406 remove debug for selected index crash 2016-03-10 18:36:12 -08:00
Stephen Birarda
7675c83f92 clear selection on reload 2016-03-10 18:34:28 -08:00
Stephen Birarda
8e2b06a8e5 use an explicit selection model for treeview 2016-03-10 18:32:18 -08:00
David Rowe
fb0f97264c Style HMD menu items 2016-03-11 15:24:35 +13:00
Stephen Birarda
39e869fdfd append a trailing slash for folder rename 2016-03-10 17:54:38 -08:00
Stephen Birarda
625032f748 fix for add to world after upload name change 2016-03-10 17:10:49 -08:00
Stephen Birarda
52ee2499fc add trim prior to rename in AssetServer 2016-03-10 16:57:39 -08:00
Stephen Birarda
ed4df72eed cleanup logging for asset browser 2016-03-10 16:57:39 -08:00
Atlante45
4a9d88d213 CR 2016-03-10 16:55:51 -08:00
Atlante45
16287b7040 Disable add to world for uncompatible files 2016-03-10 16:44:39 -08:00
Atlante45
35f5ebb938 Don't allow folder overwrite 2016-03-10 16:44:39 -08:00
Stephen Birarda
2fb478ff3c Merge pull request #99 from huffman/atp-more 
Atp more
 2016-03-10 16:22:05 -08:00
Ryan Huffman
2d4864ed33 Merge branch 'atp' of github.com:birarda/hifi into atp-more 2016-03-10 15:40:07 -08:00
Ryan Huffman
76ed16314a Add prepended slash on rename if missing 2016-03-10 15:38:20 -08:00
Stephen Birarda
e29565a717 don't default to yes when prompted for overwrite 2016-03-10 15:32:12 -08:00
Stephen Birarda
672bafc09d Merge pull request #95 from Atlante45/feat/atp 
Wire upload
 2016-03-10 15:30:53 -08:00
Atlante45
a6ccfb1685 CR 2016-03-10 15:11:39 -08:00
Stephen Birarda
cf12a8d396 always center the text in the message dialog 2016-03-10 15:02:19 -08:00
Atlante45
63571a7c36 Make sure Upload is not clicked several times 2016-03-10 14:59:20 -08:00
Atlante45
548d826a4e Couple bug fixes 2016-03-10 14:59:20 -08:00
Atlante45
7d7a683b18 Add uploadFile method that prompts the user 2016-03-10 14:59:20 -08:00
Atlante45
dc79d3262a Update glyphs font 2016-03-10 14:59:20 -08:00
Stephen Birarda
7f0917ea00 add to world in front of MyAvatar 2016-03-10 14:49:07 -08:00
Stephen Birarda
e227f68353 tweak wording for overwrite dialog 2016-03-10 14:49:07 -08:00
Stephen Birarda
5167cf69b2 fix for add to world and delete dialog 2016-03-10 14:49:07 -08:00
Stephen Birarda
c65b5b63f0 better error handling for asset browser 2016-03-10 14:48:44 -08:00
Stephen Birarda
8cc0ae3148 menu and naming changes for asset server directory 2016-03-10 14:48:44 -08:00
Ryan Huffman
c93ba2752b Remove rowDelegate styling for asset window 2016-03-10 14:44:53 -08:00
David Rowe
2b45971f8c Style HMD menu backgrounds 2016-03-11 11:42:49 +13:00
Ryan Huffman
e4b5c14a4c Merge branch 'atp' of github.com:birarda/hifi into atp-more 2016-03-10 14:20:22 -08:00
Ryan Huffman
ef8c66c1be Remove commented out code 2016-03-10 14:18:09 -08:00
Ryan Huffman
71bc937533 Remove copy URL button 2016-03-10 13:56:54 -08:00
Ryan Huffman
273acc6a7e Add context menu to asset manager 2016-03-10 13:55:36 -08:00
Stephen Birarda
5ad4645b47 Merge branch 'master' of https://github.com/highfidelity/hifi into atp 2016-03-10 13:28:59 -08:00
David Rowe
bbe507ec05 Add file headers and update Qt versions in VR menu QML files 2016-03-11 09:53:10 +13:00
Stephen Birarda
99718e9c4e short circuit the mapping operations for invalid path/hash 2016-03-10 10:52:05 -08:00
Stephen Birarda
b0c326fa2c Merge pull request #92 from huffman/atp-more 
Atp more
 2016-03-10 10:51:12 -08:00
Ryan Huffman
0df05d273d Implement addToWorld in asset window 2016-03-10 10:25:51 -08:00
Stephen Birarda
899595183e add reload of mappings on component complete 2016-03-10 09:02:45 -08:00
Stephen Birarda
f1919031de error message boxes for mapping errors 2016-03-10 08:57:37 -08:00
Ryan Huffman
3e5e2eef17 Add mapping sorting, copying, and isKnownMapping 2016-03-10 08:18:32 -08:00
Ryan Huffman
dd52dd69d9 Fix rename mapping 2016-03-09 16:50:37 -08:00
Ryan Huffman
232bfc9061 Cleanup AssetServer qml 2016-03-09 16:44:31 -08:00
Ryan Huffman
0d2ae4f3a4 Merge branch 'atp' of github.com:birarda/hifi into atp-model 2016-03-09 16:33:53 -08:00
Ryan Huffman
f23057b1c0 Add renaming to Asset qml 2016-03-09 16:29:17 -08:00
Ryan Huffman
f5497aa1e7 Add new AssetMappingsScriptingInterface and add mappings model 2016-03-09 14:53:04 -08:00
Stephen Birarda
57ea51d244 Merge pull request #84 from Atlante45/feat/atp 
Replace old drag&drop with new UI
 2016-03-09 14:26:49 -08:00
Atlante45
6bd7afc7b3 Confirm overrides 2016-03-09 14:19:28 -08:00
Ryan Huffman
4da4fd889a Add AssetMappingModel 2016-03-09 14:03:56 -08:00
Stephen Birarda
2e9ee4f8a7 Merge branch 'atp' of github.com:birarda/hifi into atp 2016-03-09 12:16:59 -08:00
Stephen Birarda
9a2b2b4c16 Merge branch 'master' of https://github.com/highfidelity/hifi into atp 2016-03-09 12:16:46 -08:00
Atlante45
5a0beec1f5 Replace old drag&drop with new UI 2016-03-09 11:47:31 -08:00
Brad Hefta-Gaub
1c07276501 fix a couple bugs 2016-03-09 09:45:55 -08:00
Seth Alves
efdef52081 Merge pull request #7269 from ctrlaltdavid/20822 
Restyle bookmark dialogs
 2016-03-09 07:31:15 -08:00
Atlante45
380480d4ee Add a couple more dialogs 2016-03-08 18:19:26 -08:00
Atlante45
169af80bc0 Add a couple dialogs 2016-03-08 17:11:54 -08:00
Atlante45
028c7ab6ba Add text box 2016-03-08 17:11:54 -08:00
Atlante45
254e04c4b7 UI change 2016-03-08 17:11:54 -08:00
David Rowe
973fa28d3f Fix case of RalewaySemiBold font name 2016-03-09 13:32:37 +13:00
David Rowe
155a084eaa Temporarily rename file a part of changing case of filename 2016-03-09 13:08:44 +13:00
David Rowe
269936f3ac Fix typo 2016-03-09 12:20:09 +13:00
David Rowe
edc50f102d Fix "duplicate bookmark" dialog 2016-03-09 11:55:09 +13:00
David Rowe
10e4e5e3a7 Use OffscreenUI icon enum instead of QMessageBox icon enum 2016-03-09 11:33:55 +13:00
David Rowe
03fb6b1444 Add ability to have icons in query dialogs 
Add icon to bookmark dialogs' titles.
 2016-03-09 10:45:14 +13:00
Atlante45
0bed46d43a Fix typos and file browser directory 2016-03-08 13:24:36 -08:00
Atlante45
74fb1aab55 Add file dialog 2016-03-08 13:15:04 -08:00
Atlante45
e32fd4524c Start wiring UI 2016-03-08 13:13:45 -08:00
Atlante45
ded449072f Rename window 2016-03-08 13:13:45 -08:00
Atlante45
e0371929a2 Remove unused variables 2016-03-08 13:13:45 -08:00
Atlante45
51be88d4c3 Reset Window changes 2016-03-08 13:13:45 -08:00
Atlante45
320bd2b4d4 Reset ContentSection scheme 2016-03-08 13:13:45 -08:00
Atlante45
d0e29846f4 Add GlyphButton 2016-03-08 13:13:45 -08:00
Atlante45
6fecb4e1d1 Window fixup 2016-03-08 13:13:45 -08:00
Atlante45
30a6dd8629 Update StaticSection 2016-03-08 13:13:45 -08:00
Atlante45
82d6d3ff01 Small fix to buttons color 2016-03-08 13:13:45 -08:00
Atlante45
784f669998 First draft Assets Manager 2016-03-08 13:13:45 -08:00
Brad Hefta-Gaub
ed67ef8f14 Merge pull request #7247 from jherico/qml_script_messaging 
Allow message passing from a script to a QML window
 2016-03-08 10:21:09 -08:00
David Rowe
2aaf9ff0d0 Update message dialogs to use HiFi-Glyphs icons 2016-03-08 17:13:05 +13:00
David Rowe
e5188108a1 Fix width of delete bookmark drop-down 2016-03-08 15:21:15 +13:00
David Rowe
2f91b29c06 Set default focus 2016-03-08 14:03:54 +13:00
David Rowe
b71a512a6f Reorder OK and Cancel buttons 2016-03-08 13:58:20 +13:00
David Rowe
7f2938c53f Tidy message dialog code 2016-03-08 13:56:25 +13:00
David Rowe
b7fd5467ba Restyle query dialogs 2016-03-08 13:53:05 +13:00
David Rowe
d893b2e3b1 Handle no icon in modal dialogs 2016-03-08 13:52:24 +13:00
David Rowe
e6b81b31d8 Fix Running Script's tree view 2016-03-08 09:59:00 +13:00
David Rowe
b4c489d4c6 Fix not reliably being able to select "None" in Graphics settings 2016-03-05 10:17:39 +13:00
Brad Davis
4e1f78b585 Allow message passing from a script to a QML window 2016-03-04 13:11:08 -08:00
David Rowe
1eb6fa425c Fix up Running Scripts dialog 2016-03-03 20:09:50 +13:00
David Rowe
f88eef7549 Update section headers 2016-03-03 19:17:48 +13:00
David Rowe
fb675dbaf5 Add vertical spacing above other settings fields 2016-03-03 18:49:13 +13:00
David Rowe
2d250e2f64 Only the first checkbox in a group has vertical space before it 2016-03-03 17:51:14 +13:00
David Rowe
a41f409e33 Defer dialog vertical spacing decisions to content items 2016-03-03 17:49:18 +13:00
David Rowe
4729020df1 Change section expand/collapse icons 2016-03-03 14:32:08 +13:00
David Rowe
46bb3c05a5 Right justify leading control labels 2016-03-03 14:17:02 +13:00
David Rowe
81f13afb4e Tweak look of combo box control 2016-03-03 10:24:42 +13:00
David Rowe
c3b47088c9 Fix slider vertical alignment 2016-03-03 01:59:21 +13:00
David Rowe
a51dd43dff Wrap labels 2016-03-03 01:56:02 +13:00
David Rowe
c1f5bac86a Style the ComboBox 2016-03-03 01:14:00 +13:00