Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-19 11:58:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
85792 commits 25 branches 0 tags 1.1 GiB
Commit graph

852 commits

Author SHA1 Message Date
Atlante45
11a2ecab56 Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet 
Conflicts:
	interface/src/Application.cpp
	interface/src/Application.h
	interface/src/Menu.cpp
	interface/src/entities/EntityTreeRenderer.h
	interface/src/ui/ApplicationOverlay.cpp
	libraries/render-utils/src/GlowEffect.cpp
	libraries/render-utils/src/Model.cpp
 2014-12-16 15:02:37 -08:00
ZappoMan
89101872bb move Model and AnimationHandle to libraries 2014-12-16 14:04:39 -08:00
Renamed from interface/src/renderer/Model.cpp (Browse further)