Stephen Birarda
|
f13aa322fc
|
resolve conflicts in merge with upstream/master
|
2014-01-21 16:01:12 -08:00 |
|
Stephen Birarda
|
417aa7ad59
|
re-expose an Avatar to the ScriptEngine
|
2014-01-21 15:59:55 -08:00 |
|
Stephen Birarda
|
aa9f7ff31d
|
hook the DataServerScriptingInterface to the ScriptEngine
|
2014-01-21 13:21:03 -08:00 |
|
aw
|
0eed041deb
|
scripts save on exit and load on entry
|
2014-01-20 22:58:01 -08:00 |
|
Brad Hefta-Gaub
|
18ded1d7db
|
added scriptEnding callback
|
2014-01-17 09:51:14 -08:00 |
|
Brad Hefta-Gaub
|
0df02618ee
|
use ScriptEngine in Particle::collideWithXXX() methods so that we get all script interfaces
|
2014-01-04 03:16:47 -08:00 |
|
Stephen Birarda
|
443c94a88f
|
repairs to AudioMixer and audio injection flow
|
2014-01-02 17:15:46 -08:00 |
|
ZappoMan
|
651d2d0c81
|
rename voxels and particles scripting interfaces
|
2013-12-31 09:41:35 -08:00 |
|
ZappoMan
|
8e6f924c73
|
add access to Voxels and Particles inside of collision scripts
|
2013-12-30 15:48:50 -08:00 |
|
ZappoMan
|
70e9781ad9
|
CR feedback new class names
|
2013-12-18 08:42:34 -08:00 |
|
ZappoMan
|
4bfdce3910
|
Merge branch 'master' of https://github.com/worklist/hifi into controller_scripting_interface
Conflicts:
libraries/avatars/src/HandData.h
libraries/script-engine/src/ScriptEngine.cpp
libraries/script-engine/src/ScriptEngine.h
|
2013-12-17 15:25:12 -08:00 |
|
ZappoMan
|
f469553b8c
|
CR feedback
|
2013-12-17 14:27:54 -08:00 |
|