Sam Gateau a28c99bb40 Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into punk		2015-05-22 14:40:00 -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
entities	Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching	2015-05-22 17:16:51 +02:00
entities-renderer	Don't sync by default	2015-05-22 20:29:25 +02: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	Remove push/popInputState	2015-05-22 20:30:54 +02: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	fixed problem with particle entities not showing up on other clients by adding properties to decodeEditEntityPacket and encodeEntityEditPacket methods in EntityItemProperties.cpp	2015-05-21 19:35:27 -07:00
octree	Merge branch 'master' into dk1	2015-05-13 21:25:56 -07:00
physics	split entity-add and entity-edit messages	2015-05-20 14:52:03 -07:00
render	fix typos	2015-05-22 13:12:03 -07:00
render-utils	Simple Program uses gpu API	2015-05-22 16:14:32 +01:00
script-engine	make EntityItemID a subclass of QUuid	2015-05-20 14:22:08 -07:00
shared	Ignore scale in Transform when 0.0f	2015-05-22 16:21:12 +02:00
ui	Merge remote-tracking branch 'upstream/master' into web-entity	2015-05-13 09:49:53 -07:00