Code

History

Commits on b36a39b2bcda94de87fdc831da884611f8a85eea to libraries/script-engine/src/ScriptEngine.h70+
  1. Merge pull request #6473 from ZappoMan/waitForScriptThreadsStephen Birarda committed 10 years ago7627097
  2. Let the AssertClient JS interface use global varssamcake committed 10 years agoa1668cd
  3. change the ScriptEngine::waitTillDoneRunning() to wait for the script thread to completeBrad Hefta-Gaub committed 10 years agoce46c30
  4. add Assets.uploadData() and Assets.downloadData()Brad Hefta-Gaub committed 10 years agof80a765
  5. Merge branch 'master' of https://github.com/highfidelity/hifi into baseballAtlante45 committed 11 years agob15054c
  6. overload a single function and cleanup, add examplesJames B. Pollack committed 11 years agoe928c82
  7. pass parameters to entitiesJames B. Pollack committed 11 years ago3cee569
  8. entity call paramsJames Pollack committed 11 years ago751d51e
  9. resolve conflicts merging with huffman/baseballStephen Birarda committed 11 years agoed610d6
  10. resolve conflicts on merge with huffman/baseballStephen Birarda committed 11 years agobbf5991
  11. Remove _controllerScriptingInterface from ScriptEngine.hRyan Huffman committed 11 years ago8eded43
  12. Merge branch 'master' of github.com:Atlante45/hifi into baseballRyan Huffman committed 11 years ago7f4a8e9
  13. Merge pull request #6242 from highfidelity/controllersBrad Hefta-Gaub committed 11 years ago8839458
  14. Merge branch 'master' of https://github.com/highfidelity/hifi into expose-anim-varsHoward Stearns committed 11 years agod79d0bc
  15. resolve conflicts on merge with upstream/masterStephen Birarda committed 11 years agocee029f
  16. Merge remote-tracking branch 'upstream/master' into HEADBrad Davis committed 11 years ago3c1a093
  17. Move check functions to cpp onlyAtlante45 committed 11 years agoffe7334
  18. checkExceptions after testing entity scripts in the sandboxAtlante45 committed 11 years agoa53a576
  19. TypoAtlante45 committed 11 years ago13b7fa6
  20. Improve script engine error logging + some cleanupAtlante45 committed 11 years agoc8c9118
  21. Make handler generators more readableAtlante45 committed 11 years ago3742c16
  22. checkExceptions after testing entity scripts in the sandboxAtlante45 committed 11 years ago3801393
  23. TypoAtlante45 committed 11 years ago9771361
  24. Allow multiple scripts to register, and allow them to specify the specific anim vars they are interested in.Howard Stearns committed 11 years ago4b4907c
  25. Improve script engine error logging + some cleanupAtlante45 committed 11 years ago421d967
  26. Make handler generators more readableAtlante45 committed 11 years ago4e33aa8
  27. Get rid of globalObject().property("MyAvatar").property("animationStateHandlerResult").Howard Stearns committed 11 years ago2b7ceff
  28. Name change and thread checks per comments.Howard Stearns committed 11 years ago1d0464e
  29. Call back to Javascript asynchronously, so that we don't block and the script's engine doesn't have thread conflicts.Howard Stearns committed 11 years ago9fd6190
  30. Working on JSON parsing and cleanupBrad Davis committed 11 years agobea6fdd
  31. Move controller test to appBrad Davis committed 11 years ago57be599
  32. Fixes and PR commentsBrad Davis committed 11 years agoe39219c
  33. Merging old and new controller interfacesBrad Davis committed 11 years ago0063f9a
  34. more work on exposing device inputs as JavaScript named constantsBrad Hefta-Gaub committed 11 years agod3ee9b0
  35. Support reload-on-change for local scriptsBrad Davis committed 11 years ago99d1e17