1049 commits

Author	SHA1	Message	Date
elisa-lj11	2d2cb45c5d	Merge remote-tracking branch 'highfidelity/master' into zip_project	2016-08-22 16:05:16 -07:00
elisa-lj11	8bc9a92429	removed extraneous debug prints	2016-08-19 11:32:13 -07:00
elisa-lj11	4c434e875e	fixed merge conflicts in Application.cpp	2016-08-19 09:46:22 -07:00
Seth Alves	87dbfa7e47	add -Wsuggest-override to compile flags and deal with fallout	2016-08-18 09:51:41 -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
Zander Otavka	246a8457e1	Add some asserts	2016-08-08 15:12:17 -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
Zander Otavka	a826f4eca1	Fix console errors for javascript: urls	2016-08-03 15:55:51 -07:00
Zander Otavka	f9b6db12e3	Fix parsing of embedded entity scripts ... Now correctly identifies when scripts are not urls as well as javascript: urls.	2016-08-03 13:48:27 -07:00
Stephen Birarda	4cdc98287b	add canKick to USI, revert constants to production	2016-08-02 14:35:51 -07:00
Stephen Birarda	7e6dbf2d1a	add a kick request packet and send from NL	2016-08-02 14:35:11 -07:00
Brad Hefta-Gaub	74a3835a1e	CR feedback	2016-07-28 15:15:33 -07:00
Brad Hefta-Gaub	22619a66ba	process events also	2016-07-28 10:51:17 -07:00
Brad Hefta-Gaub	755989b8ff	don't allow punished scripts to slow stop or shutdown	2016-07-28 10:01:05 -07:00
Brad Hefta-Gaub	2d199fe3d0	rename function for better clarity	2016-07-26 08:08:44 -07:00
Brad Hefta-Gaub	a12034cb45	fix unix warning, added comments	2016-07-26 07:54:55 -07:00
Brad Hefta-Gaub	83dc9ea6bb	punish slow scripts and don't send updates while physics is still loading	2016-07-25 21:46:30 -07:00
Stephen Birarda	609900f246	move ignore set handling to NodeList	2016-07-13 15:06:31 -07:00
Stephen Birarda	6b6513d5f9	immediately fade out ignored avatars	2016-07-13 15:06:31 -07:00
Stephen Birarda	d5af323057	don't self-ignore from UsersScriptingInterface	2016-07-13 15:06:31 -07:00
Stephen Birarda	095bd7e6c8	cleanup logging, move packet parsing to mixers	2016-07-13 15:06:31 -07:00
Stephen Birarda	441b6d2813	fix recursive mutex lock, conditional, logging	2016-07-13 15:06:31 -07:00
Stephen Birarda	bb68e777e6	add a scripting interface to ignore users	2016-07-13 15:06:31 -07:00
Seth Alves	6786a07ac2	Merge branch 'master' of github.com:highfidelity/hifi into raypick-avatars	2016-07-07 09:53:24 -07:00
humbletim	b7874116b9	fix TypedArray byte ordering and .subarray end indexing	2016-07-02 23:36:08 -04:00
Seth Alves	4e70e8ed42	js call to ray-pick against avatars	2016-06-28 09:55:49 -07:00
Bradley Austin Davis	34c8d257d2	Fixing issues with unclosed groups in settings persistence	2016-06-14 09:49:38 -07:00
Brad Hefta-Gaub	8ec425106a	Merge pull request #7968 from birarda/audio-is-playing ... fix collision of isPlaying property and slot for AudioInjectors	2016-05-26 12:06:00 -07:00
Seth Alves	49769f7d29	trying again -- frantic clicking on reload no longer appears to wedge things	2016-05-25 13:39:13 -07:00
Seth Alves	b0ce65ec01	trying to mimic previous behavior more closely	2016-05-25 11:42:06 -07:00
Stephen Birarda	ba77aaf7ef	remove collision of isPlaying property and slot	2016-05-25 11:06:08 -07:00
Seth Alves	ef709c09d0	Merge branch 'master' of github.com:highfidelity/hifi into fix-edit-js-restart	2016-05-25 09:46:30 -07:00
Seth Alves	00336f4860	Merge branch 'master' of github.com:highfidelity/hifi into fix-edit-js-restart	2016-05-23 09:58:20 -07:00
Seth Alves	40e862cf9e	quiet gcc 5 warnings	2016-05-21 16:53:01 -07:00
Seth Alves	1ef0f8055b	fix grammar in comment	2016-05-20 10:12:59 -07:00
Seth Alves	35065ab05e	remove unused setter	2016-05-20 10:12:38 -07:00
Seth Alves	aa58cad93e	code review	2016-05-20 09:54:54 -07:00
Zach Pomerantz	4c8ff557db	Merge branch 'master' of github.com:highfidelity/hifi into fix/debug-script-crash	2016-05-20 09:31:30 -07:00