Andrew Meadows f82f9cc2f4 merge upstream/master into andrew/thermonuclear		2015-03-10 14:28:02 -07:00
..
animation	remove use of include_dependency_includes and use cmake	2015-02-18 14:12:05 -08:00
audio	cleanup some divides for manual sound resampling	2015-03-10 13:04:35 -07:00
audio-client	Merge pull request #4300 from birarda/dependencies	2015-02-25 13:22:49 -08:00
avatars	merge from master	2015-03-09 13:39:51 -07:00
embedded-webserver	remove use of include_dependency_includes and use cmake	2015-02-18 14:12:05 -08:00
entities	erase deleted entities from pending sort list	2015-03-10 14:26:19 -07:00
entities-renderer	namechanges: setFooInMeters() --> setFoo()	2015-03-09 09:56:15 -07:00
environment	test the possibility that zlib is no longer required	2015-02-19 15:29:28 -08:00
fbx	add comment about character capsule being hard-coded	2015-03-09 13:51:08 -07:00
gpu	fix dark lighting and missing avatars on linux	2015-03-04 16:52:27 -08:00
model	stray control-Ms	2015-03-07 07:52:20 -08:00
networking	merge from master	2015-03-09 13:39:51 -07:00
octree	entity cubes are in meters	2015-03-06 15:32:03 -08:00
physics	add f at end of float literal	2015-03-10 14:24:49 -07:00
render-utils	remove stray control-Ms	2015-03-08 18:07:07 -07:00
script-engine	Merge pull request #4366 from ZappoMan/removeMetavoxels	2015-03-03 15:50:53 -08:00
shared	stray control-Ms	2015-03-07 07:53:04 -08:00