Seth Alves 034ceab4d3 Merge branch 'master' of github.com:highfidelity/hifi into avatars-can-collide		2015-03-05 06:39:03 -08:00
..
animation	remove use of include_dependency_includes and use cmake	2015-02-18 14:12:05 -08:00
audio	remove use of include_dependency_includes and use cmake	2015-02-18 14:12:05 -08:00
audio-client	Merge pull request #4300 from birarda/dependencies	2015-02-25 13:22:49 -08:00
avatars	move _velocity into base class. walking on a cube works	2015-03-04 15:26:02 -08:00
embedded-webserver	remove use of include_dependency_includes and use cmake	2015-02-18 14:12:05 -08:00
entities	fix bug in export	2015-03-04 16:29:34 -08:00
entities-renderer	Merge branch 'master' of https://github.com/highfidelity/hifi into temp0	2015-03-03 10:56:04 -08:00
environment	test the possibility that zlib is no longer required	2015-02-19 15:29:28 -08:00
fbx	test the possibility that zlib is no longer required	2015-02-19 15:29:28 -08:00
gpu	fix dark lighting and missing avatars on linux	2015-03-04 16:52:27 -08:00
model	Merge pull request #4371 from huffman/light-radius	2015-03-03 15:50:04 -08:00
networking	fix localhost port check to not kill user lookup	2015-03-03 23:11:02 -08:00
octree	Merge branch 'master' of https://github.com/highfidelity/hifi into temp0	2015-02-26 14:19:23 -08:00
physics	cap max speed at MAX_WALKING_SPEED	2015-03-04 19:57:06 -08:00
render-utils	Merge pull request #4375 from ctrlaltdavid/20370	2015-03-04 10:06:54 -08:00
script-engine	Merge pull request #4366 from ZappoMan/removeMetavoxels	2015-03-03 15:50:53 -08:00
shared	Merge branch 'master' of https://github.com/highfidelity/hifi into temp0	2015-03-03 10:56:04 -08:00