Code

History

Commits on a8f69bb2e052d91bd47989535f8b69dddb095506 to libraries/script-engine/src/ScriptEngine.cpp245+
  1. Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMastersamcake committed 10 years ago41525a7
  2. Split global JS Scene into RenderZach Pomerantz committed 10 years ago919a4b6
  3. Rename QmlWebWindow to OverlayWebWindow, move ctor registration to script engineBrad Davis committed 10 years ago82c865a
  4. Merge pull request #6592 from huffman/script-engine-fixesJames B. Pollack committed 10 years agod21e4ff
  5. Moving OpenVR to external plugin and updating to latest versionBrad Davis committed 10 years ago978d39b
  6. Update ScriptEngine::stop() to always run on its threadRyan Huffman committed 10 years agoa21e073
  7. Update ScriptEngine::finished to includeRyan Huffman committed 10 years agoe7a1550
  8. Fix concurrency issues for bools in ScriptEngineRyan Huffman committed 10 years ago4dbfd3b
  9. Merge branch 'master' of https://github.com/highfidelity/hifi into baseballAtlante45 committed 10 years ago1d498af
  10. Merge pull request #6513 from huffman/fix-script-race-conditionBrad Hefta-Gaub committed 10 years ago46556b7
  11. Fix ScriptEngine setting _isFinished when it shouldn'tRyan Huffman committed 10 years ago4d84362
  12. more spacing adjustments in ScriptEngine.cppStephen Birarda committed 10 years agoc3f3639
  13. cleanup spacing in ScriptEngineStephen Birarda committed 10 years agob1a69bb
  14. resolve conflicts on merge with upstream/masterStephen Birarda committed 10 years ago4573e5c
  15. Fix InputController (Leap Motion) not able to be createdDavid Rowe committed 10 years agoe25d4c1
  16. CR feedbackBrad Hefta-Gaub committed 10 years ago5f88d95
  17. change the ScriptEngine::waitTillDoneRunning() to wait for the script thread to completeBrad Hefta-Gaub committed 10 years agoce46c30
  18. Make multiline strings from JavaScript's print() readably in log fileDavid Rowe committed 10 years agoc72c6a0
  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 controllerssamcake committed 10 years agod2f3b48
  21. add a receiver exampleBrad Hefta-Gaub committed 11 years ago2f142eb
  22. move MessagesClient to agentBrad Hefta-Gaub committed 11 years ago32bf81e
  23. Moving the REcordingScriptingInterface into the script-engine and wiiring up in the assignment-clientSam Gateau committed 11 years ago5b92929
  24. Merge pull request #6351 from huffman/script-path-resolutionEric Levin committed 11 years agoa2abc11
  25. Merge branch 'script-path-resolution' into baseballRyan Huffman committed 11 years agof6df7e2
  26. Merge branch 'master' of https://github.com/highfidelity/hifi into baseballAtlante45 committed 11 years agob15054c
  27. Merge pull request #6326 from imgntn/entity_paramsEric Levin committed 11 years ago7700e67
  28. Update script engine path resolution behaviorRyan Huffman committed 11 years agob835711
  29. Merge branch 'master' of https://github.com/highfidelity/hifi into baseballAtlante45 committed 11 years ago55c6706
  30. overload a single function and cleanup, add examplesJames B. Pollack committed 11 years agoe928c82
  31. pass parameters to entitiesJames B. Pollack committed 11 years ago3cee569
  32. entity call paramsJames Pollack committed 11 years ago751d51e
  33. Rebase fixesAtlante45 committed 11 years ago0508091
  34. Bail early from ScriptEngine::run if stoppedZach Pomerantz committed 11 years ago6bf9a45
  35. resolve conflicts on merge with huffman/baseballStephen Birarda committed 11 years ago8cd41b9