Anthony Thibault e1cbfcd901 Merge branch 'master' into ajt/particle-system-improvements ... Conflicts: libraries/networking/src/PacketHeaders.cpp libraries/networking/src/PacketHeaders.h		2015-05-11 19:24:13 -07:00
..
animation
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' into ajt/particle-system-improvements	2015-05-11 19:24:13 -07:00
entities-renderer	Merge branch 'master' into ajt/particle-system-improvements	2015-05-11 19:24:13 -07:00
environment	wire up atmosphere.hasStars property	2015-05-04 14:19:13 -07:00
fbx	Handle empty face groups, such as in the rama cyclinder that crashed the Friday meeting (http://headache.hungry.com/~seth/hifi/stickCollisionModel.obj).	2015-05-09 13:16:34 -07:00
gpu	Fixed the cube map loading issue	2015-05-11 13:43:15 -07:00
model	fix the color blending on Mac	2015-05-11 17:27:22 -07:00
networking	Merge branch 'master' into ajt/particle-system-improvements	2015-05-11 19:24:13 -07:00
octree	inline setMaxQueryPacketsPerSecond	2015-05-11 12:15:52 -07:00
physics	fixing file	2015-05-09 11:48:30 -07:00
render-utils	Merge branch 'master' into ajt/particle-system-improvements	2015-05-11 19:24:13 -07:00
script-engine	Merge pull request #4825 from Nex-Pro/Non-JSON-Menu-Items-Fix	2015-05-11 12:27:11 -07:00
shared	resolve conflicts on merge with upstream/master	2015-05-11 11:10:22 -07:00
ui	Fixing scale resolution issues	2015-05-07 12:01:56 -07:00