overte-HifiExperiments/interface
ZappoMan 027b1d58cc Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities
Conflicts:
	interface/src/Application.h
	interface/src/entities/EntityTreeRenderer.h
	interface/src/models/ModelTreeRenderer.cpp
	libraries/models/src/ModelItem.h
	libraries/models/src/ModelTree.h
2014-08-08 14:26:56 -07:00
..
external add a note for OS X users to use homebrew 2014-07-18 15:39:21 -07:00
resources Compute heightfield normals from adjacent values in vertex shader. 2014-08-05 15:13:50 -07:00
src Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 2014-08-08 14:26:56 -07:00
ui maxFramesOverDesired added; settable from domain page and preferences 2014-07-29 15:57:32 -07:00
CMakeLists.txt Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 2014-07-31 10:34:23 -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