Brad Davis 7a33474245 Merge remote-tracking branch 'upstream/master' into offscreen ... Conflicts: interface/src/Menu.cpp		2015-04-21 13:02:38 -07:00
..
animation	remove use of include_dependency_includes and use cmake	2015-02-18 14:12:05 -08:00
audio	Add generated audio methods to audio interface	2015-04-15 15:49:11 +02:00
audio-client	less loud generated noise	2015-04-15 16:22:52 +02:00
avatars	Merge pull request #4638 from Triplelexx/myavatar-targetvelocity	2015-04-15 14:22:02 -07:00
embedded-webserver	try again without macro	2015-04-07 09:59:04 -07:00
entities	fix formatting	2015-04-16 12:15:03 -07:00
entities-renderer	use computed shape type	2015-04-16 12:13:41 -07:00
environment	test the possibility that zlib is no longer required	2015-02-19 15:29:28 -08:00
fbx	migrate the various list to sort the rendering from explicit names to a more generic key based map	2015-04-16 14:37:39 -07:00
gpu	fixing syntax issues	2015-04-15 10:16:04 -07:00
model	refined the names of the key light porperties in Stage	2015-04-21 11:04:14 -07:00
networking	obfuscate set access token from AM log	2015-04-17 10:44:01 -07:00
octree	Delete char* items properly	2015-04-08 20:03:42 -07:00
physics	merge upstream/master into andrew/bispinor	2015-04-16 12:07:22 -07:00
render-utils	Merge remote-tracking branch 'upstream/master' into offscreen	2015-04-21 13:02:38 -07:00
script-engine	more details in the comments	2015-04-21 11:12:01 -07:00
shared	Merge branch 'master' into offscreen	2015-04-16 14:02:40 -07:00