Stephen Birarda 7becf62ba9 Merge branch 'master' of https://github.com/highfidelity/hifi		2015-02-12 10:28:04 -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	use a QPointer to trigger delayed delete	2015-02-11 19:15:33 -08:00
audio-client	add option to restart a local audio injector	2015-02-11 16:58:30 -08: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	give TextEntityItem a box collision shape	2015-02-12 08:28:34 -08:00
entities-renderer	fix the quad color being broken after rendering text	2015-02-11 15:50:04 -08:00
environment	more voxel-ectomy cleaning up some remaining references to voxels	2015-01-06 09:27:48 -08:00
fbx	remove warning about unused variable	2015-02-11 08:42:36 -08:00
gpu	Introduce a cache bit in networkGemometry to capture the status of texture LOaded and avoid requiring everything once everything is loaded and get rid of the Transform stack calls on gl from gpu	2015-02-10 18:38:48 -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 upstream/master into andrew/thermonuclear	2015-02-11 13:35:28 -08:00
octree	merge upstream/master into andrew/thermonuclear	2015-02-09 12:44:52 -08:00
physics	don't create shape for SHAPE_TYPE_NONE	2015-02-11 08:43:55 -08:00
render-utils	Merge pull request #4271 from huffman/fix-overlays-text-size	2015-02-12 09:35:37 -08:00
script-engine	use a QPointer to trigger delayed delete	2015-02-11 19:15:33 -08:00
shared	manipulate the extents for SHAPE_TYPE_SPHERE	2015-02-11 08:44:10 -08:00