Stephen Birarda fe79d8902e replace data with metaverse for highfidelity urls		2015-02-10 10:05:38 -08:00
..
animation
audio	resolve conflicts on merge with upstream master	2015-02-06 09:49:46 -08:00
audio-client	Merge branch 'master' of https://github.com/highfidelity/hifi into android	2015-02-04 15:16:23 -08:00
avatars	specify QScriptable include under QtScript	2015-02-04 11:08:26 -08:00
embedded-webserver
entities	Merge pull request #4241 from birarda/master	2015-02-06 11:49:29 -08:00
entities-renderer	Merge pull request #4189 from birarda/android	2015-02-06 14:07:28 -08:00
environment
fbx	Merge pull request #4248 from samcake/temp0	2015-02-06 16:52:40 -08:00
gpu	Merge pull request #4248 from samcake/temp0	2015-02-06 16:52:40 -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	replace data with metaverse for highfidelity urls	2015-02-10 10:05:38 -08:00
octree	resolve conflicts on merge with upstream/master	2015-02-04 10:38:05 -08:00
physics	fix physics crash on disconnect from domainserver	2015-02-05 09:13:32 -08:00
render-utils	Fixing bug in text renderer causing glyphs to float at different depths	2015-02-08 15:37:55 -08:00
script-engine	replace data with metaverse for highfidelity urls	2015-02-10 10:05:38 -08:00
shared	resolve conflicts on merge with upstream master	2015-02-06 09:49:46 -08:00