Seth Alves d7ccd23b07 Merge branch 'master' of github.com:highfidelity/hifi into polyvox		2015-05-20 18:08:29 -07:00
..
animation	remove use of include_dependency_includes and use cmake	2015-02-18 14:12:05 -08:00
audio	remove dependency of PacketHeaders on NodeList	2015-05-05 12:19:42 -07:00
audio-client	remove dependency of PacketHeaders on NodeList	2015-05-05 12:19:42 -07:00
avatars	remove dependency of PacketHeaders on NodeList	2015-05-05 12:19:42 -07:00
embedded-webserver	try again without macro	2015-04-07 09:59:04 -07:00
entities	Merge branch 'master' of github.com:highfidelity/hifi into polyvox	2015-05-20 18:08:29 -07:00
entities-renderer	Merge branch 'master' of github.com:highfidelity/hifi into polyvox	2015-05-20 18:08:29 -07:00
environment	wire up atmosphere.hasStars property	2015-05-04 14:19:13 -07:00
fbx	don't allow buildModelMesh to spam logs when it encounters flawed models	2015-05-14 10:24:02 -07:00
gpu	Moving the load of the texture and the generation of the cube map irradiance in the same thread	2015-05-15 11:28:59 -07:00
model	Moving the load of the texture and the generation of the cube map irradiance in the same thread	2015-05-15 11:28:59 -07:00
networking	resolve conflicts on merge with upstream/master	2015-05-18 10:25:24 -07:00
octree	Merge branch 'master' into dk1	2015-05-13 21:25:56 -07:00
physics	adjust margin for hulls with small dimensions	2015-05-14 14:57:18 -07:00
render-utils	Fix indentation.	2015-05-18 14:25:35 -07:00
script-engine	add error log debug for script fail	2015-05-15 10:29:24 -07:00
shared	derieve PolyVox Entity from Model Entity	2015-05-19 21:40:05 -07:00
ui	Merge remote-tracking branch 'upstream/master' into web-entity	2015-05-13 09:49:53 -07:00