overte-HifiExperiments/interface
ZappoMan 2bcad6ab2b Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities
Conflicts:
	assignment-client/src/Agent.cpp
	examples/editModels.js
2014-08-28 21:19:56 -07:00
..
external Bring libovr build instructions up to date 2014-08-21 19:24:09 -07:00
resources Support for scaling splat textures in S and T, use mipmaps for them. 2014-08-22 16:43:09 -07:00
src Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 2014-08-28 21:19:56 -07:00
ui repetition-with-fade option added, not implemented 2014-08-11 11:22:37 -07:00
CMakeLists.txt Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 2014-08-28 21:19:56 -07:00
interface.icns update the interface icon 2014-07-07 11:46:57 -07:00
interface_en.ts importVoxels() JS override: specify file and location 2014-08-03 14:01:37 -04:00
InterfaceConfig.h.in
InterfaceVersion.h.in