1372 commits

Author	SHA1	Message	Date
Seth Alves	424af2255b	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-03-19 21:17:30 -08: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
Brad Hefta-Gaub	a75acd139b	Merge pull request #9885 from sethalves/model-scripting ... Model scripting	2017-03-17 13:13:17 -07:00
Seth Alves	df84ff27e9	Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui	2017-03-17 07:52:22 -07:00
Seth Alves	a5d19439f9	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-03-16 16:32:07 -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
Dante Ruiz	dac16af1df	Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-notifcation	2017-03-15 19:27:11 +01:00
Dante Ruiz	4bc050e583	added tablet notification	2017-03-15 19:26:50 +01:00
Stephen Birarda	0c657a1d55	add parameter to unload to remove entityID from map	2017-03-15 10:57:12 -07:00
Seth Alves	ec5acf6035	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-03-15 09:36:39 -08: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	b5919d89a5	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-03-15 08:26:10 -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
Dante Ruiz	2cd194104f	force on to home screen	2017-03-10 20:46:01 +00:00
Seth Alves	2068b93ccc	Merge pull request #9817 from druiz17/goto-home-bug ... cant call gotohomescreen when tablet is closed	2017-03-10 10:17:23 -08:00
Dante Ruiz	e9086460e3	changed function names	2017-03-08 18:14:32 +00:00
Dante Ruiz	6acf2340a2	better way to determine if we can go to the homescreen	2017-03-08 17:42:24 +00:00
Seth Alves	509ce3f2d2	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-03-07 18:41:36 -08:00
Dante Ruiz	656720ae36	Merge branch 'master' of github.com:highfidelity/hifi into goto-home-bug	2017-03-07 22:22:46 +00: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
Dante Ruiz	5156564f04	cant call gotohomescreen when tablet is closed	2017-03-07 00:53:36 +00:00
Seth Alves	08e2e421e4	Merge branch '21199' of github.com:ctrlaltdavid/hifi into tablet-ui-edit-js	2017-03-06 11:08:27 -08:00
Seth Alves	93246b24b0	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-03-06 08:54:49 -08:00
Anthony J. Thibault	45febe8565	Merge branch 'master' into feature/fingers-on-tablet	2017-03-03 09:04:43 -08:00
Seth Alves	cf37845f9e	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-03-02 10:06:38 -08:00
Dante Ruiz	58c1a2fb99	Merge branch 'master' into menuFix	2017-03-02 00:55:18 +00:00
Anthony J. Thibault	01abb4bdb6	Exposed DebugDraw interface to Java Script	2017-03-01 13:14:29 -08:00
Dante Ruiz	e2479a78bd	Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into menuFix	2017-03-01 16:04:12 +00:00
David Kelly	c10b0389de	Add a getAvatarGain method to NodeList and UsersScriptingInterface	2017-02-28 14:45:34 -07:00
Dante Ruiz	f0f2b8c4da	fix comboBox and PushOntoStack	2017-02-28 21:30:25 +00:00
humbletim	2505a89b5e	Per CR feedback bump to strong ref	2017-02-28 00:41:35 -05:00
humbletim	654c72fb7e	Add weakRef guard to detect ScriptEngine deletion during ScriptCache::getScriptContents	2017-02-27 22:58:59 -05:00