Stephen Birarda 30afadc7b7 fixes for new settings API		2015-02-04 10:53:05 -08:00
..
animation	Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11	2015-01-13 20:38:52 -08:00
audio	resolve conflicts on merge with upstream/master	2015-02-04 10:38:05 -08:00
audio-client	fixes for new settings API	2015-02-04 10:53:05 -08:00
avatars	resolve conflicts on merge with upstream/master	2015-02-04 10:38:05 -08:00
embedded-webserver	rename cmake macro to represent actual purpose	2014-12-18 16:51:20 -08:00
entities	merge upstream/master into andrew/bispinor	2015-02-03 18:33:10 -08:00
entities-renderer	resolve conflicts on merge with upstream/master	2015-02-02 17:10:13 -08:00
environment	more voxel-ectomy cleaning up some remaining references to voxels	2015-01-06 09:27:48 -08:00
fbx	resolve conflicts on merge with upstream/master	2015-02-04 10:38:05 -08:00
gpu	resolve conflicts on merge with upstream/master	2015-02-04 10:38:05 -08:00
metavoxels	Settings update	2015-02-03 12:27:30 -08:00
model	First take at using the gpu::Texture in the Model rendering instead of the previous pass with raw glTexture	2015-01-20 16:02:26 -08:00
networking	resolve conflicts on merge with upstream/master	2015-02-04 10:38:05 -08:00
octree	resolve conflicts on merge with upstream/master	2015-02-04 10:38:05 -08:00
physics	bulletRotationStep --> computeBulletRotationStep	2015-01-27 17:37:12 -08:00
render-utils	FIx the lightmap not displaying when using the texcoord0	2015-02-03 16:10:31 -08:00
script-engine	A further custom User-Agent string	2015-01-30 15:56:01 -08:00
shared	resolve conflicts on merge with upstream/master	2015-02-04 10:38:05 -08:00