ZappoMan 2baac96665 Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities ... Conflicts: examples/sit.js interface/src/Application.cpp libraries/models/src/ModelItem.cpp libraries/models/src/ModelsScriptingInterface.cpp		2014-07-15 10:04:40 -07:00
..
AbstractControllerScriptingInterface.h	fix header include guards via regex	2014-04-09 12:03:17 -07:00
EventTypes.cpp	run regex header replacement on all cpp files	2014-04-09 09:35:42 -07:00
EventTypes.h	fix header include guards via regex	2014-04-09 12:03:17 -07:00
LocalVoxels.cpp	add ray picking to the model scripting interface	2014-05-23 17:09:37 -07:00
LocalVoxels.h	added support for returning accuracy of ray intersections and other octree tests that can fail due to getting lock	2014-04-29 15:10:28 -07:00
MenuItemProperties.cpp	run regex header replacement on all cpp files	2014-04-09 09:35:42 -07:00
MenuItemProperties.h	fix header include guards via regex	2014-04-09 12:03:17 -07:00
MIDIEvent.cpp	initial pass of MIDI implementation that bubbles events to JS	2014-07-01 09:53:18 -07:00
MIDIEvent.h	initial pass of MIDI implementation that bubbles events to JS	2014-07-01 09:53:18 -07:00
Quat.cpp	run regex header replacement on all cpp files	2014-04-09 09:35:42 -07:00
Quat.h	fix header include guards via regex	2014-04-09 12:03:17 -07:00
ScriptEngine.cpp	Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities	2014-07-15 10:04:40 -07:00
ScriptEngine.h	Merge branch 'master' of https://github.com/worklist/hifi into renameModelsToEntities	2014-07-01 16:32:47 -07:00
ScriptUUID.cpp	fixing formatting	2014-04-09 13:06:29 -07:00
ScriptUUID.h	fixing formatting	2014-04-09 13:06:29 -07:00
Vec3.cpp	More work on editModels	2014-04-30 16:50:40 -07:00
Vec3.h	coding standard	2014-05-02 15:34:07 -07:00
XMLHttpRequestClass.cpp	Switched XMLHttpRequestClass to NetworkAccessManager	2014-07-02 11:27:32 -07:00
XMLHttpRequestClass.h	Switched XMLHttpRequestClass to NetworkAccessManager	2014-07-02 11:27:32 -07:00