Code

History

Commits on 28246c1951b205a0e79eeebbb136cdcb14ff352f to libraries/script-engine/src/ScriptEngine.cpp175+
  1. Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11Atlante45 committed 11 years ago2a82ff9
  2. Merge pull request #4072 from Atlante45/network_replies_cleanupPhilip Rosedale committed 11 years ago285e588
  3. Added missing deletesAtlante45 committed 11 years agobe050b0
  4. resolve conflicts on merge with upstream masterStephen Birarda committed 11 years ago51bba48
  5. more work on voxelEctomyZappoMan committed 11 years ago49d8f2b
  6. first major pass at voxelEctomyZappoMan committed 11 years ago4ea9bbc
  7. resolve conflicts and merge with upstream masterStephen Birarda committed 11 years agoc7a5f3c
  8. Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11Atlante45 committed 11 years ago327daac
  9. Merge branch 'master' of https://github.com/highfidelity/hifi into entityScriptsAndEventsZappoMan committed 11 years agocfa5e5c
  10. resolve conflicts on merge with upstream masterStephen Birarda committed 11 years ago7beb3a7
  11. Merge branch 'master' of https://github.com/highfidelity/hifi into cuckooStephen Birarda committed 11 years ago9425ea2
  12. Changed NodeList::getInstance() calls to use the DMAtlante45 committed 11 years ago0bd9ed4
  13. Merge branch 'master' of https://github.com/highfidelity/hifi into cuckooStephen Birarda committed 11 years ago737741c
  14. Merge branch 'cuckoo' of https://github.com/birarda/hifi into applications_diet_cpp11Atlante45 committed 11 years agoc40e83c
  15. DM users updateAtlante45 committed 11 years agob2dac6f
  16. remove AudioRingBuffer include where not neededStephen Birarda committed 11 years ago4077a76
  17. move the audio scope into its own classStephen Birarda committed 11 years agoc734bc8
  18. convert AnimationCache to DependencyManagerZappoMan committed 11 years ago660bf27
  19. resolve conflicts on merge with upstream masterStephen Birarda committed 11 years ago5c3e90f
  20. fix URL/filename discrepancy for local scriptsStephen Birarda committed 11 years ago98f56aa
  21. don't block main thread for a script loadStephen Birarda committed 11 years agod7f1689
  22. have script loading be separate from ScriptEngine constructorStephen Birarda committed 11 years ago36f716c
  23. better support for includes in entity scriptsZappoMan committed 11 years agocd0ee0f
  24. avoid Qt QTimer thread bug by putting SoundCache on same threadStephen Birarda committed 12 years agoe10d132
  25. resolve conflicts on merge with upstream masterStephen Birarda committed 12 years agob7b371b
  26. repairs to audio classes for Sound* to QScriptValueStephen Birarda committed 12 years agoef2c181
  27. Merge branch 'master' of github.com:highfidelity/hifi into entity-grid-toolRyan Huffman committed 12 years agobedd9c7
  28. changes to allow AudioInjectorOptions to operate as a hash from jsStephen Birarda committed 12 years agoa8681cd
  29. Update grid tool html locationRyan Huffman committed 12 years agob04fd89
  30. resolve conflicts on merge with upstream masterStephen Birarda committed 12 years ago0f32346
  31. Add grid tools to entity edit toolsRyan Huffman committed 12 years agofeaf567
  32. move script-engine library to intel tbb concurrent mapStephen Birarda committed 12 years ago38f2b2a
  33. leverage new libcuckoo hash outside LimitedNodeListStephen Birarda committed 12 years ago8a72cdd
  34. make the AudioInjectorScriptingInterface a singletonStephen Birarda committed 12 years ago2c667d2
  35. send global HFActionEvent from ControllerScriptingInterfaceStephen Birarda committed 12 years agoc3fe7c7