Stephen Birarda 264f39fa59 resolve conflicts on merge with upstream/master		2015-07-13 11:25:24 -07:00
..
animation	fix AnimationLoop::setRunning() to not constantly reset the frame when the running state doesn't actually change	2015-07-10 12:43:35 -07:00
audio	pass const NLPacket& for all sendUnreliablePacket calls	2015-07-09 11:42:18 -07:00
audio-client	Update AudioClient to use QSharedPointer<NLPacket>	2015-07-10 08:45:39 -07:00
auto-updater
avatars	Remove declaration processAvatarMixerDatagram from AvatarHashMap	2015-07-10 15:01:21 -07:00
embedded-webserver
entities	resolve conflicts on merge with upstream/master	2015-07-13 11:25:24 -07:00
entities-renderer	resolve conflicts on merge with upstream/master	2015-07-13 11:25:24 -07:00
environment
fbx
gpu	Merge pull request #5301 from samcake/yellow	2015-07-12 11:36:03 -07:00
model	Replacing setUniformTexture by setResourceTexture in order to differenciate the 2 types of binding points for the BUffers.	2015-07-10 11:03:12 -07:00
networking	update DomainServer to new packet receive API	2015-07-13 11:11:52 -07:00
octree	cleanup octree networking code to use new API	2015-07-13 09:40:26 -07:00
physics	resolve conflicts on merge with upstream/master	2015-07-13 11:25:24 -07:00
render	Adding intrsumentation for nsight and hiding the nsight specific code in cpp	2015-07-08 14:25:13 -07:00
render-utils	Merge pull request #5301 from samcake/yellow	2015-07-12 11:36:03 -07:00
script-engine	resolve conflicts on merge with upstream/master	2015-07-13 11:25:24 -07:00
shared	resolve conflicts on merge with upstream/master	2015-07-13 11:25:24 -07:00
ui