Stephen Birarda 11f3161029 resolve conflicts on merge with upstream/master		2015-02-04 10:38:05 -08:00
..
animation
audio	resolve conflicts on merge with upstream/master	2015-02-04 10:38:05 -08:00
audio-client	resolve conflicts on merge with upstream/master	2015-02-04 10:38:05 -08:00
avatars	resolve conflicts on merge with upstream/master	2015-02-04 10:38:05 -08:00
embedded-webserver
entities	merge upstream/master into andrew/bispinor	2015-02-03 18:33:10 -08:00
entities-renderer	resolve conflicts on merge with upstream/master	2015-02-02 17:10:13 -08:00
environment
fbx	resolve conflicts on merge with upstream/master	2015-02-04 10:38:05 -08:00
gpu	resolve conflicts on merge with upstream/master	2015-02-04 10:38:05 -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	resolve conflicts on merge with upstream/master	2015-02-04 10:38:05 -08:00
octree	resolve conflicts on merge with upstream/master	2015-02-04 10:38:05 -08:00
physics	bulletRotationStep --> computeBulletRotationStep	2015-01-27 17:37:12 -08:00
render-utils	FIx the lightmap not displaying when using the texcoord0	2015-02-03 16:10:31 -08:00
script-engine	A further custom User-Agent string	2015-01-30 15:56:01 -08:00
shared	resolve conflicts on merge with upstream/master	2015-02-04 10:38:05 -08:00