overte-HifiExperiments/interface
Andrzej Kapolka ce9ecba5d8 Merge branch 'master' of https://github.com/highfidelity/hifi into deference
Conflicts:
	interface/resources/shaders/model.frag
	interface/resources/shaders/model_cascaded_shadow_map.frag
	interface/resources/shaders/model_cascaded_shadow_normal_map.frag
	interface/resources/shaders/model_cascaded_shadow_normal_specular_map.frag
	interface/resources/shaders/model_cascaded_shadow_specular_map.frag
	interface/resources/shaders/model_normal_map.frag
	interface/resources/shaders/model_normal_specular_map.frag
	interface/resources/shaders/model_shadow_map.frag
	interface/resources/shaders/model_shadow_normal_map.frag
	interface/resources/shaders/model_shadow_normal_specular_map.frag
	interface/resources/shaders/model_shadow_specular_map.frag
	interface/resources/shaders/model_specular_map.frag
	interface/src/renderer/Model.cpp
	interface/src/renderer/Model.h
2014-09-17 13:50:13 -07:00
..
external Bring libovr build instructions up to date 2014-08-21 19:24:09 -07:00
resources Allow specifying material opacity. 2014-09-16 17:52:39 -07:00
src Merge branch 'master' of https://github.com/highfidelity/hifi into deference 2014-09-17 13:50:13 -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 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