overte/libraries
Atlante45 e79e1a547f Merge branch 'master' of https://github.com/highfidelity/hifi into reverb_smoothing
Conflicts:
	libraries/audio-client/src/AudioClient.cpp
	libraries/audio-client/src/AudioClient.h
2015-02-10 16:08:34 +01: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-06 09:49:46 -08:00
audio-client Merge branch 'master' of https://github.com/highfidelity/hifi into reverb_smoothing 2015-02-10 16:08:34 +01:00
avatars specify QScriptable include under QtScript 2015-02-04 11:08:26 -08:00
embedded-webserver rename cmake macro to represent actual purpose 2014-12-18 16:51:20 -08:00
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 more voxel-ectomy cleaning up some remaining references to voxels 2015-01-06 09:27:48 -08:00
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 Merge pull request #4189 from birarda/android 2015-02-06 14:07:28 -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 Initialize _entityScriptingInterface in ScriptEngine 2015-02-06 11:31:19 -08:00
shared resolve conflicts on merge with upstream master 2015-02-06 09:49:46 -08:00