Sam Gateau
|
dc27bfb6ef
|
Merge branch 'master' of https://github.com/highfidelity/hifi into temp1
|
2015-03-18 15:59:50 -07:00 |
|
Sam Gateau
|
0bd78be7f4
|
Transition model shaders to gpu:Shader
|
2015-03-18 15:57:01 -07:00 |
|
Seth Alves
|
9161cc8b83
|
attempt to handle collision models in the same way as render models
|
2015-03-18 13:00:09 -07:00 |
|
Seth Alves
|
87cc710efc
|
more merge madness, calculate 2nd PhysicsEngine hash with qChecksum if url is set
|
2015-03-13 18:43:24 -07:00 |
|
Seth Alves
|
bf1cb951a3
|
move PhysicsEntity so that ModelEntityItem can initiate a model download
|
2015-03-11 18:34:27 -07:00 |
|
Seth Alves
|
20a22ff42c
|
Merge branch 'master' of github.com:highfidelity/hifi into avatars-can-collide
|
2015-03-11 07:17:19 -07:00 |
|
Seth Alves
|
1c73f50dbc
|
started to hook up geometry downloader to ShapeInfo
|
2015-03-11 07:17:13 -07:00 |
|
Seth Alves
|
844085b514
|
started on hull collisions
|
2015-03-10 15:30:08 -07:00 |
|
Sam Gateau
|
23a6326aa1
|
testing the shader features in Model and refining the shader making workflow
|
2015-03-08 10:53:29 -07:00 |
|
Sam Gateau
|
5ab3cbb7ec
|
Fixed the 2 remianing issues before PR, the shadow program needed to have the binding assigned and the Head of the avatar isn't getting it's BBox evaluated
|
2015-02-27 17:11:16 -08:00 |
|
Sam Gateau
|
d759f4c255
|
Merge branch 'master' of https://github.com/highfidelity/hifi into temp1
|
2015-01-15 11:54:55 -08:00 |
|
Atlante45
|
38729c5790
|
Made dependencies inherit from Dependency
|
2015-01-13 20:38:01 -08:00 |
|
Sam Gateau
|
9c083ce86e
|
Using the model::Material for rendering and in shaders
|
2015-01-13 15:51:18 -08:00 |
|
Sam Gateau
|
d9efafac7e
|
updating the model fragment shaders to use DeferredBUfferWrite
|
2015-01-13 14:11:38 -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 |
|
ZappoMan
|
1bc91e7d29
|
removed renderTriangleProxies
|
2015-01-06 16:01:06 -08:00 |
|
Atlante45
|
296c0025de
|
Switched to auto and changed macro
|
2014-12-18 15:42:38 -08:00 |
|
Atlante45
|
990362b8ff
|
Merge branch 'cuckoo' of https://github.com/birarda/hifi into applications_diet_cpp11
|
2014-12-18 14:18:21 -08:00 |
|
Atlante45
|
ce7f72d2cd
|
Update macro
|
2014-12-17 15:26:47 -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
|
89101872bb
|
move Model and AnimationHandle to libraries
|
2014-12-16 14:04:39 -08:00 |
|