overte-HifiExperiments/interface
ZappoMan 805a88b73b Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities
Conflicts:
	examples/editModels.js
	interface/src/entities/EntityTreeRenderer.h
	libraries/models/src/ModelsScriptingInterface.cpp
	libraries/script-engine/src/ScriptEngine.cpp
2014-07-28 13:39:35 -07:00
..
external add a note for OS X users to use homebrew 2014-07-18 15:39:21 -07:00
resources Switched back to using uniforms for light parameters, as using the fixed 2014-07-22 18:03:13 -07:00
src Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 2014-07-28 13:39:35 -07:00
ui Added send data option to prefs 2014-07-16 17:56:29 -07:00
CMakeLists.txt Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 2014-07-28 13:39:35 -07:00
interface.icns update the interface icon 2014-07-07 11:46:57 -07:00
interface_en.ts
InterfaceConfig.h.in
InterfaceVersion.h.in