Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-15 13:06:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
42997 commits 25 branches 0 tags 1.1 GiB
Commit graph

482 commits

Author SHA1 Message Date
Zach Pomerantz
284feaf5d4 Properly shut down scripting thread 2016-05-03 20:29:31 -07:00
Brad Hefta-Gaub
754ef071eb Merge pull request #7786 from sethalves/web-scripts-use-local-libs 
allow scripts on the web to refer to local libraries with /~/
 2016-05-03 11:10:48 -07:00
Brad Hefta-Gaub
ad285ff9a1 Merge pull request #7769 from ZappoMan/abortForInfiniteLoops 
add support to abort evaluation of long running scripts on shutdown
 2016-05-02 20:44:12 -07:00
Brad Hefta-Gaub
2b54813075 Merge pull request #7783 from zzmp/fix/script-engine-deletion 
Fix script engine deletion
 2016-05-02 18:16:07 -07:00
Brad Hefta-Gaub
b98419e537 add units to debug message 2016-05-02 14:58:38 -07:00
Brad Hefta-Gaub
4569032314 more CR feedback 2016-05-02 12:44:07 -07:00
ZappoMan
6026e055aa more CR feedback removed redundant abort code 2016-04-30 15:45:42 -07:00
ZappoMan
ee4748fee9 CR Feedback 2016-04-30 15:31:09 -07:00
ZappoMan
73ff0308a9 some CR feedback 2016-04-30 15:23:50 -07:00
Seth Alves
351a5d2cb1 remove debug print 2016-04-29 13:24:12 -07:00
Seth Alves
b28cfd27ec fix problem where canonicalFilePath will strip a trailing slash 2016-04-29 13:17:59 -07:00
Seth Alves
f03130ff5a more work toward keeping /~/../.. from working 2016-04-29 11:04:08 -07:00
Seth Alves
8c278563f5 allow scripts on the web to refer to interface-local javascript libraries 2016-04-28 13:41:50 -07:00
Zach Pomerantz
30e7b950a1 Fix script engine deletion 2016-04-28 11:41:36 -07:00
Zach Pomerantz
854c0ea3e3 Clean out updateMemoryCost 2016-04-27 19:20:43 -07:00
Zach Pomerantz
1e8d45aecb Put ScriptableResource state enum in prototype 2016-04-27 19:20:43 -07:00
Brad Hefta-Gaub
48e63ea828 add support to abort evaluation of long running scripts on shutdown 2016-04-26 16:24:53 -07:00
Brad Hefta-Gaub
a21bc66fa3 add support to abort evaluation of long running scripts on shutdown 2016-04-26 16:21:11 -07:00
Zach Pomerantz
1a0a623d5f Report ScriptableResource memory cost to engine 2016-04-20 20:18:22 -07:00
Zach Pomerantz
8ad8b5d0d9 Return ScriptableResource from prefetch 2016-04-20 20:14:15 -07:00
Brad Hefta-Gaub
d5891e9073 remove abortEvaluation() since it has no effect for the test cases and might cause unexpected side effects 2016-04-18 15:28:33 -07:00
Brad Hefta-Gaub
bf8cdabd1b CR feedback 2016-04-18 12:50:29 -07:00
Brad Hefta-Gaub
9e13b1bbae more CR feedback 2016-04-18 12:25:46 -07:00
Brad Hefta-Gaub
f6c75d0530 cleanup 2016-04-18 10:41:54 -07:00
Brad Hefta-Gaub
0520363da8 cleanup 2016-04-18 10:37:15 -07:00
Brad Hefta-Gaub
d1f6b371c9 cleanup 2016-04-18 10:27:12 -07:00
Brad Hefta-Gaub
9db0fe0d11 switch to using QSharedPointer for _entitiesScriptEngine 2016-04-18 09:46:04 -07:00
Brad Hefta-Gaub
71d57295eb handle possibly deleted ScriptEngine in getScriptContents 2016-04-16 19:39:45 -07:00
Brad Hefta-Gaub
87078b1ea2 first cut at resetting entities script engine on domain change 2016-04-16 11:09:23 -07:00
Anthony J. Thibault
253e4cbb73 validate arguments to MyAvatar.addAnimationStateHandler() 
Also validate arguments to MyAvatar.removeAnimationStateHandler() and the return result from the user provided callback function.
 2016-04-14 16:25:17 -07:00
Brad Hefta-Gaub
ce1625b551 Merge pull request #7600 from sethalves/fix-entity-script-error-message 
attempt to make the failed-to-load-entity-script error-message be more helpful
 2016-04-07 09:17:04 -07:00
Brad Hefta-Gaub
986b4bea7c Merge pull request #7603 from zzmp/fix/entities-thread-crash 
Fix intermittent crash on exit
 2016-04-07 08:21:51 -07:00
Zach Pomerantz
06e827cb5e Guard against no script engine thread affinity 2016-04-06 15:41:13 -07:00
howard-stearns
f35c59ce5f Guard against meaningless query and fragment parts. 2016-04-06 15:21:43 -07:00
Seth Alves
672b4df7c1 get rid of magic number 2016-04-06 13:36:44 -07:00
Seth Alves
21c2db7cdc attempt to make the failed-to-load-entity-script error-message be more helpful 2016-04-06 12:40:59 -07:00
Zach Pomerantz
1e710712cc Check entities scripting thread before signaling it 2016-04-06 11:19:07 -07:00
howard-stearns
7b7ec5a174 Prohibit entity script file includes from outside the original entity 
script's directory (unless its in our resources).
 2016-04-04 16:41:21 -07:00
Seth Alves
35affe26e3 trying again on script loading changes 2016-04-01 11:52:47 -07:00
Seth Alves
63595e196e fix batch-loaded local scripts 2016-03-31 14:02:47 -07:00
Seth Alves
cfa847ba54 don't put empty folders at end of scripts tree. allow /~/ to work from outside scripts 2016-03-31 09:45:28 -07:00
Seth Alves
bb43347599 Merge branch 'master' of github.com:highfidelity/hifi into use-local-scripts 2016-03-30 13:33:59 -07:00
Seth Alves
26e01bbacd rewrite a bunch of path/url mangling code 2016-03-30 13:33:49 -07:00
Andrew Meadows
5ac0640cbe check for time machine 2016-03-27 16:33:53 -07:00
Ryan Huffman
1a2f74f43a Add protection around ScriptEngine::runInThread being called twice 2016-03-22 11:26:10 -07:00
Anthony J. Thibault
0d62b10a8f Added Mat4 support to script 
Also, hooked up MyAvatar.sensorToWorldMatrix access to script.
 2016-03-07 16:16:14 -08:00
Howard Stearns
05943ed353 Entity scripts keep of the which entity they are executing for. When the entity goes away, any created timers do, too. Also, loading interface scripts is not allowed from entity scripts. 2016-03-01 16:50:58 -08:00
Brad Davis
c07f3789e4 Don't crash on script destructor 2016-02-22 14:26:33 -08:00
Brad Davis
55af5eaf06 Fix crash on shutdown due to lifetime of scripts 2016-01-12 12:40:02 -08:00
Brad Davis
d28f80aa07 Moving running scripts functionality to scripting library 2016-01-11 12:44:03 -08:00