Code

History

Commits on 2799123b555bc4e401256f5df7caec2cb77cf2ff to libraries/script-engine/src/ScriptEngine.cpp35+
  1. Merge pull request #6701 from highfidelity/graphicsBrad Hefta-Gaub committed 10 years ago111a8ca
  2. Remove script -> qt::webchannel dependencyBrad Davis committed 10 years ago05b7fcc
  3. Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMastersamcake committed 10 years ago1e8e3fe
  4. Revert "Revert "Migrate QML based web views to Qt WebEngine""Brad Davis committed 10 years ago6098c4a
  5. Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMastersamcake committed 10 years ago7e66515
  6. Revert "Migrate QML based web views to Qt WebEngine"Brad Davis committed 10 years ago1f3adeb
  7. Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMastersamcake committed 10 years ago41525a7
  8. Split global JS Scene into RenderZach Pomerantz committed 10 years ago919a4b6
  9. Rename QmlWebWindow to OverlayWebWindow, move ctor registration to script engineBrad Davis committed 10 years ago82c865a
  10. Merge pull request #6592 from huffman/script-engine-fixesJames B. Pollack committed 10 years agod21e4ff
  11. Moving OpenVR to external plugin and updating to latest versionBrad Davis committed 11 years ago978d39b
  12. Update ScriptEngine::stop() to always run on its threadRyan Huffman committed 10 years agoa21e073
  13. Update ScriptEngine::finished to includeRyan Huffman committed 10 years agoe7a1550
  14. Fix concurrency issues for bools in ScriptEngineRyan Huffman committed 10 years ago4dbfd3b
  15. Merge branch 'master' of https://github.com/highfidelity/hifi into baseballAtlante45 committed 10 years ago1d498af
  16. Merge pull request #6513 from huffman/fix-script-race-conditionBrad Hefta-Gaub committed 10 years ago46556b7
  17. Fix ScriptEngine setting _isFinished when it shouldn'tRyan Huffman committed 10 years ago4d84362
  18. more spacing adjustments in ScriptEngine.cppStephen Birarda committed 10 years agoc3f3639
  19. cleanup spacing in ScriptEngineStephen Birarda committed 10 years agob1a69bb
  20. resolve conflicts on merge with upstream/masterStephen Birarda committed 10 years ago4573e5c
  21. Fix InputController (Leap Motion) not able to be createdDavid Rowe committed 10 years agoe25d4c1
  22. CR feedbackBrad Hefta-Gaub committed 10 years ago5f88d95
  23. change the ScriptEngine::waitTillDoneRunning() to wait for the script thread to completeBrad Hefta-Gaub committed 10 years agoce46c30
  24. Make multiline strings from JavaScript's print() readably in log fileDavid Rowe committed 10 years agoc72c6a0
  25. add Assets.uploadData() and Assets.downloadData()Brad Hefta-Gaub committed 10 years agof80a765
  26. Merge branch 'master' of https://github.com/highfidelity/hifi into controllerssamcake committed 11 years agod2f3b48
  27. add a receiver exampleBrad Hefta-Gaub committed 11 years ago2f142eb
  28. move MessagesClient to agentBrad Hefta-Gaub committed 11 years ago32bf81e
  29. Moving the REcordingScriptingInterface into the script-engine and wiiring up in the assignment-clientSam Gateau committed 11 years ago5b92929
  30. Merge pull request #6351 from huffman/script-path-resolutionEric Levin committed 11 years agoa2abc11
  31. Merge branch 'script-path-resolution' into baseballRyan Huffman committed 11 years agof6df7e2
  32. Merge branch 'master' of https://github.com/highfidelity/hifi into baseballAtlante45 committed 11 years agob15054c
  33. Merge pull request #6326 from imgntn/entity_paramsEric Levin committed 11 years ago7700e67
  34. Update script engine path resolution behaviorRyan Huffman committed 11 years agob835711
  35. Merge branch 'master' of https://github.com/highfidelity/hifi into baseballAtlante45 committed 11 years ago55c6706

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t