Seth Alves c63b8a93ec oops fix endless loop		2015-05-06 15:48:45 -07:00
..
animation	remove use of include_dependency_includes and use cmake	2015-02-18 14:12:05 -08:00
audio	resolve conflicts on merge with upstream/master	2015-05-04 10:05:44 -07:00
audio-client	resolve conflicts on merge with upstream/master	2015-05-04 10:05:44 -07:00
avatars	move number constants out of SharedUtil to NumericalConstants	2015-05-01 10:26:53 -07:00
embedded-webserver	try again without macro	2015-04-07 09:59:04 -07:00
entities	oops fix endless loop	2015-05-06 15:48:45 -07:00
entities-renderer	Merge branch 'master' of github.com:highfidelity/hifi into dice-on-table-1	2015-05-05 16:43:43 -07:00
environment	wire up atmosphere.hasStars property	2015-05-04 14:19:13 -07:00
fbx	Merge pull request #4780 from samcake/blue	2015-05-06 14:41:06 -07:00
gpu	missing includes	2015-05-06 12:38:12 -07:00
model	Fix include filke case for ubuntu...	2015-05-06 14:23:42 -07:00
networking	Merge branch 'master' of https://github.com/highfidelity/hifi into atmosphereInZones	2015-05-04 17:16:33 -07:00
octree	Cube texture are working with the GL backend, useing it in SKybox successfullly	2015-05-06 09:53:36 -07:00
physics	don't auto-remove simulation owner unless the Node is gone. put back code that causes interfaces to give up ownership	2015-05-06 15:32:02 -07:00
render-utils	Merge pull request #4780 from samcake/blue	2015-05-06 14:41:06 -07:00
script-engine	now conforming to coding standards	2015-05-04 16:40:04 -07:00
shared	pull from upstream	2015-05-06 14:31:22 -07:00
ui	removing commented out old implementation.	2015-05-06 12:03:47 -07:00