Commit graph

612 commits

Author SHA1 Message Date
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
Brad Hefta-Gaub
a75acd139b Merge pull request #9885 from sethalves/model-scripting
Model scripting
2017-03-17 13:13:17 -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
Stephen Birarda
0c657a1d55 add parameter to unload to remove entityID from map 2017-03-15 10:57:12 -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
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
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
01abb4bdb6 Exposed DebugDraw interface to Java Script 2017-03-01 13:14:29 -08: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
humbletim
5b11c0e00a remove unused consts 2017-02-24 20:45:12 -05:00
humbletim
731c01985b switch from autos 2017-02-24 19:21:17 -05:00
humbletim
cdbb13ecff Log cleanup 2017-02-24 17:40:06 -05:00
humbletim
3ac116545e * Switch trigger for deferred loads from timer to using leading entity completion
* Bring back notion of tracking "bad scripts" to fail stampeding entities as a set
* Update stampede JS tests to highlight/troubleshoot preexisting unload issue
2017-02-24 16:05:11 -05:00
humbletim
c89d203f94 Adapt from std::map locks to simple QHash for flagging busy scriptURLs 2017-02-24 12:27:33 -05:00
humbletim
3ad3fd472e * Inline / duplicate exception checking per CR feedback
* Coding standards
2017-02-23 19:46:28 -05:00
humbletim
1eeb25a9eb Increase deferred batch processing. 2017-02-23 19:09:27 -05:00
humbletim
f82a0196a8 Always consume exceptions thrown by include's 2017-02-23 18:12:12 -05:00
kunalgosar
99e51e88ae Add QMetaObject for AvatarEntityMap 2017-02-23 10:57:06 -08:00
humbletim
132a889f74 * Add Qt::DirectConnection to signalHandlerException
* CR feedback / coding standards
2017-02-22 20:36:49 -05:00
humbletim
417587dcda * Update per CR feedback / code standards
* Cull log spam
* Add tryLock to deferred processor to preempt unnecessary loadEntityContent round-trips
2017-02-22 15:22:56 -05:00
humbletim
b15956278c separate out supporting changes into 21114-part2 branch 2017-02-16 07:40:19 -05:00
humbletim
9b0bee92d1 add executeOnScriptThread 2017-02-11 06:21:11 -05:00
humbletim
0f7652e173 * integrate with latest master
* consolidate emit entityScriptDetailsUpdated calls
* limit maxRetries to 1 when isEntityServerScript()
2017-02-11 06:00:31 -05:00
humbletim
831bf93500 * refactor ScriptCache per FIXMEs
* include error details in BatchLoader results
* update EntityServerScript properties in edtior to reflect more granular statuses
* ScriptEngine plumbing in prep for require/module integration
2017-02-11 04:47:31 -05:00
Brad Hefta-Gaub
74f10a1e7f Merge pull request #9603 from huffman/feat/trace-thread-script
Add thread names and scripts to chrome traces
2017-02-09 13:00:05 -08:00
Ryan Huffman
f75eceda65 Add entity PPS per script configuration 2017-02-08 13:11:18 -08:00
Ryan Huffman
55df6f8f76 Add tracing to ScriptEngine and EntitiesScriptingInterface 2017-02-03 09:45:33 -08:00
Ryan Huffman
f2638637f7 Add thread names to traces 2017-02-03 09:18:58 -08:00
Seth Alves
91e542a7a7 ModelScriptingInterface::meshToOBJ takes a list of MeshProxys instead of just one 2017-01-31 21:26:49 -08:00
Seth Alves
541692c5ca start on scripting interface to allow saving polyvox meshes to obj files 2017-01-28 15:38:18 -08:00
Seth Alves
c317ba8054 merge from upstream 2017-01-25 15:57:53 -08:00
Ryan Huffman
9b1cd52fb4 Add the ability to get the context that a script is running in 2017-01-23 08:58:01 -08:00
Clément Brisset
6da188b6ae Merge pull request #33 from huffman/feat/entity-server-script-property
Fix compilation error and move MessageID to CilentServerUtils
2017-01-20 17:37:01 -08:00
Ryan Huffman
be9b19e534 Fix default param ref failing on non-MSVC builds 2017-01-20 16:43:35 -08:00
Clément Brisset
95f07f3917 Merge pull request #32 from huffman/feat/entity-server-script-property
PR FIxes
2017-01-20 15:39:22 -08:00