Seth Alves a775c1fb98 Merge pull request #4792 from howard-stearns/objReader-tweak ... Obj reader tweak		2015-05-07 18:39:37 -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	cleanup	2015-05-07 14:42:09 -07:00
entities-renderer	Merge branch 'master' of github.com:highfidelity/hifi into dice-on-table-1	2015-05-07 11:30:46 -07:00
environment	wire up atmosphere.hasStars property	2015-05-04 14:19:13 -07:00
fbx	Merge branch 'master' of https://github.com/highfidelity/hifi into objReader-tweak	2015-05-07 16:41:52 -07:00
gpu	Restore polygon mode after entities rendering	2015-05-07 13:34:22 +02:00
model	wire up the skybox color property to the new skybox renderer	2015-05-06 20:36:06 -07:00
networking	added skybox group properties to zones	2015-05-05 14:12:02 -07:00
octree	Merge branch 'master' of https://github.com/highfidelity/hifi into display_zones	2015-05-07 10:13:59 +02:00
physics	always remove from _pendingAdds just in case	2015-05-07 15:22:58 -07:00
render-utils	Missing comma	2015-05-07 20:15:40 +02:00
script-engine	now conforming to coding standards	2015-05-04 16:40:04 -07:00
shared	Merge branch 'master' of github.com:highfidelity/hifi into dice-on-table-1	2015-05-07 11:30:46 -07:00
ui	removing commented out old implementation.	2015-05-06 12:03:47 -07:00