mirror of
https://github.com/HifiExperiments/overte.git
synced 2025-08-11 23:56:25 +02:00
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 |
||
---|---|---|
.. | ||
external | ||
resources | ||
src | ||
ui | ||
CMakeLists.txt | ||
interface.icns | ||
interface_en.ts | ||
InterfaceConfig.h.in | ||
InterfaceVersion.h.in |