samcake 98c0cd7d23 Merge pull request #5009 from ZappoMan/team-teaching-scene-api ... TEAM TEACHING - hacking on rendering mesh parts		2015-06-01 12:24:27 -07:00
..
animation
audio	remove dependency of PacketHeaders on NodeList	2015-05-05 12:19:42 -07:00
audio-client	look for connection steps in LimitedNodeList	2015-05-27 15:54:39 -07:00
avatars	Undo the merge with the broken master checking. What could go wrong?	2015-05-28 13:48:27 -07:00
embedded-webserver	try again without macro	2015-04-07 09:59:04 -07:00
entities	Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching-scene-api	2015-05-29 11:23:31 -07:00
entities-renderer	Merge pull request #5009 from ZappoMan/team-teaching-scene-api	2015-06-01 12:24:27 -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	more hacking sams tweaks	2015-06-01 09:07:32 -07:00
model	Undo the merge with the broken master checking. What could go wrong?	2015-05-28 13:48:27 -07:00
networking	Merge pull request #4995 from birarda/domain-dtls	2015-05-29 10:50:01 -07:00
octree	Undo the merge with the broken master checking. What could go wrong?	2015-05-28 13:48:27 -07:00
physics	Undo the merge with the broken master checking. What could go wrong?	2015-05-28 13:48:27 -07:00
render	Merge pull request #5009 from ZappoMan/team-teaching-scene-api	2015-06-01 12:24:27 -07:00
render-utils	Merge pull request #5009 from ZappoMan/team-teaching-scene-api	2015-06-01 12:24:27 -07:00
script-engine	Uglify conditional returns. :-)	2015-05-26 11:38:36 -07:00
shared	Reactivate Transform asserts	2015-05-29 17:05:56 +02:00
ui	Merge remote-tracking branch 'upstream/master' into web-entity	2015-05-13 09:49:53 -07:00