Code

History

Commits on master to libraries/script-engine/src/ScriptEngine.cpp420+
  1. Update ScriptEngine::finished to includeRyan Huffman committed 10 years agoe7a1550
  2. Fix concurrency issues for bools in ScriptEngineRyan Huffman committed 10 years ago4dbfd3b
  3. Merge branch 'master' of https://github.com/highfidelity/hifi into baseballAtlante45 committed 10 years ago1d498af
  4. Merge pull request #6513 from huffman/fix-script-race-conditionBrad Hefta-Gaub committed 10 years ago46556b7
  5. Fix ScriptEngine setting _isFinished when it shouldn'tRyan Huffman committed 10 years ago4d84362
  6. more spacing adjustments in ScriptEngine.cppStephen Birarda committed 10 years agoc3f3639
  7. cleanup spacing in ScriptEngineStephen Birarda committed 10 years agob1a69bb
  8. resolve conflicts on merge with upstream/masterStephen Birarda committed 10 years ago4573e5c
  9. Fix InputController (Leap Motion) not able to be createdDavid Rowe committed 10 years agoe25d4c1
  10. CR feedbackBrad Hefta-Gaub committed 10 years ago5f88d95
  11. change the ScriptEngine::waitTillDoneRunning() to wait for the script thread to completeBrad Hefta-Gaub committed 10 years agoce46c30
  12. Make multiline strings from JavaScript's print() readably in log fileDavid Rowe committed 10 years agoc72c6a0
  13. add Assets.uploadData() and Assets.downloadData()Brad Hefta-Gaub committed 10 years agof80a765
  14. Merge branch 'master' of https://github.com/highfidelity/hifi into controllerssamcake committed 10 years agod2f3b48
  15. add a receiver exampleBrad Hefta-Gaub committed 10 years ago2f142eb
  16. move MessagesClient to agentBrad Hefta-Gaub committed 10 years ago32bf81e
  17. Moving the REcordingScriptingInterface into the script-engine and wiiring up in the assignment-clientSam Gateau committed 10 years ago5b92929
  18. Merge pull request #6351 from huffman/script-path-resolutionEric Levin committed 11 years agoa2abc11
  19. Merge branch 'script-path-resolution' into baseballRyan Huffman committed 11 years agof6df7e2
  20. Merge branch 'master' of https://github.com/highfidelity/hifi into baseballAtlante45 committed 11 years agob15054c
  21. Merge pull request #6326 from imgntn/entity_paramsEric Levin committed 11 years ago7700e67
  22. Update script engine path resolution behaviorRyan Huffman committed 11 years agob835711
  23. Merge branch 'master' of https://github.com/highfidelity/hifi into baseballAtlante45 committed 11 years ago55c6706
  24. overload a single function and cleanup, add examplesJames B. Pollack committed 11 years agoe928c82
  25. pass parameters to entitiesJames B. Pollack committed 11 years ago3cee569
  26. entity call paramsJames Pollack committed 11 years ago751d51e
  27. Rebase fixesAtlante45 committed 11 years ago0508091
  28. Bail early from ScriptEngine::run if stoppedZach Pomerantz committed 11 years ago6bf9a45
  29. resolve conflicts on merge with huffman/baseballStephen Birarda committed 11 years ago8cd41b9
  30. Merge branch 'master' of github.com:Atlante45/hifi into baseballRyan Huffman committed 11 years agoafffe7f
  31. Merge pull request #6242 from highfidelity/controllersBrad Hefta-Gaub committed 11 years ago8839458
  32. typoHoward Stearns committed 11 years agoada32dd
  33. resolve conflicts on merge with upstream masterStephen Birarda committed 11 years agod03a837
  34. Merge branch 'master' into HEADBrad Davis committed 11 years agoccbae81
  35. Merge branch 'master' of https://github.com/highfidelity/hifi into expose-anim-varsHoward Stearns committed 11 years agod79d0bc