Code

History

Commits on master to libraries/script-engine/src/ScriptEngine.h210+
  1. CR feedbackBrad Hefta-Gaub committed 10 years ago0d20f24
  2. cleanupBrad Hefta-Gaub committed 10 years ago47900df
  3. cleanupBrad Hefta-Gaub committed 10 years ago0520363
  4. switch to using QSharedPointer for _entitiesScriptEngineBrad Hefta-Gaub committed 10 years ago9db0fe0
  5. Prohibit entity script file includes from outside the original entity script's directory (unless its in our resources).howard-stearns committed 10 years ago7b7ec5a
  6. Merge branch 'master' of https://github.com/highfidelity/hifi into atpStephen Birarda committed 10 years ago5ad4645
  7. move the AssetScriptInterface to script-engineStephen Birarda committed 10 years ago181b20f
  8. Added Mat4 support to scriptAnthony J. Thibault committed 10 years ago0d62b10
  9. 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.Howard Stearns committed 10 years ago05943ed
  10. Moving running scripts functionality to scripting libraryBrad Davis committed 10 years agod28f80a
  11. Update ScriptEngine::_isUserLoaded to be atomicRyan Huffman committed 10 years ago5f60aee
  12. Update ScriptEngine::finished to includeRyan Huffman committed 10 years agoe7a1550
  13. Fix concurrency issues for bools in ScriptEngineRyan Huffman committed 10 years ago4dbfd3b
  14. cleanup spacing in ScriptEngineStephen Birarda committed 10 years agob1a69bb
  15. resolve conflicts on merge with upstream/masterStephen Birarda committed 10 years ago4573e5c
  16. Merge pull request #6473 from ZappoMan/waitForScriptThreadsStephen Birarda committed 10 years ago7627097
  17. Let the AssertClient JS interface use global varssamcake committed 10 years agoa1668cd
  18. change the ScriptEngine::waitTillDoneRunning() to wait for the script thread to completeBrad Hefta-Gaub committed 10 years agoce46c30
  19. add Assets.uploadData() and Assets.downloadData()Brad Hefta-Gaub committed 10 years agof80a765
  20. Merge branch 'master' of https://github.com/highfidelity/hifi into baseballAtlante45 committed 11 years agob15054c
  21. overload a single function and cleanup, add examplesJames B. Pollack committed 11 years agoe928c82
  22. pass parameters to entitiesJames B. Pollack committed 11 years ago3cee569
  23. entity call paramsJames Pollack committed 11 years ago751d51e
  24. resolve conflicts merging with huffman/baseballStephen Birarda committed 11 years agoed610d6
  25. resolve conflicts on merge with huffman/baseballStephen Birarda committed 11 years agobbf5991
  26. Remove _controllerScriptingInterface from ScriptEngine.hRyan Huffman committed 11 years ago8eded43
  27. Merge branch 'master' of github.com:Atlante45/hifi into baseballRyan Huffman committed 11 years ago7f4a8e9
  28. Merge pull request #6242 from highfidelity/controllersBrad Hefta-Gaub committed 11 years ago8839458
  29. Merge branch 'master' of https://github.com/highfidelity/hifi into expose-anim-varsHoward Stearns committed 11 years agod79d0bc
  30. resolve conflicts on merge with upstream/masterStephen Birarda committed 11 years agocee029f
  31. Merge remote-tracking branch 'upstream/master' into HEADBrad Davis committed 11 years ago3c1a093
  32. Move check functions to cpp onlyAtlante45 committed 11 years agoffe7334
  33. checkExceptions after testing entity scripts in the sandboxAtlante45 committed 11 years agoa53a576
  34. TypoAtlante45 committed 11 years ago13b7fa6
  35. Improve script engine error logging + some cleanupAtlante45 committed 11 years agoc8c9118