Code

History

Commits on dca555a8d45cc4a4f6516fb31270231d2f317d10 to libraries/script-engine/src/ScriptEngine.cpp35+
  1. Merge branch 'master' of git://github.com/highfidelity/hifi into 19614Ryan Huffman committed 12 years agodca555a
  2. Avatar attachment scripting bits.Andrzej Kapolka committed 12 years agof866828
  3. return an injector from playSound and allow user to stop itStephen Birarda committed 12 years ago99ee6ae
  4. Add XMLHttpRequest constructor to ScriptEngineRyan Huffman committed 12 years ago2dda87f
  5. removed debuggingZappoMan committed 12 years agoc621f15
  6. debugging model editingZappoMan committed 12 years ago715e6b8
  7. Merge pull request #2764 from ZappoMan/modelserverAndrewMeadows committed 12 years ago05e5277
  8. Fix invalid check for null object in registerGetterSetterRyan Huffman committed 12 years ago701fcd3
  9. Add registerGetterSetter to remove need for getEngine()Ryan Huffman committed 12 years ago9e684a0
  10. models working end to endZappoMan committed 12 years ago0182a6d
  11. Merge remote-tracking branch 'upstream/master' into 19612Ryan Huffman committed 12 years ago65fd2a7
  12. Add ScriptEngine::getEngine() to get internal QScriptEngineRyan Huffman committed 12 years ago0477706
  13. Merge branch 'master' of https://github.com/worklist/hifi into modelserverZappoMan committed 12 years ago58c852d
  14. first cut at modelserverZappoMan committed 12 years agoaac4205
  15. Merge remote-tracking branch 'upstream/master' into RunningScriptsRyan Huffman committed 12 years agoedcff0b
  16. add local gravity option parameter for MyAvatarAndrew Meadows committed 12 years agoc7dbc59
  17. merge new work into andrew/inertiaAndrew Meadows committed 12 years agoa7c4b02
  18. merge upstream/master into andrew/inertiaAndrew Meadows committed 12 years agob05a315
  19. expose AVATAR_MOTION_OBEY_GRAVITY const to JSAndrew Meadows committed 12 years ago357aac8
  20. expose COLLISION_GOUP_* constants to JSAndrew Meadows committed 12 years ago0a7a503
  21. Merge branch masterMohammed Nafees committed 12 years ago29d6437
  22. Merge branch 'master' of https://github.com/highfidelity/hifi into removed_gettimeofdayAtlante45 committed 12 years agoddf14b0
  23. More gettimeofday cleanupAtlante45 committed 12 years agof7f30e1
  24. StyleThijs Wenker committed 12 years ago70ac93c
  25. - few Adjustments in Application class for Script editor - Shortkey for script editor (Alt+S) - highlighter: bold true/false , single line comments - Run scripts from the editor works - More icons from Maximillian, Thanks - Run on the fly checkbox, works if the script is running. - Load/save featuresThijs Wenker committed 12 years agoc016d65
  26. optionally add an AvatarHashMap instance to the ScriptEngineStephen Birarda committed 12 years ago75f35c5
  27. Moved AnimationObject to separate source files.Andrzej Kapolka committed 12 years ago15d4f59
  28. More work on animation loading.Andrzej Kapolka committed 12 years ago0f69bbe
  29. More work on animation loading.Andrzej Kapolka committed 12 years ago8cbad1b
  30. More work on animation loading.Andrzej Kapolka committed 12 years ago38c0e99
  31. Merge pull request #2635 from thoys/windows-script-path-fixClément Brisset committed 12 years ago5f6dee6
  32. Update ScriptEngine.cppThijs Wenker committed 12 years ago825acbb
  33. Merge branch 'master' of https://github.com/highfidelity/hifiStephen Birarda committed 12 years agoc208af2
  34. Fixed loading local stored scripts on Windows machinesThijs Wenker committed 12 years ago5d812c8
  35. run regex header replacement on all cpp filesStephen Birarda committed 12 years ago684c6b5