1358 commits

Author	SHA1	Message	Date
Zach Fox	b5ba4a109d	Merge from upstream/master	2017-03-28 17:37:34 -07:00
Zach Fox	e1a880a5d4	Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2	2017-03-27 09:10:12 -07:00
Zach Fox	e88895935b	Revert "Actually merge from master" ... This reverts commit 056d6fbe4f.	2017-03-24 17:56:48 -07:00
Zach Fox	056d6fbe4f	Actually merge from master	2017-03-24 10:10:17 -07:00
Zach Fox	915ace0087	Revert "Merge from Master" ... This reverts commit e48123b5bb.	2017-03-24 10:04:51 -07:00
Brad Hefta-Gaub	9a38b36f59	Merge pull request #9970 from Triplelexx/21223 ... 21223 - Quat functions have naming inconsistencies	2017-03-24 08:12:11 -07:00
Zach Fox	e48123b5bb	Merge from Master	2017-03-23 09:54:14 -07:00
Triplelexx	6e740a5fbb	change Mat4 getFront to getForward	2017-03-21 22:33:37 +00:00
Triplelexx	248c932d50	inline getFront	2017-03-21 22:11:18 +00:00
Triplelexx	6d664fd668	add getForward, getFront returns getForward ... getForward better describes the returned vector as a direction	2017-03-21 19:54:32 +00:00
Chris Collins	4c789c44aa	Merge pull request #9922 from birarda/bug/stuck-ess ... fix a couple of ESS issues during ES/ESS restart	2017-03-21 12:44:53 -07:00
Brad Hefta-Gaub	ac309df3d1	Merge pull request #9946 from sethalves/model-scripting-1 ... Model scripting	2017-03-21 09:26:32 -07:00
Stephen Birarda	c63a2c9cda	remove requirement of ScriptEngine in ScriptEngines slots	2017-03-20 13:40:15 -07:00
Stephen Birarda	a4d72c4e67	make AudioScriptingInterface a Dependency	2017-03-20 13:40:15 -07:00
Chris Collins	308c134119	Merge pull request #9686 from humbletim/21114-part3 ... CR 21114 -- Implement modules/require support into hifi	2017-03-20 06:22:35 -07:00
Seth Alves	b876d22e46	fix handling of normals. don't crash when extracting a mesh from a polyvox with no 'on' voxels	2017-03-18 22:36:24 -07:00
Seth Alves	488ed081dd	Mesh::forEach and Mesh::map	2017-03-18 10:18:04 -07:00
Seth Alves	b3603ce8b3	Entities.voxelsToMesh, Model.transformMesh, Model.appendMeshes, Model.meshToOBJ appear to work now	2017-03-17 16:52:56 -07:00
Brad Hefta-Gaub	a75acd139b	Merge pull request #9885 from sethalves/model-scripting ... Model scripting	2017-03-17 13:13:17 -07:00
Seth Alves	16c3eb62b1	Merge branch 'master' of github.com:highfidelity/hifi into model-scripting-1	2017-03-17 08:54:32 -07:00
Seth Alves	bbad6a0eb7	mesh-append works, mesh-transform doesn't?	2017-03-16 17:26:07 -07:00
Seth Alves	200550aba9	ModelScriptingInterface::appendMeshes	2017-03-16 15:22:34 -07:00
humbletim	87d62ad1eb	Merge branch 'master' into 21114-part3	2017-03-16 16:39:37 -04:00
Stephen Birarda	a69cf76d06	Merge pull request #9879 from birarda/bug/no-unload ... make sure deleted entities are unloaded first	2017-03-16 13:29:36 -07:00
humbletim	758c07c7d4	Merge branch 'master' into 21114-part3	2017-03-16 14:29:17 -04:00
humbletim	52a571558c	* changes per CR feedback ... * revert JSON content-type workaround * add specific error check / advice for unanchored module ids * update unit tests	2017-03-16 01:23:23 -04:00
Seth Alves	693aee0628	Merge branch 'master' of github.com:highfidelity/hifi into model-scripting	2017-03-15 16:54:40 -07:00
howard-stearns	f662571cab	send credentials to private data-webs as well	2017-03-15 15:46:25 -07:00
Stephen Birarda	0c657a1d55	add parameter to unload to remove entityID from map	2017-03-15 10:57:12 -07:00
Seth Alves	dc82895feb	Merge pull request #9870 from Atlante45/fix/js-exceptions ... Fix JS exception messages formatting	2017-03-15 09:32:04 -08:00
Seth Alves	08ad56d254	quiet warnings	2017-03-14 18:05:53 -07:00
Seth Alves	40b87171a9	quiet warnings	2017-03-14 17:49:39 -07:00
Seth Alves	4a1be69be4	writeOBJToString	2017-03-14 07:11:38 -07:00
Seth Alves	e8a9ff867d	merge from upstream	2017-03-13 17:57:01 -07:00
humbletim	075574b428	log cleanup per CR; add more specific hints (instead of relying on __FUNCTION__)	2017-03-13 16:33:42 -04:00
Atlante45	b67b17d3c0	Fix JS exception messages formatting	2017-03-13 09:11:20 -08:00
Brad Hefta-Gaub	eaea718de1	add various scriping interfaces for managing the audio scope and detecting noise gate transitions	2017-03-10 17:08:19 -08:00
humbletim	8582c7af7b	Use specific debug name literal instead of __FUNCTION__ from within lambda	2017-03-07 16:41:20 -05:00
humbletim	d93047f9e2	Switch to READONLY_PROP_FLAGS for require.cache/require.resolve properties	2017-03-07 16:41:19 -05:00
humbletim	40ba8185a0	* Update per 21114-part2 changes. ... * Add explicit thread safety guards. * Add Entities.queryPropertyMetdata for unit testing Entity script module support. * Cleanup / commenting pass.	2017-03-07 16:36:07 -05:00
humbletim	9b09651337	Move BaseScriptEngine from script-engine to shared.	2017-03-07 16:34:24 -05:00
humbletim	e91de1775e	use a fully-qualified initializer when constructing BatchLoader	2017-03-07 16:34:24 -05:00
humbletim	32e450e6c2	* rework _requireResolve error throws (to avoid using lambda w/default args -- which vc++ didn't care for) ... * add ExceptionEmitters to require/resolve so errors get logged even if invoked indpendently from a script	2017-03-07 16:34:24 -05:00
humbletim	efc61c25ad	* use explicit int's for moduleId constants ... * maxTestConstructorValueSize was already limiting debug output size -- adopt its strategy, use shared MAX_DEBUG_VALUE_LENGTH const	2017-03-07 16:34:24 -05:00
humbletim	9d860a8e81	merge require/module changes into clean branch	2017-03-07 16:34:24 -05:00
Ryan Huffman	a744e0d11c	Merge pull request #9685 from humbletim/21114-part2 ... CR-2 21114 -- BaseScriptEngine.cpp, order-of-operations fixes, reworked JS Exceptions	2017-03-07 13:25:25 -08:00
Anthony J. Thibault	45febe8565	Merge branch 'master' into feature/fingers-on-tablet	2017-03-03 09:04:43 -08:00
Anthony J. Thibault	01abb4bdb6	Exposed DebugDraw interface to Java Script	2017-03-01 13:14:29 -08:00
David Kelly	c10b0389de	Add a getAvatarGain method to NodeList and UsersScriptingInterface	2017-02-28 14:45:34 -07:00
humbletim	2505a89b5e	Per CR feedback bump to strong ref	2017-02-28 00:41:35 -05:00