Sam Gateau 5ebbdaca05 Merge branch 'master' of https://github.com/highfidelity/hifi into orange		2015-04-15 09:00:50 -07:00
..
animation	remove use of include_dependency_includes and use cmake	2015-02-18 14:12:05 -08:00
audio	Add generated audio methods to audio interface	2015-04-15 15:49:11 +02:00
audio-client	less loud generated noise	2015-04-15 16:22:52 +02: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	Merge pull request #4617 from sethalves/acceleration-and-owner-in-wire-protocol	2015-04-10 09:07:47 -07:00
entities-renderer	don't compute shape info until both render and collision geometries are fully loaded	2015-04-13 09:34:38 -07:00
environment	test the possibility that zlib is no longer required	2015-02-19 15:29:28 -08:00
fbx	add fatten-faces mode to convex-hull tool for use on meshes which were derived from height-fields	2015-04-09 14:29:17 -07:00
gpu	Cleaning up Frambuffer.h	2015-04-14 18:48:06 -07:00
model	MErging with origin/orange, brinign the fix for shadows	2015-04-05 18:36:39 -07:00
networking	expand svo to hold acceleration and id of current simulator node	2015-04-08 15:39:34 -07:00
octree	Delete char* items properly	2015-04-08 20:03:42 -07:00
physics	fix bug where fly speed is limited to walk speed	2015-04-13 13:23:15 -07:00
render-utils	Removing almost all the QFramebufferObject (instead in overlay layer) in favor of gpu::Framebuffer, eveyrthing seems to work properly	2015-04-14 18:27:24 -07:00
script-engine	Add generated audio controls to scripting interface	2015-04-15 15:49:47 +02:00
shared	Merge branch 'master' of github.com:highfidelity/hifi into island	2015-04-07 15:09:50 -07:00