1883 commits

Author	SHA1	Message	Date
Sam Gondelman	e4847cc4ae	Merge branch 'master' into proceduralMesh	2019-06-24 10:16:45 -07:00
Shannon Romano	13615eb9ff	Merge pull request #15818 from sabrina-shanman/crash_scriptengine_thread ... (BUGZ-619) Fix potential crash when ending script on main thread	2019-06-21 15:08:42 -07:00
sabrina-shanman	4fafa2135a	Fix potential crash when ending script on main thread	2019-06-21 14:20:15 -07:00
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	d49205be74	Merge branch 'master' of github.com:highfidelity/hifi into SUI/fixLasers	2019-06-20 09:45:49 -07:00
Simon Walton	7701710aa5	Consider a NetworkClipLoader resource with null URL to be failed	2019-06-19 15:02:16 -07:00
Zach Fox	8fdfdbaae4	Another attempt, still not working	2019-06-19 13:31:21 -07:00
SamGondelman	37feb7f027	merge with master	2019-06-10 10:29:39 -07:00
jennaingersoll	677b54e240	Merge pull request #15684 from ctrlaltdavid/DOC-78 ... DOC-78: Polish Vec3 JSDoc	2019-06-05 16:26:32 -07:00
David Rowe	42cb3d9828	Polish Vec3 API JSDoc	2019-06-06 10:26:43 +12:00
Shannon Romano	a3d3190813	Merge pull request #15678 from ctrlaltdavid/DOC-75 ... DOC-75: Polish Users JSDoc	2019-06-05 14:20:19 -07:00
David Rowe	eac7d298dc	Change "privacy bubble" to "privacy shield"	2019-06-06 08:21:22 +12:00
David Rowe	ef56cba71b	Polish Uuid API JSDoc	2019-06-05 14:39:27 +12:00
David Rowe	6299d38673	Distinguish between Uuid API and Uuid type in JSDoc	2019-06-05 14:39:05 +12:00
David Rowe	0bdca38644	Polish Users JSDoc	2019-06-05 11:46:14 +12:00
Anthony J. Thibault	e1534b34b4	Workaround crash in reportAdditionalMemoryCost other platforms	2019-06-04 08:56:07 -07:00
Sam Gondelman	3d05a954bc	Merge branch 'master' into proceduralMesh	2019-05-23 09:35:14 -07:00
David Rowe	5227b35c6b	Revise changes	2019-05-21 10:32:12 +12:00
David Rowe	ca7ddece8b	Add missing Script JSDoc	2019-05-21 10:32:12 +12:00
David Rowe	0a0a25139c	Deprecate items that shouldn't be in the Script API	2019-05-21 10:32:12 +12:00
David Rowe	d196e35701	Polish existing Script JSDoc	2019-05-21 10:32:12 +12:00
David Rowe	0e478de1a2	Stub out missing Script JSDoc	2019-05-21 10:32:12 +12:00
SamGondelman	da254c2ccc	(¬‿¬)	2019-05-15 23:48:04 -07:00
Shannon Romano	72d000a76d	Merge pull request #15521 from ctrlaltdavid/M22489 ... Case 22489: Scene JSDoc	2019-05-13 15:49:44 -07:00
David Rowe	71f7132a6b	Scene JSDoc	2019-05-08 09:17:11 +12:00
David Rowe	638e040e17	Quat JSDoc update	2019-04-30 12:13:08 +12:00
David Rowe	fbe49bbfd4	Doc review	2019-04-27 10:20:35 +12:00
David Rowe	311826c04d	Merge branch 'master' into M22215	2019-04-27 10:03:24 +12:00
David Rowe	7dde764907	Merge branch 'master' into M21956 ... # Conflicts: # libraries/audio/src/Sound.h	2019-04-23 14:58:23 +12:00
David Rowe	6e09c4885f	Review updates	2019-04-23 14:35:25 +12:00
David Rowe	60298245da	Menu JSDoc update	2019-04-16 11:24:24 +12:00
David Rowe	28dfac64ba	Merge branch 'master' into M21460 ... # Conflicts: # libraries/image/src/image/Image.h	2019-04-05 17:50:46 +13:00
David Rowe	68f76851fd	Updates per doc review	2019-04-05 17:10:52 +13:00
Ryan Huffman	cf3a9b1d48	Fix ScriptEngine not being destroyed on its own thread	2019-04-04 13:28:13 -07:00
David Rowe	dff013128e	Text improvements and typos	2019-03-30 10:09:48 +13:00
David Rowe	da45b4db38	Add further Audio API examples	2019-03-30 09:51:02 +13:00
David Rowe	5c8d89fb12	Fill in and tidy Audio API JSDoc	2019-03-29 18:53:30 +13:00
David Rowe	9a1bb27034	AnimationCache, ModelCache, SoundCache, and TextureCache JSDoc	2019-03-26 13:58:43 +13:00
David Rowe	cf4370ed3a	Merge branch 'master' into M21222	2019-03-26 09:44:48 +13:00
Sam Gondelman	04ecdb463f	Merge pull request #15173 from SamGondelman/audio ... Case 21457, Case 16836, Case 15782: Improve AudioInjector threading	2019-03-21 18:03:58 -07:00
danteruiz	2ab8eb98e8	better implementation	2019-03-17 14:00:41 -07:00
danteruiz	5f3e31b119	add ui to kick api	2019-03-15 18:15:18 -07:00
SamGondelman	300dd39abf	fix script engine shutdown	2019-03-13 12:23:31 -07:00
David Rowe	7445d73857	Merge branch 'master' into M21222 ... # Conflicts: # libraries/avatars/src/AvatarData.h	2019-03-13 16:14:14 +13:00
SamGondelman	609c4ab52e	try to fix audio injector threading issues	2019-03-12 18:41:43 -07:00
Shannon Romano	ca87e217bd	Merge pull request #15097 from wayne-chen/audioSettingsModified ... Case 21562: Audio settings screen	2019-03-08 16:22:52 -08:00
David Rowe	4779a6b156	Merge branch 'master' into M21222	2019-03-09 07:57:53 +13:00
David Rowe	5068075645	Fill in MyAvatar animation JSDoc	2019-03-09 07:42:55 +13:00
SamGondelman	f2c248c0a2	disable href and entity script events when in edit mode	2019-03-04 17:10:20 -08:00