Seth Alves 4600173faa Merge branch 'master' of github.com:highfidelity/hifi into island		2015-04-08 08:57:48 -07:00
..
animation	remove use of include_dependency_includes and use cmake	2015-02-18 14:12:05 -08:00
audio	fix filenames in comments	2015-04-07 10:03:14 -07:00
audio-client	try again without macro	2015-04-07 09:59:04 -07:00
avatars	try again without macro	2015-04-07 09:59:04 -07:00
embedded-webserver	try again without macro	2015-04-07 09:59:04 -07:00
entities	try again without macro	2015-04-07 09:59:04 -07:00
entities-renderer	when populating shape-info, give the dimensions of the collision model rather than those of the visual model	2015-04-07 15:47:13 -07:00
environment	test the possibility that zlib is no longer required	2015-02-19 15:29:28 -08:00
fbx	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2015-04-07 12:56:21 -07:00
gpu	Merge pull request #4601 from samcake/temp1	2015-04-07 12:48:42 -07:00
model	MErging with origin/orange, brinign the fix for shadows	2015-04-05 18:36:39 -07:00
networking	try again without macro	2015-04-07 09:59:04 -07:00
octree	fix filenames in comments	2015-04-07 10:03:14 -07:00
physics	remove old kinematic CharacterController	2015-04-07 16:29:52 -07:00
render-utils	Fixing all the shaders for entities to work correctly with the now supported color attribute field	2015-04-07 14:26:45 -07:00
script-engine	fix filenames in comments	2015-04-07 10:03:14 -07:00
shared	Merge branch 'master' of github.com:highfidelity/hifi into island	2015-04-07 15:09:50 -07:00