Code

History

Commits on a8f69bb2e052d91bd47989535f8b69dddb095506 to libraries/script-engine/src/ScriptEngine.cpp280+
  1. Merge branch 'master' of github.com:Atlante45/hifi into baseballRyan Huffman committed 11 years agoafffe7f
  2. Merge pull request #6242 from highfidelity/controllersBrad Hefta-Gaub committed 11 years ago8839458
  3. typoHoward Stearns committed 11 years agoada32dd
  4. resolve conflicts on merge with upstream masterStephen Birarda committed 11 years agod03a837
  5. Merge branch 'master' into HEADBrad Davis committed 11 years agoccbae81
  6. Merge branch 'master' of https://github.com/highfidelity/hifi into expose-anim-varsHoward Stearns committed 11 years agod79d0bc
  7. Fix typoAtlante45 committed 11 years ago1367479
  8. Fix ScriptEngine crashAtlante45 committed 11 years ago7695afe
  9. resolve conflicts on merge with upstream/masterStephen Birarda committed 11 years agocee029f
  10. Merge remote-tracking branch 'upstream/master' into HEADBrad Davis committed 11 years ago3c1a093
  11. Rename check functions and make them staticAtlante45 committed 11 years agoc0138bd
  12. Move check functions to cpp onlyAtlante45 committed 11 years agoffe7334
  13. checkExceptions after testing entity scripts in the sandboxAtlante45 committed 11 years agoa53a576
  14. Lambda conversion fix for windowsAtlante45 committed 11 years agoea56f96
  15. Some more script checksAtlante45 committed 11 years ago3e43a3c
  16. TypoAtlante45 committed 11 years ago13b7fa6
  17. Improve script engine error logging + some cleanupAtlante45 committed 11 years agoc8c9118
  18. Make handler generators more readableAtlante45 committed 11 years ago3742c16
  19. checkExceptions after testing entity scripts in the sandboxAtlante45 committed 11 years ago3801393
  20. Lambda conversion fix for windowsAtlante45 committed 11 years ago1c04888
  21. Some more script checksAtlante45 committed 11 years ago8d72fca
  22. TypoAtlante45 committed 11 years ago9771361
  23. Allow multiple scripts to register, and allow them to specify the specific anim vars they are interested in.Howard Stearns committed 11 years ago4b4907c
  24. Update safety trampoline with correct arguments.Howard Stearns committed 11 years agoe11b0ad
  25. Improve script engine error logging + some cleanupAtlante45 committed 11 years ago421d967
  26. Make handler generators more readableAtlante45 committed 11 years ago4e33aa8
  27. Get rid of globalObject().property("MyAvatar").property("animationStateHandlerResult").Howard Stearns committed 11 years ago2b7ceff
  28. Name change and thread checks per comments.Howard Stearns committed 11 years ago1d0464e
  29. Call back to Javascript asynchronously, so that we don't block and the script's engine doesn't have thread conflicts.Howard Stearns committed 11 years ago9fd6190
  30. Working on JSON parsing and cleanupBrad Davis committed 11 years agobea6fdd
  31. Breaking up UserInputMapper, restoring some mappingsBrad Davis committed 11 years ago734a39f
  32. Move controller test to appBrad Davis committed 11 years ago57be599
  33. Fixes and PR commentsBrad Davis committed 11 years agoe39219c
  34. Merging old and new controller interfacesBrad Davis committed 11 years ago0063f9a
  35. more work on exposing device inputs as JavaScript named constantsBrad Hefta-Gaub committed 11 years agod3ee9b0