Stephen Birarda 821c16cbc4 resolve conflicts on merge with uptream/master		2015-07-14 09:52:20 -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	pass const NLPacket& for all sendUnreliablePacket calls	2015-07-09 11:42:18 -07:00
auto-updater
avatars	missed API fixes in AudioClient and AvatarData	2015-07-08 16:53:04 -07:00
embedded-webserver
entities	resolve conflicts on merge with uptream/master	2015-07-14 09:52:20 -07:00
entities-renderer	resolve conflicts on merge with uptream/master	2015-07-14 09:52:20 -07:00
environment
fbx
gpu	FIxing th ecompilation issue on mac, ready to ship	2015-07-13 19:17:09 -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	Copy _type in assignment operators	2015-07-09 14:20:04 -07:00
octree	Some .get() cleanup	2015-07-09 14:03:32 -07:00
physics	resolve conflicts on merge with uptream/master	2015-07-14 09:52:20 -07:00
render	quiet compiler	2015-07-12 10:29:43 -07:00
render-utils	Merge branch 'master' of https://github.com/highfidelity/hifi into punk	2015-07-13 16:19:09 -07:00
script-engine	resolve conflicts on merge with uptream/master	2015-07-14 09:52:20 -07:00
shared	resolve conflicts on merge with uptream/master	2015-07-14 09:52:20 -07:00
ui