572 commits

Author	SHA1	Message	Date
David Rowe	42af3ebc4a	Style the entity editor's "grid" tab	2016-03-25 14:15:03 +13: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
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