118 commits

Author	SHA1	Message	Date
Zach Fox	8044b33d65	This also works	2019-06-21 13:44:31 -07:00
Zach Fox	5067fd4cd2	OK this is definitely working	2019-06-21 13:41:11 -07:00
Zach Fox	8fdfdbaae4	Another attempt, still not working	2019-06-19 13:31:21 -07:00
SamGondelman	300dd39abf	fix script engine shutdown	2019-03-13 12:23:31 -07:00
danteruiz	30bd9774b2	script engine to load platform specific files	2019-02-05 13:11:54 -08:00
Wayne Chen	4c9c785c24	Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2	2018-12-10 07:57:44 -08:00
Dante Ruiz	177a94b9a9	fix realod all scripts functionality	2018-12-07 11:48:03 -08:00
Wayne Chen	a2a4d2ff89	removing trailing debug	2018-12-05 08:21:11 -08:00
Wayne Chen	07599c02c8	true reversion of scrips param	2018-12-05 08:16:54 -08:00
Wayne Chen	9deb15b9f6	Merge branch 'master' into loginInitiative2	2018-11-28 19:10:20 -08:00
Dante Ruiz	c4a9ca3445	fix interface crashing when reloading scripts	2018-11-27 09:32:37 -08:00
Wayne Chen	c85b840db0	Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2	2018-11-14 14:47:56 -08:00
Wayne Chen	f683a51ef5	allowing qApp to load overlay/load default scripts if runningscripts empty	2018-11-07 16:32:06 -08:00
Roxanne Skelly	cef7000a72	Case 19754 - Remove logging URLs and related file locations. ... The goal is to strip out data that can be used by untoward users in copying models, avatars, etc.	2018-11-06 16:24:32 -08:00
Wayne Chen	8797c40d94	cleanup unused functions	2018-11-06 15:04:51 -08:00
Wayne Chen	ed847203ea	wip for getting hmd overlay	2018-10-29 11:33:28 -07:00
SamGondelman	d2699e8e5b	some more attempted cleanup	2018-07-10 10:50:01 -07:00
SamGondelman	7954865141	trying to fix dependency shutdown	2018-07-05 14:34:37 -07:00
Seth Alves	01632ddd29	Merge pull request #13345 from ctrlaltdavid/21890 ... Fix memory leak when reloading scripts	2018-06-27 09:39:53 -07:00
Seth Alves	3c081c4bf8	Merge pull request #13377 from danteruiz/fix-double-scripts-on-reload ... prevent having more than one instance of a script running after reloading the script	2018-06-15 17:17:35 -07:00
Dante Ruiz	8b4b95f890	prevent have more than one instance of a script after reloading script	2018-06-14 14:00:40 -07:00
Zach Fox	3c681554de	Fix MS13202: Don't save incomplete list of scripts to Settings while reloading scripts	2018-06-14 13:50:30 -07:00
David Rowe	9338c217cd	Fix memory leak when reloading scripts	2018-06-09 16:58:49 +12:00
NissimHadar	7f9f9d769a	Corrected bug causing Interface not to exit at end of test.	2018-05-08 15:51:52 -07:00
NissimHadar	c3ef6aab1c	Don't save test scripts	2018-05-07 12:51:41 -07:00
NissimHadar	3b566332c6	Shutdown interface when test script finishes.	2018-05-03 14:34:12 -07:00
NissimHadar	3a5425122b	Shutdown interface when test script finishes.	2018-05-03 14:31:01 -07:00
John Conklin II	7a5fce4315	Merge pull request #12991 from luiscuenca/avatarScript ... Avatar Scripts	2018-05-02 12:23:13 -07:00
luiscuenca	2de982a5a2	Added script types and better script reload	2018-04-30 12:04:35 -07:00
John Conklin II	dd32ca33a5	Merge pull request #12957 from sethalves/quiet-logging ... Quiet logging	2018-04-27 14:59:38 -07:00
Seth Alves	bec39369f7	remove some uncatagorized logging, suppress some categories by default	2018-04-20 16:08:57 -07:00
ZappoMan	1a82101360	fix bug 349	2018-04-18 09:27:09 -07:00
humbletim	f8fe06213d	CR feedback; whitespace / remove unnecessary diffs	2018-02-23 09:11:23 -05:00
humbletim	5791ca4c51	interim checkin	2018-02-20 12:22:04 -05:00
ZappoMan	4ad5d34a10	more preferences cleanup, removing some dead code from ScriptEngines/ScriptModel	2018-01-20 17:20:42 -08:00
Seth Alves	8a49edbecb	code review	2017-09-15 10:08:35 -07:00
Seth Alves	d89f2b77da	rework ScriptEngine lifetimes using 'smart' pointers	2017-09-14 10:42:21 -07:00
Brad Davis	6fc82bb351	Switch to preprocessor macro for blocking invokes to capture function information	2017-06-30 11:36:24 -07:00
Brad Davis	b52dd7b822	Don't use blocking connections on the main thread	2017-06-29 20:45:17 -07:00
Brad Hefta-Gaub	dc649e84df	Merge pull request #10792 from jherico/qml_crashes ... Trying to fix QtQml/QtScript crashes	2017-06-23 12:41:43 -07:00
Brad Davis	4439de240a	Trying to fix QtQml/QtScript crashes	2017-06-22 16:39:57 -07:00
David Kelly	06d1ac8bf7	Merge remote-tracking branch 'upstream/master' into dk/scriptsSwitch	2017-06-22 14:14:54 -07:00
David Kelly	ff5b37c785	new --scripts switch overrides default scripts location	2017-06-22 14:09:05 -07:00
Brad Hefta-Gaub	7668fbb7a0	Merge pull request #10755 from seefo/fb5278 ... Fixed an issue where toolbar buttons duplicated themselves when reloading scripts	2017-06-22 13:35:05 -07:00
seefo	00a3fc77a1	Fixed an issue where toolbar buttons duplicated themselves when reloading scripts	2017-06-20 11:18:22 -07:00
Brad Hefta-Gaub	cbded766b1	Merge pull request #10676 from NeetBhagat/21369 ... WL 21369 - Implement parts of the JS "console" object	2017-06-20 11:06:34 -07:00
Brad Davis	fece438602	Cleanup and refactoring	2017-06-15 18:58:56 -07:00
NeetBhagat	9646eba873	Complete console.trace and added a testcases for all 13 functions.	2017-06-13 23:52:48 +05:30
NeetBhagat	904e25c9e3	intial commit #21369 Working on clear method of console	2017-06-07 14:37:18 +05:30
Atlante45	10eb353126	Ensure user never loses its running scripts	2017-05-22 18:55:58 -07:00