| .. |
|
animation
|
Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11
|
2015-01-13 20:38:52 -08:00 |
|
audio
|
Merge branch 'master' of https://github.com/highfidelity/hifi into android
|
2015-01-28 13:13:32 -08:00 |
|
audio-client
|
remove application calls from audio-client
|
2015-02-02 17:13:08 -08:00 |
|
avatars
|
resolve conflicts on merge with upstream/master
|
2015-02-02 17:10:13 -08:00 |
|
embedded-webserver
|
rename cmake macro to represent actual purpose
|
2014-12-18 16:51:20 -08:00 |
|
entities
|
move shape polymorphism to ModelEntityItem
|
2015-01-30 16:25:35 -08:00 |
|
entities-renderer
|
resolve conflicts on merge with upstream/master
|
2015-02-02 17:10:13 -08:00 |
|
environment
|
more voxel-ectomy cleaning up some remaining references to voxels
|
2015-01-06 09:27:48 -08:00 |
|
fbx
|
Merge branch 'master' of https://github.com/highfidelity/hifi into android
|
2015-01-28 13:13:58 -08:00 |
|
gpu
|
Merge branch 'android' of git://github.com/birarda/hifi into android
|
2015-01-30 13:30:17 -08:00 |
|
metavoxels
|
Merge pull request #4131 from Atlante45/pull_out_menu_mess
|
2015-01-27 16:23:23 -08:00 |
|
model
|
First take at using the gpu::Texture in the Model rendering instead of the previous pass with raw glTexture
|
2015-01-20 16:02:26 -08:00 |
|
networking
|
resolve conflicts on merge with upstream/master
|
2015-02-02 17:10:13 -08:00 |
|
octree
|
Merge branch 'master' of https://github.com/highfidelity/hifi into android
|
2015-01-28 13:13:32 -08:00 |
|
physics
|
bulletRotationStep --> computeBulletRotationStep
|
2015-01-27 17:37:12 -08:00 |
|
render-utils
|
Merge pull request #4191 from ZappoMan/moreImmediateModeRemoval
|
2015-01-30 10:21:18 -08:00 |
|
script-engine
|
A further custom User-Agent string
|
2015-01-30 15:56:01 -08:00 |
|
shared
|
resolve conflicts on merge with upstream/master
|
2015-02-02 17:10:13 -08:00 |
