1874 commits

Author	SHA1	Message	Date
Thijs Wenker	06491ef12f	API function for retrieving multiple entity properties with better performance	2018-09-20 19:34:00 +02:00
SamGondelman	c522d1bc93	merge with master	2018-09-14 00:57:13 -07:00
Clement	e6b4ccef16	Add lock around _entityScripts	2018-09-13 15:10:16 -07:00
John Conklin II	558f3dc7e5	Merge pull request #13964 from dback2/reloadScriptQThreadCrash ... Destroy script thread on finish instead of on ScriptEngine destroyed	2018-09-10 14:11:37 -07:00
David Back	3601ade8ba	destroy thread from thread finished not scriptEngine destroyed	2018-09-07 18:36:36 -07:00
Ryan Huffman	22df1b3bc6	Add comment to Assets.sendFakeHandshake about excluding jsdoc	2018-09-06 17:19:41 -07:00
SamGondelman	9b75c7e07f	trying to separate colors and vectors	2018-09-04 17:20:05 -07:00
Sam Gondelman	6730635931	Merge branch 'master' into scriptvec3	2018-08-27 10:43:52 -07:00
SamGondelman	283c0c0311	s i m p l i f y	2018-08-23 11:47:56 -07:00
Stephen Birarda	01e8fd66a3	fix script engine(s) cleanup from ESS	2018-08-22 13:52:37 -07:00
Sam Gondelman	f0986a7f5a	Merge branch 'master' into scriptvec3	2018-08-20 10:56:45 -07:00
John Conklin II	1edf1b4337	Merge pull request #13555 from SamGondelman/destroy ... Trying to fix dependency shutdown	2018-08-16 13:14:58 -07:00
Stephen Birarda	e686df6fb9	Merge pull request #13720 from Atlante45/feat/test-tool ... Stack tester changes	2018-08-08 13:40:05 -04:00
Sam Gondelman	2edefe3209	Merge branch 'master' into destroy	2018-08-06 09:51:14 -07:00
Sam Gondelman	7772e8adf2	Merge branch 'master' into scriptvec3	2018-08-03 14:57:49 -07:00
David Rowe	2270255d88	JSDoc review	2018-08-04 07:22:12 +12:00
David Rowe	32e3bb0e1d	Merge branch 'master' into M08513-a ... # Conflicts: # libraries/audio/src/SoundCache.h	2018-08-03 10:29:32 +12:00
SamGondelman	8a9c27ed92	Merge remote-tracking branch 'upstream/master' into destroy	2018-08-01 16:07:48 -07:00
Clement	9c89aa9f90	Make sure the stack test interface gets cleaned up	2018-08-01 13:29:07 -07:00
John Conklin II	7a635b6a57	Merge pull request #13709 from thoys/fix/require-load-queue ... MS17041: Fix for require fail when the same script loaded simultaneously from another entity script	2018-08-01 11:15:32 -07:00
Thijs Wenker	74343c71d8	CR fixes	2018-07-31 22:29:53 +02:00
SamGondelman	2ca217eb4a	merge with master	2018-07-30 17:43:15 -07:00
Clement	949c7f8c19	Add automated test tool scripting interface	2018-07-30 17:18:32 -07:00
Thijs Wenker	ba8d445444	fix require by queueing content requests	2018-07-28 00:25:16 +02:00
Dante Ruiz	b750a005cf	fix script memory issue	2018-07-24 16:31:12 -07:00
David Rowe	396382afd7	Fill in Audio API JSDoc	2018-07-19 09:31:48 +12:00
David Rowe	806228299e	Stub out Audio JSDoc	2018-07-15 10:31:48 +12:00
SamGondelman	9929529f30	vec3 conversion	2018-07-11 14:18:22 -07:00
Clement	e5206a94a8	Revert "setStereoInput always returns true to not break old scripts" ... This reverts commit 2bf7db6952.	2018-07-11 11:51:06 -07:00
SamGondelman	5bbd5b9e52	vec2 conversion	2018-07-10 16:32:49 -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
Anthony Thibault	a5919ee3fa	Merge pull request #13497 from hyperlogic/bug-fix/script-engine-batchloader-memory-corruption-fix ... Fix memory corruption when running scripts using Script.require().	2018-06-28 14:18:56 -07:00
Anthony J. Thibault	ac6fcf092c	Fix memory corruption via lambdas that capture local variables by reference. ... The lambdas in ScriptEngine::fetchModuleSource() were referencing local stack variables by reference. This could lead to un-expected results including memory corruption. To workaround this issue the QTimer and QEventLoop variables are allocated on the heap and held onto by a shared_ptr. This shared_ptr is passed to the lambda. This will not result in cycles and should result in the QTimer and QEventLoop being destroyed when the BatchLoader object they are connected to is deleted.	2018-06-28 11:15:25 -07:00
John Conklin II	040978830a	Merge pull request #13413 from Atlante45/fix/audio-starve ... Fix audio device sometimes being on the wrong thread	2018-06-28 09:59:00 -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
Clement	2bf7db6952	setStereoInput always returns true to not break old scripts	2018-06-19 16:37:11 -07:00
Atlante45	4a4c0d132e	Make stereo interface async	2018-06-18 17:26:29 -07:00
Atlante45	29ff47c6fb	Ensure audio devices are made on the right thread	2018-06-18 16:28:52 -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
Alexander Ivash	5897c9948d	terminate thread if it didn't complete during MAX_SCRIPT_QUITTING_TIME	2018-06-06 03:52:22 +03:00
Gabriel Calero	bb73af7230	Show stats button only in debug mode. Add isDebugMode to Script public interface	2018-05-29 17:21:44 -03:00
David Rowe	ebeee51581	Update image links	2018-05-23 17:20:24 +12:00
David Rowe	e44e7ca35f	Fix up Resource and resource cache APIs' JSDoc	2018-05-21 11:57:16 +12:00
David Rowe	6d4f704279	Regularize some JSDoc usage	2018-05-21 09:32:10 +12:00
David Rowe	f571e90ef5	Merge branch 'master' into 21872-b	2018-05-16 10:20:53 +12:00
David Rowe	6e1a091447	Mat4 API JSDoc stubs	2018-05-12 14:44:38 +12:00
David Rowe	496154fdbe	File API JSDoc stubs	2018-05-11 21:07:12 +12:00
David Rowe	fab85c3f6d	Fix JSDoc function definitions specifying properties instead of params	2018-05-11 09:52:48 +12:00
Seth Alves	4410402c7d	Merge pull request #13114 from sethalves/more-logging-suppression ... more suppression of logging	2018-05-09 17:36:12 -07:00
MiladNazeri	bc03fb398f	Merge pull request #13102 from ctrlaltdavid/21856-h ... Fix JSDoc for Users.requestUsernameFromID	2018-05-09 13:35:06 -07:00
Seth Alves	7466d08f1f	more suppression of logging	2018-05-09 13:01:49 -07: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	481eddb2a3	Merge branch 'master' of github.com:highfidelity/hifi into commandLineParametersForAutotester	2018-05-07 08:24:03 -07:00
Clement	da9fb9c751	Fix non self-sufficient headers	2018-05-04 16:26:41 -07:00
David Rowe	a35517d985	Fix JSDoc for Users.requestUsernameFromID	2018-05-05 07:05:10 +12: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
MiladNazeri	8e214d8ee8	Merge pull request #13049 from ctrlaltdavid/21856-d ... List which contexts each namespace and class is available in	2018-05-03 01:29:14 -07:00
John Conklin II	7a5fce4315	Merge pull request #12991 from luiscuenca/avatarScript ... Avatar Scripts	2018-05-02 12:23:13 -07:00
David Rowe	1aa28b7f54	Merge remote-tracking branch 'upstream/master' into 21856-d ... # Conflicts: # interface/src/LODManager.h	2018-05-02 07:50:55 +12:00
David Rowe	a1fc1c4810	Add JSDoc for Entity preload and unload signals	2018-05-01 21:55:14 +12:00
luiscuenca	50ca09b3b4	minor fixes	2018-04-30 16:26:04 -07:00
luiscuenca	2de982a5a2	Added script types and better script reload	2018-04-30 12:04:35 -07:00
David Rowe	2cc3ed6287	List which contexts each namespace and object is available in	2018-04-28 20:00:28 +12:00
John Conklin II	dd32ca33a5	Merge pull request #12957 from sethalves/quiet-logging ... Quiet logging	2018-04-27 14:59:38 -07:00
John Conklin II	ddedfce8a3	Merge pull request #12932 from ZappoMan/fixBug349 ... fix bug 349	2018-04-27 12:48:17 -07:00
David Rowe	08dc9b133f	Docs to JSDoc review	2018-04-26 21:10:28 +12:00
MiladNazeri	0f87e53902	Merge pull request #12963 from MiladNazeri/docs/DocsToJSDocsUpdate ... Docs/docs to js docs update	2018-04-25 12:26:19 -07:00
milad nazeri	4c736b2d62	Fixed defaults	2018-04-24 21:38:48 -07:00
David Rowe	cae9447ac5	Doc review	2018-04-25 15:09:47 +12:00
milad nazeri	23d07fa292	fixed spacing issue	2018-04-24 13:14:55 -07:00
milad nazeri	1121fe8da0	fix tabs	2018-04-23 21:47:53 -07:00
milad nazeri	4ac06fe99f	Updating previous jsdocs	2018-04-22 22:22:33 -07:00
David Rowe	941e9360dd	JSDoc fixes	2018-04-23 16:09:56 +12:00
David Rowe	d65f66a73d	Interim JSDoc for Recording	2018-04-23 14:13:29 +12:00
David Rowe	4fb55ec2af	Interim JSDoc for Users	2018-04-23 09:59:14 +12:00
David Rowe	2c39f2dbad	Interim JSDoc for Scene	2018-04-22 17:37:06 +12:00
David Rowe	62930eb576	Interim JSDoc for Script	2018-04-22 15:26:39 +12:00
David Rowe	01870af624	Interim JSDoc for ScriptDiscoveryService	2018-04-22 11:32:46 +12:00
MiladNazeri	3710ce593d	Merge pull request #12922 from ctrlaltdavid/21815 ... Controller API JSDoc	2018-04-21 10:44:05 -07:00
Seth Alves	bec39369f7	remove some uncatagorized logging, suppress some categories by default	2018-04-20 16:08:57 -07:00
David Rowe	8173ac87a8	Minor improvement to Quat.IDENTITY JSDoc	2018-04-20 16:41:10 +12:00
David Rowe	b1e214de5a	Vec3 API JSDoc	2018-04-20 16:40:15 +12:00
David Rowe	0a7cccc3f7	Move Vec2 and Vec4 JSDoc	2018-04-20 12:47:53 +12:00
milad	42471c539b	initial fixes from ctralt david's comments	2018-04-19 13:40:57 -07:00
milad	3f129bda13	More done on audio	2018-04-18 20:04:41 -07:00
ZappoMan	1a82101360	fix bug 349	2018-04-18 09:27:09 -07:00
David Rowe	9f83c606e9	Controller API JSDoc	2018-04-17 11:46:40 +12:00
MiladNazeri	e054f16c46	Merge pull request #12526 from ctrlaltdavid/21709 ... Entities API JSDoc	2018-03-12 14:40:09 -07:00
John Conklin II	42a686ad93	Merge pull request #12578 from druiz17/use-correct-audio-api ... use correct scripting api for audio in Audio.qml	2018-03-09 13:41:20 -08:00
Dante Ruiz	3a39fca268	made requested changes	2018-03-09 10:09:51 -08:00
Dante Ruiz	c49d0557fc	fixing check box issues	2018-03-09 09:29:37 -08:00
Atlante45	69fb830480	Merge branch 'RC65' of https://github.com/highfidelity/hifi into new-master	2018-03-08 17:23:17 -08:00
David Rowe	b461a422c6	Merge branch 'master' into 21709	2018-03-09 14:18:42 +13:00
Sam Gondelman	1e9cfe29f2	Merge pull request #12388 from highfidelity/android ... Android Tip	2018-03-08 10:18:35 -08:00
David Rowe	a62b6b7150	Merge branch 'master' into 21709	2018-03-07 17:34:53 +13:00
Elisa Lupin-Jimenez	c6e5f4c9c8	zip file drags don't auto add model textures	2018-03-06 19:24:09 -08:00
Brad Davis	8bfc610cfb	Merge remote-tracking branch 'upstream/master' into android	2018-03-05 11:48:58 -08:00
Dante Ruiz	55d8cfd4c1	make sure dont make audio devices that don't use stereo use stereo	2018-03-02 10:56:44 -08:00
David Rowe	d82a300f5f	Miscellaneous JSDoc improvements	2018-03-01 09:58:35 +13:00
David Rowe	3275846882	Material entity JSDoc	2018-03-01 09:57:42 +13:00
David Rowe	a782b6779a	Merge branch 'master' into 21709 ... # Conflicts: # interface/src/ui/overlays/Overlays.h # interface/src/ui/overlays/Shape3DOverlay.cpp # libraries/entities/src/EntityItemProperties.cpp # libraries/entities/src/EntityScriptingInterface.h	2018-02-28 12:42:05 +13:00
Brad Davis	3e552e5739	Fix warnings	2018-02-26 09:53:35 -08:00
humbletim	f8fe06213d	CR feedback; whitespace / remove unnecessary diffs	2018-02-23 09:11:23 -05:00
humbletim	72fca7e57e	Merge remote-tracking branch 'samuel/scriptableMaterials' into Leopoly_Phase1_010_graphics-scripting-merge	2018-02-22 05:18:05 -05:00
humbletim	be8d79f53f	CR fedback and cleanup	2018-02-22 05:15:01 -05:00
SamGondelman	4c6169ec78	merge and a little cleanup	2018-02-20 15:45:34 -08:00
humbletim	5791ca4c51	interim checkin	2018-02-20 12:22:04 -05:00
David Rowe	86a6f73fb4	Quat JSDoc improvement	2018-02-19 12:21:21 +13:00
Andrew Meadows	96c97547f9	Merge pull request #12205 from jherico/no_widgets ... Remove some unneeded Qt dependencies	2018-02-05 15:32:54 -08:00
humbletim	06afaa7470	BufferView <-> QVariant/QScriptValue conversion ... update MeshProxy/SimpleMeshProxy and ScriptableModel ModelScriptingInterface / scriptable::ModelProvider integration update to RC-63 initial graphics-scripting refactoring graphics-scripting baseline commit wip commit Geometry -> MeshPart remove SimpleMeshProxy collapse graphics-utils -> graphics-scripting scriptable::Model => scriptable::ScriptableModel	2018-02-01 16:30:29 -05:00
Bradley Austin Davis	b97c938544	Merge pull request #12216 from thoys/feat/js-script-console-auto-complete ... JS scripting console auto-complete	2018-01-31 10:39:51 -08:00
MiladNazeri	3585bead96	Merge pull request #12037 from humbletim/Leopoly_Phase1_004_RayPick-Changes ... Leopoly_Phase1_004_RayPick-Changes	2018-01-29 14:02:38 -08:00
MiladNazeri	9baf02b7a1	Merge pull request #12036 from humbletim/Leopoly_Phase1_003_Asset-Request ... Leopoly_Phase1_003_Asset-Request	2018-01-29 11:40:41 -08:00
Brad Davis	0781d8eaf0	Remove some unneeded Qt dependencies	2018-01-28 22:18:24 -08:00
Thijs Wenker	45487a1e45	Merge branch 'master' of github.com:highfidelity/hifi into feat/js-script-console-auto-complete ... # Conflicts: # interface/CMakeLists.txt	2018-01-25 22:51:35 +01:00
ZappoMan	cb01bd14b9	Merge branch 'master' of https://github.com/highfidelity/hifi into sendDataDescription	2018-01-25 10:39:43 -08:00
humbletim	63a226f999	make fromScriptValue logic easier to follow for CR; eliminate extra QByteArray conversion	2018-01-24 13:49:58 -05:00
humbletim	c2ee13931e	changes per CR feedback; additional jsdoc	2018-01-24 13:38:10 -05:00
humbletim	65455e7b50	Merge remote-tracking branch 'upstream/master' into Leopoly_Phase1_004_RayPick-Changes	2018-01-23 14:57:33 -05:00
humbletim	76cbc4ee55	separate getAsset fail/then handlers	2018-01-23 14:47:49 -05:00
humbletim	3a735c1fc7	CR feedback and code cleanup	2018-01-23 03:12:26 -05:00
ZappoMan	4ad5d34a10	more preferences cleanup, removing some dead code from ScriptEngines/ScriptModel	2018-01-20 17:20:42 -08:00
humbletim	395cc663dd	reuse same disk cache as AssetClient	2018-01-19 15:10:36 -05:00
Thijs Wenker	0f7f58417b	JS scripting console auto-complete	2018-01-19 19:11:12 +01:00
humbletim	d2a3a71f00	trying JS_VERIFY on for size (instead of JS_ASSERT)	2018-01-18 21:48:41 -05:00
humbletim	49bb9420cc	Merge branch 'master' into Leopoly_Phase1_003_Asset-Request	2018-01-17 17:11:33 -05:00
humbletim	0930cc4f0e	partial getMapping PR integration	2018-01-17 17:08:57 -05:00
Brad Davis	6a06bf405a	Merge remote-tracking branch 'upstream/master' into android	2018-01-16 18:24:44 -08:00
Brad Davis	ceb60f6eba	Fix built-in resource loading from scripts	2018-01-16 12:33:09 -08:00
humbletim	b91d536dd0	rename model:: -> graphics::	2018-01-16 12:46:16 -05:00
humbletim	08ccda9cfc	rename libraries/model(src/model) -> libraries/graphics(src/graphics)	2018-01-16 12:44:44 -05:00
Seth Alves	76048f3c30	error handling	2018-01-15 10:48:12 -08:00
Seth Alves	3e7d303661	export atp GetMappingRequest to js	2018-01-15 09:56:46 -08:00
Brad Davis	7579451c24	Merge remote-tracking branch 'upstream/master' into android	2018-01-11 23:31:45 -08:00
Seth Alves	568c27d6e0	Merge pull request #12039 from luiscuenca/currentAPI ... Fix and improve currentAPI.js	2018-01-10 17:55:08 -08:00
Brad Davis	2c35242af1	Merge remote-tracking branch 'upstream/master' into android_nov	2018-01-10 13:40:12 -08:00
Olivier Prat	db9e5fdae8	Merged from master but rendering seems broken	2018-01-09 11:05:34 +01:00
Gabriel Calero	7fbd23f36b	Merge branch 'android_render_pr' of https://github.com/gcalero/hifi into android_render_pr	2018-01-08 17:38:28 -03:00
Gabriel Calero	6050737e7c	Resolving comments in PR	2018-01-08 17:36:08 -03:00
Bradley Austin Davis	68cd768a65	Merge branch 'android' into android_render_pr	2018-01-08 12:49:52 -05:00
Gabriel Calero	76b38bebad	Make Interface run in Android	2018-01-03 16:36:11 -03:00
humbletim	8d2e041678	remove debug prints; CR feedback	2018-01-03 03:39:24 -05:00
Olivier Prat	752952507d	Fixed memory leak in ModelScriptingInterface::appendMeshes and wrong normal transformation in ModelScriptingInterface	2017-12-22 14:18:02 +01:00
luiscuenca	d93828f2f0	Fix an improve currentAPI.js	2017-12-21 11:50:02 -07:00