Code

History

Commits on b36a39b2bcda94de87fdc831da884611f8a85eea to libraries/script-engine/src/ScriptEngine.cpp315+
  1. resolve conflicts and merge with upstream masterStephen Birarda committed 11 years agoc7a5f3c
  2. Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11Atlante45 committed 11 years ago327daac
  3. Merge branch 'master' of https://github.com/highfidelity/hifi into entityScriptsAndEventsZappoMan committed 11 years agocfa5e5c
  4. resolve conflicts on merge with upstream masterStephen Birarda committed 11 years ago7beb3a7
  5. Merge branch 'master' of https://github.com/highfidelity/hifi into cuckooStephen Birarda committed 11 years ago9425ea2
  6. Changed NodeList::getInstance() calls to use the DMAtlante45 committed 11 years ago0bd9ed4
  7. Merge branch 'master' of https://github.com/highfidelity/hifi into cuckooStephen Birarda committed 11 years ago737741c
  8. Merge branch 'cuckoo' of https://github.com/birarda/hifi into applications_diet_cpp11Atlante45 committed 11 years agoc40e83c
  9. DM users updateAtlante45 committed 11 years agob2dac6f
  10. remove AudioRingBuffer include where not neededStephen Birarda committed 11 years ago4077a76
  11. move the audio scope into its own classStephen Birarda committed 11 years agoc734bc8
  12. convert AnimationCache to DependencyManagerZappoMan committed 11 years ago660bf27
  13. resolve conflicts on merge with upstream masterStephen Birarda committed 11 years ago5c3e90f
  14. fix URL/filename discrepancy for local scriptsStephen Birarda committed 11 years ago98f56aa
  15. don't block main thread for a script loadStephen Birarda committed 11 years agod7f1689
  16. have script loading be separate from ScriptEngine constructorStephen Birarda committed 11 years ago36f716c
  17. better support for includes in entity scriptsZappoMan committed 11 years agocd0ee0f
  18. avoid Qt QTimer thread bug by putting SoundCache on same threadStephen Birarda committed 12 years agoe10d132
  19. resolve conflicts on merge with upstream masterStephen Birarda committed 12 years agob7b371b
  20. repairs to audio classes for Sound* to QScriptValueStephen Birarda committed 12 years agoef2c181
  21. Merge branch 'master' of github.com:highfidelity/hifi into entity-grid-toolRyan Huffman committed 12 years agobedd9c7
  22. changes to allow AudioInjectorOptions to operate as a hash from jsStephen Birarda committed 12 years agoa8681cd
  23. Update grid tool html locationRyan Huffman committed 12 years agob04fd89
  24. resolve conflicts on merge with upstream masterStephen Birarda committed 12 years ago0f32346
  25. Add grid tools to entity edit toolsRyan Huffman committed 12 years agofeaf567
  26. move script-engine library to intel tbb concurrent mapStephen Birarda committed 12 years ago38f2b2a
  27. leverage new libcuckoo hash outside LimitedNodeListStephen Birarda committed 12 years ago8a72cdd
  28. make the AudioInjectorScriptingInterface a singletonStephen Birarda committed 12 years ago2c667d2
  29. send global HFActionEvent from ControllerScriptingInterfaceStephen Birarda committed 12 years agoc3fe7c7
  30. repairs for recursive source files, move HF meta events to SEStephen Birarda committed 12 years agod38dd2c
  31. Merge pull request #3636 from Atlante45/reverbPhilip Rosedale committed 12 years ago3ba3354
  32. expose AvatarList to Interface SE, add avatarWithDisplayName methodStephen Birarda committed 12 years ago7b0f147
  33. Header fixAtlante45 committed 12 years agoee4c7c2
  34. Merge branch 'master' of https://github.com/highfidelity/hifi into reverbAtlante45 committed 12 years ago86b8777
  35. remove deprecated _engine member from ScriptEngineAtlante45 committed 12 years agof09dc1a