Sam Gateau
|
7ae9635ce7
|
Refactoring the code from directional into DeferredLighting.slh
|
2015-01-15 15:27:18 -08:00 |
|
Sam Gateau
|
d759f4c255
|
Merge branch 'master' of https://github.com/highfidelity/hifi into temp1
|
2015-01-15 11:54:55 -08:00 |
|
ZappoMan
|
db94949649
|
Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing
Conflicts:
interface/src/avatar/SkeletonModel.cpp
|
2015-01-14 17:55:03 -08:00 |
|
Sam Gateau
|
614e1aa6ae
|
Cleaning the Model rendering path from any use of glMaterial
|
2015-01-14 16:44:44 -08:00 |
|
ZappoMan
|
e6388a65b9
|
rough pass at adding color to geometry cache
|
2015-01-13 20:53:05 -08:00 |
|
Atlante45
|
2a82ff9768
|
Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11
Conflicts:
assignment-client/src/voxels/VoxelServer.cpp
interface/src/Application.cpp
interface/src/Audio.cpp
interface/src/DatagramProcessor.cpp
interface/src/Menu.cpp
interface/src/Util.cpp
interface/src/avatar/MyAvatar.cpp
interface/src/ui/ApplicationOverlay.cpp
interface/src/ui/PreferencesDialog.cpp
libraries/networking/src/NodeList.cpp
libraries/shared/src/DependencyManager.h
|
2015-01-13 11:03:14 -08:00 |
|
Sam Gateau
|
4fb9e9c775
|
cleaning the code
|
2014-12-30 17:55:49 -08:00 |
|
Sam Gateau
|
37017d0c16
|
moving the deferrered shaders from the resource folder to built-in the executable
|
2014-12-30 17:42:10 -08:00 |
|
Atlante45
|
327daacecd
|
Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11
Conflicts:
interface/src/Application.cpp
interface/src/devices/OculusManager.cpp
libraries/networking/src/NodeList.cpp
|
2014-12-22 13:34:18 -08:00 |
|
Atlante45
|
296c0025de
|
Switched to auto and changed macro
|
2014-12-18 15:42:38 -08:00 |
|
ZappoMan
|
11b4400099
|
move all glut-ness to geometry cache
|
2014-12-18 11:20:17 -08:00 |
|
ZappoMan
|
ef42203481
|
add wire cube implementation to GeometryCache and DeferredLightingEffect
|
2014-12-17 15:58:52 -08:00 |
|
ZappoMan
|
1a9cf126e4
|
Merge branch 'master' of https://github.com/highfidelity/hifi into librarization
Conflicts:
interface/src/Application.cpp
libraries/entities-renderer/src/EntityTreeRenderer.h
|
2014-12-17 13:16:11 -08:00 |
|
ZappoMan
|
5d636e21c6
|
more Application dependency cleanup
|
2014-12-17 11:10:45 -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
|
1ed2c62bbf
|
try this
|
2014-12-16 12:15:57 -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 |
|