Atlante45
|
b2dac6f53f
|
DM users update
|
2014-12-16 15:32:11 -08:00 |
|
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 |
|
ZappoMan
|
efa8a752f2
|
remove dependency on Menu from Model
|
2014-12-16 13:14:57 -08:00 |
|
ZappoMan
|
16c1e597f1
|
remove Application dependency from Model
|
2014-12-16 12:53:22 -08:00 |
|
ZappoMan
|
1ed2c62bbf
|
try this
|
2014-12-16 12:15:57 -08:00 |
|
ZappoMan
|
ee34dfffc1
|
try this
|
2014-12-16 12:05:23 -08:00 |
|
ZappoMan
|
ec5c33fecc
|
try this
|
2014-12-16 11:57:06 -08:00 |
|
ZappoMan
|
a9b3fdd3eb
|
try this
|
2014-12-16 11:44:15 -08:00 |
|
ZappoMan
|
fc1e1ecfc0
|
move DeferredLightingEffect and AmbientOcclusionEffect to libraries, make them DependencyManager enabled
|
2014-12-16 11:27:44 -08:00 |
|
ZappoMan
|
4d79a08533
|
remove Application dependencies from AmbientOcclusion and DeferredLightingEffect
|
2014-12-16 10:32:03 -08:00 |
|
ZappoMan
|
02737a4ec4
|
move JointState to libraries
|
2014-12-15 19:38:30 -08:00 |
|
ZappoMan
|
fac6ff572b
|
see if this works
|
2014-12-15 19:29:53 -08:00 |
|
ZappoMan
|
41c135c4e5
|
move GlowEffect to libraries
|
2014-12-15 19:19:21 -08:00 |
|
ZappoMan
|
37abe8e89c
|
move RenderUtils.cpp/h to libraries
|
2014-12-15 17:35:26 -08:00 |
|
ZappoMan
|
b1d1cfee44
|
cmake cleanup
|
2014-12-15 15:29:05 -08:00 |
|
ZappoMan
|
df7e115556
|
move ProgramObject to libraries
|
2014-12-15 14:21:22 -08:00 |
|
ZappoMan
|
49cacd85bd
|
move GeometryCache to library
|
2014-12-15 14:00:41 -08:00 |
|
ZappoMan
|
7b973453b4
|
move TextureCache to library
|
2014-12-15 13:14:16 -08:00 |
|
ZappoMan
|
3de3540ebe
|
move back into interface for now
|
2014-12-15 08:37:33 -08:00 |
|
ZappoMan
|
4ac673fe63
|
more render util cleanup
|
2014-12-15 08:16:42 -08:00 |
|
ZappoMan
|
2df4c017f1
|
move GeometryCache out of application and remove dependency on Model
|
2014-12-15 08:15:55 -08:00 |
|
ZappoMan
|
e253b8afa4
|
move TextureCache out of interface and Application
|
2014-12-15 08:14:53 -08:00 |
|