43 commits

Author	SHA1	Message	Date
Elisa Lupin-Jimenez	3aa7cb440d	file structures in zip files replicated, more useful unzip debug print, updated blocks tablet app url	2017-11-20 10:01:33 -08:00
Elisa Lupin-Jimenez	072f3dfb03	removed commented out code, removed blocks from default scripts	2017-08-15 10:25:14 -07:00
Elisa Lupin-Jimenez	1ac9536f95	Downloading blocks from marketplace in own asset folder	2017-08-09 15:56:07 -07:00
Elisa Lupin-Jimenez	17acf0520d	Download from blocks in marketplace working	2017-08-09 11:08:14 -07:00
Elisa Lupin-Jimenez	d599753771	Started blocks download catch, fixed a debug typo	2017-08-08 18:43:35 -07:00
Elisa Lupin-Jimenez	1102b27ba1	Fixed merge conflicts with master	2017-08-08 11:47:08 -07:00
Elisa Lupin-Jimenez	af432087e3	small revisions to bracketing/variable name	2017-08-04 16:58:33 -07:00
Elisa Lupin-Jimenez	ebc28a6557	Renamed isBlocks to isZip, added debug print for non-entity files	2017-08-04 16:58:33 -07:00
Elisa Lupin-Jimenez	c6d5b1a5e6	Removed extraneous print statements	2017-08-04 16:58:15 -07:00
Elisa Lupin-Jimenez	ed1ed4f3e0	Blocks drag does not work yet	2017-08-04 16:57:48 -07:00
Elisa Lupin-Jimenez	ca6a323d54	Can drag blocks zip folder into hifi and upload the .obj	2017-08-04 16:57:48 -07:00
Elisa Lupin-Jimenez	310a0eeecc	Renamed isBlocks to isZip, added debug print for non-entity files	2017-08-02 12:24:14 -07:00
Elisa Lupin-Jimenez	d4a7e9188a	Removed extraneous print statements	2017-07-27 13:33:53 -07:00
Elisa Lupin-Jimenez	acb088b263	Blocks drag does not work yet	2017-07-26 16:58:23 -07:00
Elisa Lupin-Jimenez	9cfc4dc91b	Can drag blocks zip folder into hifi and upload the .obj	2017-07-26 15:21:39 -07:00
Seth Alves	794495c197	make ResourceManager be owned by DependencyManager	2017-06-28 14:18:14 -07:00
Brad Hefta-Gaub	c65471e880	Merge branch 'master' of https://github.com/highfidelity/hifi into removeLogSpam ... Conflicts: libraries/script-engine/src/FileScriptingInterface.cpp	2016-12-19 22:27:24 -08:00
Brad Hefta-Gaub	dbbed462b4	cleanup naked qDebug() calls	2016-12-19 22:24:25 -08:00
David Rowe	dbd00e39a8	Handle unzip failure	2016-12-15 11:52:34 +13:00
David Rowe	460d332c6f	Delete redundant code	2016-12-07 10:06:32 +13:00
David Rowe	8e30674069	Tidying	2016-12-07 09:28:35 +13:00
David Rowe	3ca2c19075	Delete temporary directory after content has been used	2016-11-01 12:31:35 +13:00
David Rowe	12747d26e0	Add parameter that enables automatically adding download model to world	2016-10-30 13:58:17 +13:00
elisa-lj11	2f07ba87af	Renamed isZipped for more clarity on checking for non-fbx files	2016-09-02 16:48:55 -07:00
elisa-lj11	6721cc8dfb	fixed return statement formatting	2016-09-02 15:48:47 -07:00
elisa-lj11	18700d6397	narrowed filters for Clara website check	2016-09-02 15:18:13 -07:00
elisa-lj11	bebf9c5890	Added error feature when user tries to download a non fbx file	2016-08-31 17:46:35 -07:00
elisa-lj11	b131338dd0	Injected script to remove other file types from download options	2016-08-31 14:13:26 -07:00
elisa-lj11	8bc9a92429	removed extraneous debug prints	2016-08-19 11:32:13 -07:00
elisa-lj11	5d19267d00	Safeguard against file corruption ... This is what could be a temporary (or permanent) fix to users trying to delete important files on their computer through JS	2016-08-17 11:10:38 -07:00
elisa-lj11	5d2fb68924	Fixed temp dir access	2016-08-16 15:47:57 -07:00
elisa-lj11	9ea9baeadf	Making JS/QML safer (DOES NOT WORK)	2016-08-16 14:12:19 -07:00
elisa-lj11	a9a8710689	Switched saving download/upload to temporary directory	2016-08-04 17:01:19 -07:00
elisa-lj11	b1b2ea48b2	Made code more QA; extra browser and download widget close upon download	2016-08-04 17:01:19 -07:00
elisa-lj11	a94a304700	Downloads from Clara.io and uploads to asset server	2016-08-04 16:59:38 -07:00
elisa-lj11	615627e981	Working download and unpackage from Clara.io	2016-08-04 16:59:38 -07:00
elisa-lj11	49712060ed	switching to the main site progress	2016-08-04 16:59:38 -07:00
elisa-lj11	c36fc29363	Zip download works	2016-08-04 16:59:03 -07:00
elisa-lj11	6152fa28b7	Download through QML ... It kind of works, not crashing like before, but the weird ghost file/type error is still happening with multiple downloads	2016-08-04 16:58:31 -07:00
elisa-lj11	9833ba1987	No errors upon build	2016-08-04 16:51:14 -07:00
elisa-lj11	212e4f9cca	making quazip work	2016-08-04 16:48:14 -07:00
elisa-lj11	0e79aa9dbe	Added quazip for unzipping functions	2016-08-04 16:46:56 -07:00
elisa-lj11	f277a019bf	FileScriptingInterface ... Created new .cpp and .h for the download and unzipping of a model	2016-08-04 16:46:56 -07:00