Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-11 05:28:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
overte/interface
History
ZappoMan 024f1b47c2 Merge branch 'master' of https://github.com/highfidelity/hifi into stretchableEntities 
Conflicts:
	interface/src/entities/RenderableBoxEntityItem.cpp
	interface/src/entities/RenderableModelEntityItem.cpp
	libraries/entities/src/EntityTreeElement.cpp
	libraries/shared/src/Extents.h
2014-09-12 08:18:09 -07:00
..
external Bring libovr build instructions up to date 2014-08-21 19:24:09 -07:00
resources Merge branch 'master' of https://github.com/highfidelity/hifi into 19964 2014-09-05 07:45:55 +02:00
src Merge branch 'master' of https://github.com/highfidelity/hifi into stretchableEntities 2014-09-12 08:18:09 -07:00
ui Add option to change Faceshift hostname. 2014-09-10 19:34:21 -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
interface_en.ts importVoxels() JS override: specify file and location 2014-08-03 14:01:37 -04:00
InterfaceConfig.h.in
InterfaceVersion.h.in