52 commits

Author	SHA1	Message	Date
Seth Alves	3f5ed4bef8	set isStopping on other calls to stop	2016-05-19 16:15:33 -07:00
Seth Alves	9ad488ba7b	fix method name to match coding standard	2016-05-19 16:08:44 -07:00
Seth Alves	4e862941cb	fix a race when restarting scripts -- avoid the old not-yet-stopped script from being considered the restart script	2016-05-19 14:51:56 -07:00
Zach Pomerantz	7d4276d15f	Merge branch 'master' of github.com:highfidelity/hifi into fix/script-thread-dtor	2016-05-16 10:51:23 -07:00
Zach Pomerantz	4e62d7ff61	Define ScriptEngines::isStopped inline	2016-05-13 17:28:21 -07:00
Zach Pomerantz	2140dc77b3	Rename wait and unload in best thread	2016-05-13 16:14:22 -07:00
Zach Pomerantz	36565598a7	Hide script stop behind accessor and fix friendship	2016-05-13 15:52:53 -07:00
Zach Pomerantz	59e4b9c356	Merge branch 'master' of github.com:highfidelity/hifi into fix/shutdown	2016-05-13 15:28:12 -07:00
Zach Pomerantz	13610b1220	Delete late-added script engines	2016-05-13 15:24:31 -07:00
Zach Pomerantz	70d0ebb91c	Consolidate stoppingAllScripts to ScriptEngines::_stopped	2016-05-13 15:24:15 -07:00
Zach Pomerantz	f40fe88ee7	Clean up entity script engine deletion	2016-05-12 17:51:36 -07:00
Zach Pomerantz	2cc788f98d	Rename ScriptEngine::wait to match std threading	2016-05-12 17:51:35 -07:00
Zach Pomerantz	820fdf09e2	Remove unused ScriptEngine::_wantSignals	2016-05-12 12:42:29 -07:00
Brad Hefta-Gaub	e01681eb52	Merge pull request #7856 from ZappoMan/NUEtweaks ... don't show help or login on first run	2016-05-11 10:53:09 -07:00
Brad Hefta-Gaub	33c5cb519a	cleanup firstRun with a common setting	2016-05-10 11:32:29 -07:00
Zach Pomerantz	68731973d8	Keep locker when adding script engine	2016-05-09 18:04:38 -07:00
Zach Pomerantz	a0d80b9508	Fix hang on new script on shutdown	2016-05-09 17:32:25 -07:00
Brad Davis	40316498a4	Enable script debugging	2016-05-09 17:02:40 -07:00
Brad Hefta-Gaub	754ef071eb	Merge pull request #7786 from sethalves/web-scripts-use-local-libs ... allow scripts on the web to refer to local libraries with /~/	2016-05-03 11:10:48 -07:00
ZappoMan	00838d1e1e	more CR feedback removed redundant abort code	2016-04-30 15:38:37 -07:00
Seth Alves	b28cfd27ec	fix problem where canonicalFilePath will strip a trailing slash	2016-04-29 13:17:59 -07:00
Seth Alves	f03130ff5a	more work toward keeping /~/../.. from working	2016-04-29 11:04:08 -07:00
Seth Alves	ced18fe6be	trying some more to get /~/ to work right	2016-04-28 18:29:54 -07:00
Seth Alves	8c2b89b910	trying to get /~/ from web sorted out	2016-04-28 18:29:46 -07:00
Seth Alves	648e6a74d7	don't let people access scripts outside of /~/	2016-04-28 15:43:58 -07:00
James B. Pollack	bced3c2c3c	change path for defaultscripts.js in scriptengine	2016-04-27 13:34:42 -07:00
Brad Hefta-Gaub	a21bc66fa3	add support to abort evaluation of long running scripts on shutdown	2016-04-26 16:21:11 -07:00
James B. Pollack	37fa703279	use system path instead of default for loading scripts	2016-04-26 15:50:45 -07:00
Andrew Meadows	3d1abf8fb1	use the new JS script location	2016-04-26 11:20:08 -07:00
David Rowe	a7b82e8cae	Decouple ui and shared libraries	2016-04-22 12:58:47 +12:00
Ryan Huffman	4e0ac2a4be	Remove fix for old QT file path bug in OSX	2016-04-18 16:07:53 -07:00
Brad Davis	5a5583d3a5	PR comments	2016-04-09 21:43:50 -07:00
Seth Alves	56b84b3106	fix display of path of selected file in running-scripts window	2016-04-01 12:05:49 -07:00
Seth Alves	35affe26e3	trying again on script loading changes	2016-04-01 11:52:47 -07:00
Seth Alves	0f288247a7	include script in default script location	2016-04-01 10:50:22 -07:00
Seth Alves	cfa847ba54	don't put empty folders at end of scripts tree. allow /~/ to work from outside scripts	2016-03-31 09:45:28 -07:00
Seth Alves	651d2c8954	fix script load from disk on windows	2016-03-30 17:27:36 -07:00
Seth Alves	065c238dd0	Merge branch 'use-local-scripts' of github.com:sethalves/hifi into use-local-scripts	2016-03-30 14:02:21 -07:00
Seth Alves	62372415be	get this working on windows	2016-03-30 14:01:35 -07:00
Seth Alves	f5333423ff	remove unused variable	2016-03-30 13:43:06 -07:00
Seth Alves	26e01bbacd	rewrite a bunch of path/url mangling code	2016-03-30 13:33:49 -07:00
Seth Alves	7c0bb72aff	started on making ~ mean the application directory in script paths	2016-03-29 18:32:46 -07:00
Seth Alves	0c72ca1be3	works on windows now	2016-03-29 13:39:35 -07:00
Seth Alves	b88770228e	convert running-scripts window to use local script files	2016-03-29 10:40:56 -07:00
Seth Alves	de8153bd75	on windows and osx use default scripts bundled with interface	2016-03-28 12:23:23 -07:00
Seth Alves	164d5d9c7e	try, try again	2016-02-16 01:13:37 -08:00
Seth Alves	f2c9bbc32d	filenames on Linux are case-sensitive	2016-02-16 00:39:54 -08:00
Brad Davis	aa03241dd9	Make all load script dialogs QML and respect previous script location	2016-01-28 15:53:04 -08:00
Brad Davis	e8adcd9f1f	Fix inability to stop local scripts	2016-01-12 21:11:47 -08:00
Brad Davis	55af5eaf06	Fix crash on shutdown due to lifetime of scripts	2016-01-12 12:40:02 -08:00