Sam Gateau 7de54917b8 Merge branch 'master' of https://github.com/highfidelity/hifi into temp1		2015-04-06 10:20:23 -07:00
..
animation	remove use of include_dependency_includes and use cmake	2015-02-18 14:12:05 -08:00
audio	user AudioConstants for size of int16_t	2015-04-02 11:35:23 -07:00
audio-client	Wrong byte array size in audio client	2015-03-17 16:40:26 +01:00
avatars	Merge pull request #4525 from ZappoMan/defaultAvatarBodyFix	2015-03-27 14:54:35 -07:00
embedded-webserver	remove use of include_dependency_includes and use cmake	2015-02-18 14:12:05 -08:00
entities	Merge pull request #4597 from huffman/light-overlays	2015-04-06 16:02:44 +02:00
entities-renderer	trying to debug the indirect sh lighting going wrong, the noraml on avatar is not correct	2015-04-06 10:17:31 -07:00
environment	test the possibility that zlib is no longer required	2015-02-19 15:29:28 -08:00
fbx	new member variable to remember the order in which meshes appeared in the model file	2015-04-01 17:50:35 -07:00
gpu	MErging with origin/orange, brinign the fix for shadows	2015-04-05 18:36:39 -07:00
model	MErging with origin/orange, brinign the fix for shadows	2015-04-05 18:36:39 -07:00
networking	Working on removing some of the warnings in the xcode build	2015-04-02 16:12:44 -07:00
octree	fix SVO import	2015-04-02 14:13:19 -07:00
physics	replace tabs with spaces for indentation	2015-04-04 13:50:16 -07:00
render-utils	Merge branch 'master' of https://github.com/highfidelity/hifi into temp1	2015-04-06 10:20:23 -07:00
script-engine	always render yourself, handle change of render values elsewhere	2015-04-01 17:36:43 -07:00
shared	MErging with origin/orange, brinign the fix for shadows	2015-04-05 18:36:39 -07:00