Stephen Birarda 2bec2f0590 make model depend on octree for ViewFrustum		2015-07-14 17:21:46 -07:00
..
animation	fix AnimationLoop::setRunning() to not constantly reset the frame when the running state doesn't actually change	2015-07-10 12:43:35 -07:00
audio	Merge branch 'receive_packets' of https://github.com/huffman/hifi into protocol	2015-07-14 16:36:28 -07:00
audio-client	Merge branch 'protocol' of https://github.com/Atlante45/hifi into atp	2015-07-14 17:16:42 -07:00
auto-updater
avatars	Merge branch 'receive_packets' of https://github.com/huffman/hifi into protocol	2015-07-14 16:36:28 -07:00
embedded-webserver
entities	move EntityEditPacketSender method to slot	2015-07-14 17:18:28 -07:00
entities-renderer	Merge branch 'protocol' of github.com:birarda/hifi into receive_packets	2015-07-14 10:21:31 -07:00
environment	Update includes for moved files	2015-07-13 15:28:55 -07:00
fbx
gpu	FIxing th ecompilation issue on mac, ready to ship	2015-07-13 19:17:09 -07:00
model	make model depend on octree for ViewFrustum	2015-07-14 17:21:46 -07:00
networking	Merge branch 'protocol' of https://github.com/Atlante45/hifi into atp	2015-07-14 17:16:42 -07:00
octree	Merge branch 'receive_packets' of https://github.com/huffman/hifi into protocol	2015-07-14 16:36:28 -07:00
physics	resolve conflicts on merge with uptream/master	2015-07-14 09:52:20 -07:00
render	quiet compiler	2015-07-12 10:29:43 -07:00
render-utils	Merge branch 'receive_packets' of https://github.com/huffman/hifi into protocol	2015-07-14 16:36:28 -07:00
script-engine	Merge branch 'protocol' of https://github.com/birarda/hifi into protocol	2015-07-14 14:11:41 -07:00
shared	resolve conflicts on merge with uptream/master	2015-07-14 09:52:20 -07:00
ui