2058 commits

Author	SHA1	Message	Date
Kasen IO	bd066adbf6	Whitelist toggle not working c++ side.	2020-01-20 16:03:48 -05:00
Marcus Llewellyn	e5dd23b922	Merge pull request #33 from kasenvr/feature/metaverse-url-switching ... Ability to change Metaverse API from setting	2020-01-14 18:40:04 -06:00
David Rowe	ec1e6bc7d3	Merge branch 'DOC-55-C' into api-docs	2020-01-14 18:04:32 +13:00
David Rowe	050c6e2cc5	Merge branch 'DOC-212' into api-docs ... # Conflicts: # libraries/shared/src/RegisteredMetaTypes.h	2020-01-14 18:04:17 +13:00
David Rowe	b9a1b78531	Merge branch 'DOC-68' into api-docs ... # Conflicts: # libraries/shared/src/RegisteredMetaTypes.h	2020-01-14 18:02:23 +13:00
kasenvr	5fdd563bfa	Merge pull request #65 from kasenvr/fix/whitelist-server ... Whitelist Quality of Life Updates	2020-01-09 17:55:45 -05:00
Kasen IO	2c7911acb8	more housekeeping	2020-01-09 16:15:41 -05:00
Fluffy Jenkins	672ac8066b	Made changes	2020-01-08 04:38:33 +00:00
Kasen IO	a6dc494d7c	housekeeping	2020-01-07 19:40:42 -05:00
Kasen IO	13d79fec8b	Fixes bools and tab.	2020-01-07 13:04:28 -05:00
Kasen IO	d87cd01129	Adds major QOL updates to whitelist	2020-01-07 03:03:08 -05:00
Fluffy Jenkins	3c4d56bc50	Fixed whitespace	2020-01-07 04:10:15 +00:00
Fluffy Jenkins	b33ad80992	Init push	2020-01-07 04:00:13 +00:00
Kasen IO	20f5439fa8	Hard tabs converted to 4 length soft tabs.	2020-01-06 08:58:09 -05:00
Kasen IO	8124b7d4a1	Fixed tabs and spaces.	2020-01-06 08:29:01 -05:00
Kasen IO	fb5dbfc52a	Disable whitelist on entity_server scripts.	2020-01-05 23:32:28 -05:00
David Rowe	2dd981493e	Update classes' JSDoc per @hideconstructor	2019-12-23 14:13:48 +13:00
David Rowe	a92830f2c1	Miscellaneous JSDoc fixes	2019-12-23 09:09:27 +13:00
Kasen IO	c34cd996df	change Metaverse API from setting	2019-12-20 11:39:05 +01:00
David Rowe	1ebc6a575e	Model API JSDoc	2019-12-20 13:33:48 +13:00
David Rowe	5256f58520	Document callback function signatures for Script.addEventHandler()	2019-12-17 16:17:45 +13:00
David Rowe	3aaeba76a9	Fix typos in WebSocket JSDoc	2019-12-17 09:20:18 +13:00
David Rowe	025c136561	XMLHttpRequest API JSDoc	2019-12-17 09:19:47 +13:00
David Rowe	ea72036757	Typos	2019-12-14 12:36:36 +13:00
David Rowe	5359efead8	Add JSDoc missing for callback parameter	2019-12-14 12:33:51 +13:00
David Rowe	13abf7f016	WebSocket and WebSocketServer JSDoc	2019-12-14 11:59:18 +13:00
David Rowe	bbd16d7544	Fix global print function's JSDoc	2019-12-11 07:42:58 +13:00
David Rowe	5caa21e5d9	Update Script JSDoc accordingly	2019-12-11 07:42:40 +13:00
David Rowe	7d2e818ab1	console JSDoc	2019-12-11 07:41:37 +13:00
Kasen IO	3e6660b633	Updated whitelist debugs for clarity in dev log	2019-12-09 08:30:02 -05:00
Kasen IO	2de388ab3b	Fixes bug where empty "" whitespace allows all scripts.	2019-12-09 01:20:04 -05:00
Kasen IO	fe66dc82f3	scriptengine pulls from inferface.json correctly, removed extra debug, fixed QML to load to textarea correctly.	2019-12-08 23:11:21 -05:00
Kasen IO	f49e64b99f	Cleaned out extra commented code.	2019-12-08 21:12:20 -05:00
Kasen IO	2e36c40912	added QML + C++ system for whitelists	2019-12-07 21:37:23 -05:00
Kasen IO	edfce861a8	Merge branch 'kasen/core' into v0860-kasen-release+freshstart	2019-12-01 22:56:19 -05:00
Kasen IO	07d706d681	Removed all hardcoded whitelist rules	2019-12-01 22:55:51 -05:00
Kasen IO	0b46c53df1	Merge branch 'kasen/core' into v0860-kasen-release+freshstart	2019-12-01 19:59:59 -05:00
Brad Davis	d4b3a9ba49	Github actions	2019-11-18 15:20:37 -08:00
HifiExperiments	bae2ba7bae	merge with master	2019-11-02 01:08:56 -07:00
HifiExperiments	1e100a672e	merge with master and try to fix opacity mode stuff	2019-10-23 22:21:45 -07:00
David Rowe	777f969919	Typo	2019-10-24 09:00:29 +13:00
David Rowe	fffb81b474	Merge branch 'master' into DOC-191	2019-10-24 08:23:27 +13:00
David Rowe	185d6990eb	Add missing threading checks to Recording API methods	2019-10-16 09:17:29 +13:00
David Rowe	e708cb98bb	Fix crash in Recorder.stopRecording() when no recording is being made	2019-10-15 11:29:49 +13:00
David Rowe	1715a86dba	Fix typo in Assets JSDoc	2019-10-12 07:58:26 +13:00
David Rowe	e4bc3a7d9d	Recording JSDoc	2019-10-12 07:58:13 +13:00
David Rowe	f224832d27	Merge branch 'master' into DOC-111	2019-10-08 20:44:13 +13:00
jennaingersoll	8d8449d8d7	Merge pull request #16166 from ctrlaltdavid/DOC-159 ... DOC-159: File JSDoc	2019-10-07 16:37:11 -07:00
Shannon Romano	5bbe271c7a	Merge pull request #16299 from ctrlaltdavid/DOC-187 ... DOC-187: Mat4 JSDoc	2019-10-07 09:11:32 -07:00
Shannon Romano	921cec872b	Merge pull request #16300 from hyperlogic/bug-fix/mat4-forward-right-up-fixes ... Fix for Mat4.getForward, getRight and getUp	2019-10-04 17:00:43 -07:00
David Rowe	70577b8f34	Remove "not working" warnings in anticipation of fix	2019-10-05 12:13:57 +13:00
Anthony J. Thibault	521f64f152	normalize axes returned by Mat4.getForward getUp and getRight	2019-10-04 14:10:28 -07:00
Anthony J. Thibault	e3f799d039	Fix for Mat4.getForward, getRight and getUp ... It should match the results from the same methods on the Quat class.	2019-10-04 13:59:38 -07:00
David Rowe	6e6d438d36	Tidying	2019-10-05 09:34:31 +13:00
David Rowe	a56f82c1ba	Mat4 JSDoc	2019-10-05 09:27:31 +13:00
Simon Walton	95248c7ccd	Add <future> header for Android	2019-09-30 23:43:06 -07:00
Simon Walton	595b473be7	Make AssetScriptingInterface::initializeCache() blocking	2019-09-30 17:55:24 -07:00
David Rowe	b174e002a9	Implement Recording.setPlayerVolume()	2019-09-24 12:52:51 +12:00
David Rowe	9d9317c50d	Miscellaneous fixes and typos	2019-09-20 10:19:45 +12:00
David Rowe	d5e08d19e3	Fix JSDoc for miscellaneous white space issues	2019-09-20 08:17:24 +12:00
David Rowe	dff37a71eb	Fix JSDoc markup HTML issues	2019-09-17 16:26:09 +12:00
David Rowe	7bbca94d43	Doc review	2019-09-12 14:41:43 +12:00
Shannon Romano	fa8c959699	Merge pull request #16133 from ctrlaltdavid/DOC-59 ... DOC-59: Assets JSDoc	2019-09-11 17:19:45 -07:00
Shannon Romano	65d0bb1342	Merge pull request #15906 from kasenvr/kpi-v1-modkit-rc ... Kasen Plugin Infrastructure v½ Codename "Modkit Mini"	2019-09-11 13:04:01 -07:00
David Rowe	04203b1425	File JSDoc	2019-09-10 12:01:38 +12:00
Sam Gateau	acf51ad217	Merge pull request #16137 from jherico/fix/bugz-1398 ... BUGZ-1398: Tablet access to local HTML	2019-09-06 09:59:22 -07:00
Brad Davis	0511f87bad	BUGZ-1398: Tablet access to local HTML https://youtu.be/7EWQOeQf32U	2019-09-05 11:43:43 -07:00
humbletim	271fac4bca	Merge remote-tracking branch 'upstream/master' into kasenvr-kpi-v1-modkit-rc-merge	2019-09-05 09:46:21 -04:00
HifiExperiments	97b9179144	merge with master	2019-09-05 00:46:56 -07:00
David Rowe	49ab504226	Make placement of callback JSDoc consistent	2019-09-05 12:23:56 +12:00
David Rowe	06ebba554e	Doc review	2019-09-05 12:23:12 +12:00
David Rowe	6474705ca2	Reformat "supported script types" in Entities and Scripts signals	2019-09-04 21:06:30 +12:00
David Rowe	cf01d9f1af	Script.require() JSDoc fixes	2019-09-04 21:04:03 +12:00
David Rowe	f384b79bf5	Merge branch 'master' into DOC-59	2019-09-04 15:47:23 +12:00
David Rowe	9457aed631	Tidying and polishing Assets JSDoc	2019-09-04 15:43:18 +12:00
David Rowe	8820d1d76b	Assets API cache methods	2019-09-04 13:48:06 +12:00
jennaingersoll	037ad36262	Merge pull request #16103 from ctrlaltdavid/DOC-64 ... DOC-64: ScriptDiscoveryService API JSDoc	2019-08-30 22:35:39 -07:00
Bradley Austin Davis	8e3b337a6e	Merge pull request #16120 from jherico/fix/bugz-1365 ... BUGZ-1365: prevent server scripts from accessing local files in HTML controls	2019-08-30 13:10:09 -07:00
Brad Davis	428a58710d	BUGZ-1365: Ensure that by default web views can't access local content	2019-08-29 13:44:49 -07:00
Shannon Romano	b4d0c87654	Merge pull request #16117 from ctrlaltdavid/BUGZ-1316 ... BUGZ-1316: Fix crashes in Assets API	2019-08-29 09:07:37 -07:00
David Rowe	fb818c0726	Fix crash in Assets.setBakingEnabled() when callback undefined	2019-08-29 13:33:22 +12:00
David Rowe	746f97a0e0	Fix crash in Assets.getAsset() when callback undefined	2019-08-29 13:33:04 +12:00
Shannon Romano	f63fc15d4f	Merge pull request #16115 from sabrina-shanman/crash_shutdown_running-script ... Attempt to fix crash from script running too late	2019-08-28 15:54:10 -07:00
sabrina-shanman	437f6b4096	Only say we're throwing a script error when we mean it	2019-08-28 14:58:57 -07:00
David Rowe	d52bb66048	Add missing JSDoc	2019-08-29 09:38:43 +12:00
sabrina-shanman	67a06b3a74	Attempt to fix crash from script running too late	2019-08-28 14:28:12 -07:00
David Rowe	8c735ed6ae	Fix ScriptDiscoveryService.scriptsModel.parent() crash for invalid index	2019-08-28 16:32:52 +12:00
David Rowe	757a4f908b	Fix ScriptDiscoveryService.scriptsModel.data() crash for invalid row ... Also fixes unexpected data for invalid column > 1.	2019-08-28 16:32:22 +12:00
David Rowe	3e795d9b99	Typos and improvements	2019-08-27 10:03:26 +12:00
David Rowe	c19c1c9a5d	Scripts API JSDoc fixes	2019-08-27 09:24:01 +12:00
David Rowe	fff2a15960	ScriptsModel and ScriptsModelFilter classes' JSDoc	2019-08-27 09:24:01 +12:00
David Rowe	e1e74a2c34	ScriptDiscoveryService API JSDoc	2019-08-27 09:24:00 +12:00
David Rowe	2ad1d7a2a2	Fix typos	2019-08-22 10:27:17 +12:00
David Rowe	942347158a	Collapse some function signatures' JSDoc	2019-08-22 10:16:56 +12:00
David Rowe	11e72c638b	Assets API compression methods JSDoc	2019-08-22 09:47:25 +12:00
David Rowe	5f3081784c	Assets API methods that include mappings JSDoc	2019-08-21 12:36:37 +12:00
David Rowe	817bc6cd43	Assets API base functionality JSDoc	2019-08-21 09:50:23 +12:00
Simon Walton	85da916a3b	Merge pull request #16061 from SimonWalton-HiFi/entities-scriptengine-takedown ... BUGZ-984: Wait for client entity-scripts to unload when shutting down	2019-08-16 10:12:38 -07:00
Simon Walton	9aacd136b8	Add blocking to script unload for client entity-scripts	2019-08-14 13:51:40 -07:00
Clement	90aeb636bd	Delete reply after the callback is executed	2019-08-12 17:21:22 -07:00