Commit graph

13 commits

Author SHA1 Message Date
Brad Hefta-Gaub
99f9ae9d3a implement new setProperties() getProperties() for Particle to allow setting all properties at once using a JS hash 2014-01-17 16:02:58 -08:00
Brad Hefta-Gaub
d4331db45a Merge branch 'master' of git://github.com/worklist/hifi into new_particle_scripting_interface
Conflicts:
	examples/gun.js
	libraries/script-engine/src/ScriptEngine.cpp
2014-01-17 13:29:36 -08:00
Stephen Birarda
987c639e36 initial newline removal from all QDebug calls 2014-01-14 13:09:22 -08:00
Brad Hefta-Gaub
abf8e83c33 change Voxels JS interface to be more clear 2014-01-05 11:09:16 -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
f24eff33fe open up ASI playSound method to ScriptEngine 2014-01-03 09:38:05 -08:00
Stephen Birarda
443c94a88f repairs to AudioMixer and audio injection flow 2014-01-02 17:15:46 -08:00
Stephen Birarda
845176bbc6 expose Sound to ScriptEngine 2014-01-02 15:14:28 -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
Renamed from libraries/scriptengine/src/ScriptEngine.cpp (Browse further)