Code

History

Commits on 19ec080e2b2ecbb9e6ed4a2a786d943e94de15e2 to libraries/script-engine/src/ScriptEngine.cpp280+
  1. Merge branch 'master' of https://github.com/highfidelity/hifi into script-timerStephen Birarda committed 12 years agod9cfaec
  2. Merge pull request #1822 from birarda/cleanupZappoMan committed 12 years agoed3f7b9
  3. Merge pull request #1817 from ZappoMan/more_scripting_workAndrewMeadows committed 12 years ago867b66e
  4. spacing cleanup in Application and ScriptEngineStephen Birarda committed 12 years agod65a3ee
  5. expose QTimer to the script engineStephen Birarda committed 12 years agod2fd4bf
  6. move isAvatar property access to Agent objectStephen Birarda committed 12 years agodd83ff0
  7. Merge branch 'master' of https://github.com/worklist/hifi into more_scripting_workZappoMan committed 12 years ago9798538
  8. Merge pull request #1745 from ZappoMan/scripting_workAndrewMeadows committed 12 years agobed6351
  9. instantiate isAvatar in ScriptEngine to false, closes #1779Stephen Birarda committed 12 years ago79c8f91
  10. make sure to flush edit queue on script shutdownZappoMan committed 12 years ago3b17550
  11. Merge branch 'master' of https://github.com/worklist/hifi into scripting_workZappoMan committed 12 years agoed0a2a5
  12. support for global collision callbacks in JSZappoMan committed 12 years ago08b06cc
  13. resolve conflicts on merge with upstream masterStephen Birarda committed 12 years ago33edcea
  14. more scripting support, including adding a Quat helper class that makes JS quat math easierZappoMan committed 12 years ago98cdc65
  15. cleaned up some registration of global objectsZappoMan committed 12 years agofebb306
  16. cleanup Node types, closes #1726Stephen Birarda committed 12 years ago4de270b
  17. resolve conflicts on merge with upstream masterStephen Birarda committed 12 years ago2aaa9ce
  18. packet header changes and beginning of conversion to QByteArrayStephen Birarda committed 12 years ago4103cc1
  19. added findParticles() to JS apiZappoMan committed 12 years agobcaafb2
  20. more NodeList QSet changes, closes #1660Stephen Birarda committed 12 years agoed9118f
  21. Merge branch 'master' of https://github.com/highfidelity/hifiStephen Birarda committed 12 years agoabddb96
  22. remove preEvaluateReset in ScriptEngineStephen Birarda committed 12 years agod307412
  23. use NodeList ownerUUID for DataServerScriptingInterface, fix double UUID sendStephen Birarda committed 12 years agoa9ce6c7
  24. Merge branch 'master' of git://github.com/worklist/hifi into new_particle_scripting_interfaceBrad Hefta-Gaub committed 12 years agoaacad00
  25. fix a couple of warnings by using QString for object nameStephen Birarda committed 12 years agoa5bac3d
  26. hook the user's avatar object into the Interface ScriptEngineStephen Birarda committed 12 years ago6b44172
  27. Merge branch 'master' of git://github.com/worklist/hifi into new_particle_scripting_interfaceBrad Hefta-Gaub committed 12 years agofe5a8d9
  28. fix packet offset for owner UUIDStephen Birarda committed 12 years ago8e5d4b6
  29. resolve conflicts in merge with upstream/masterStephen Birarda committed 12 years agof13aa32
  30. re-expose an Avatar to the ScriptEngineStephen Birarda committed 12 years ago417aa7a
  31. hook the DataServerScriptingInterface to the ScriptEngineStephen Birarda committed 12 years agoaa9f7ff
  32. scripts save on exit and load on entryaw committed 12 years ago0eed041
  33. Merge branch 'master' of git://github.com/worklist/hifi into new_particle_scripting_interfaceBrad Hefta-Gaub committed 12 years agobc2830d
  34. add ParticleID classBrad Hefta-Gaub committed 12 years agoab9e01c
  35. implement new setProperties() getProperties() for Particle to allow setting all properties at once using a JS hashBrad Hefta-Gaub committed 12 years ago99f9ae9