96 commits

Author	SHA1	Message	Date
Atlante45	9e6502fe92	More UI work	2017-08-25 10:54:34 -07:00
utkarshgautamnyu	f407bf6f5a	Merge pull request #11064 from highfidelity/bug/6513 ... Enabled multiple selection and deletion in Asset Browser	2017-07-28 09:46:34 -07:00
utkarshgautamnyu	a6a4bd5923	Update AssetServer.qml	2017-07-27 15:55:30 -07:00
utkarshgautamnyu	07fc9a6dc3	Indentation fixes	2017-07-27 14:53:49 -07:00
utkarshgautamnyu	4680911264	Enabled multiple selection and multiple deletion in asset browser	2017-07-27 14:47:30 -07:00
utkarshgautamnyu	71ddf1e7c1	Removed Compound Collision type	2017-07-26 10:20:17 -07:00
utkarshgautamnyu	65192aa620	added additional collision types to asset browser and new model dialog	2017-07-25 17:12:13 -07:00
Howard Stearns	556dcd69ac	wording change regarding use of exact for floors	2017-06-03 15:48:48 -07:00
Triplelexx	50e35a220b	Merge remote-tracking branch 'upstream/master' into 21224	2017-03-30 01:25:27 +01:00
Triplelexx	dc64065668	Merge remote-tracking branch 'upstream/master' into 21224 ... update	2017-03-26 22:20:24 +01:00
Triplelexx	c4bcacf0e0	use QueuedButton for upload dialog	2017-03-25 19:04:40 +00:00
Seth Alves	902e3d41d6	merge from upstream	2017-03-24 08:20:35 -07:00
Triplelexx	2515563a0b	change getFront to getForward	2017-03-21 22:35:07 +00:00
David Rowe	89eb073855	Fix dialog height changing as drop-down value is changed	2017-03-16 19:28:12 +13:00
Stephen Birarda	e3f194b4dd	use the err directly on upload error	2016-10-19 12:41:01 -07:00
Stephen Birarda	179cb67cdb	change order of asset upload failure changes	2016-10-19 11:55:54 -07:00
Stephen Birarda	b80f3fbd7b	fix error handling for failed asset upload	2016-10-19 11:37:35 -07:00
David Rowe	ee31e3b896	Fix Asset Browser add-to-world with spaces unwittingly appended to names	2016-10-12 20:08:15 +13:00
David Rowe	38b5314322	Disable Asset Browser's right-click popup menu if in HMD mode	2016-08-06 17:53:59 +12:00
David Rowe	18b0ed9e8f	Close file browser dialog immediately after selecting asset to upload	2016-07-30 14:16:08 +12:00
Zander Otavka	90154158b6	Fix gravity zero vector	2016-07-25 14:08:07 -07:00
Zander Otavka	344ec25bcd	Fix gravity for dynamic entities	2016-07-25 14:01:57 -07:00
Zander Otavka	c25b87c33f	Use custom dialog for asset server add to world	2016-07-22 17:14:45 -07:00
Bradley Austin Davis	ec615caa80	Support toolbar API	2016-06-17 13:06:42 -07:00
Brad Davis	0565d3aea1	Merge remote-tracking branch 'upstream/master' into vive-ui	2016-06-08 14:59:58 -07:00
David Rowe	a87483dfff	Fix colors of buttons in Asset Browser dialog	2016-06-08 10:55:14 +12:00
Brad Davis	8c13ff4ee1	Pinned UI support	2016-06-02 17:24:25 -07:00
Brad Hefta-Gaub	4ab7b660d4	fix a bunch of bugs in qml window placement	2016-04-25 20:19:54 -07:00
David Rowe	43f843f731	Retrofit updated margins and spacing to QML dialogs	2016-04-13 16:39:52 +12: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	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
Atlante45	03efde5b3c	Change text in case of drag and drop.	2016-03-15 13:53:13 -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
Ryan Huffman	7823882aa1	Add atp filename to entities added to world	2016-03-14 16:13:33 -07: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
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
Stephen Birarda	e51aedeb35	fix error handling for diff request types	2016-03-11 11:36:52 -08: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
Stephen Birarda	39e869fdfd	append a trailing slash for folder rename	2016-03-10 17:54:38 -08:00