Stephen Birarda 57c3f0fd20 fix unmatched diagnostic pop		2015-07-13 15:40: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	update parseData for new network API	2015-07-13 14:26:10 -07:00
audio-client	fix unmatched diagnostic pop	2015-07-13 15:40:20 -07:00
auto-updater	Don't display update dialog if this is a PR build	2015-07-02 14:17:36 -06:00
avatars	Merge branch 'receive_packets' of https://github.com/huffman/hifi into atp	2015-07-13 14:26:23 -07:00
embedded-webserver
entities	repairs to octree packet receiving in interface	2015-07-13 13:10:57 -07:00
entities-renderer	repairs to octree packet receiving in interface	2015-07-13 13:10:57 -07:00
environment
fbx	fix syntax	2015-06-19 17:13:29 +02:00
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	final fixes to get ACs building again	2015-07-13 15:38:45 -07:00
octree	final fixes to get ACs building again	2015-07-13 15:38:45 -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	repairs to octree packet receiving in interface	2015-07-13 13:10:57 -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	Merge pull request #5219 from venkatn93/master	2015-06-29 10:51:16 -07:00