Code

History

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

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