David Rowe 7749b912ea Merge branch 'master' into 20639		2015-08-03 09:55:35 -07:00
..
animation	Merge pull request #5323 from MarcelEdward/20605	2015-07-30 07:30:01 -07:00
audio	resolve conflicts on merge with upstream/master	2015-07-20 12:29:38 -07:00
audio-client	kill the PacketLister (AKA Huffman 1 : PacketListener 0)	2015-07-17 09:07:39 -07:00
auto-updater
avatars	Don't apply saccades to tracked eyes	2015-07-29 15:14:43 -07:00
embedded-webserver
entities	Merge pull request #5468 from bwent/reset-position	2015-07-31 11:03:27 -07:00
entities-renderer	Merge with master	2015-07-30 11:20:00 -07:00
environment	put back correct include for memcpy	2015-07-17 16:38:20 -07:00
fbx	implement on-the-fly conversion of FBXMeshParts that are quads, into their triangle equivalents	2015-08-01 13:07:56 -07:00
gpu	remove QUADS from GLBackendShared and Format	2015-08-01 17:26:38 -07:00
model	change GeometryCache::renderQuad() to use TRIANGLES as lower level render primitive	2015-08-01 11:29:28 -07:00
networking	correct the unique_ptr char allocations	2015-07-31 14:29:05 -07:00
octree	add back a removed comment from jurisdiction map	2015-07-17 14:00:02 -07:00
physics	fix crash for convex hull of co-planar points	2015-07-22 15:06:10 -07:00
render	REmove more of the unnecessary GLBacken .h and GPUCOnfig.h include, The gpu::Context is now completely agnostic of the True Backend	2015-07-30 15:07:36 -07:00
render-utils	diff redux	2015-08-01 16:53:35 -07:00
script-engine	fixed merge conflicts and refactored hit effect to catch up with refactored rendering engine	2015-07-29 10:02:06 -07:00
shared	Preparing for first pr	2015-07-22 10:43:50 -07:00
ui	Merge remote-tracking branch 'upstream/master' into marge	2015-07-21 08:59:29 -07:00