Bradley Austin Davis a60e669d3d Merge branch 'master' into plugins		2015-07-24 13:38:18 -04:00
..
animation	CR	2015-07-14 15:16:00 -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	Don't display update dialog if this is a PR build	2015-07-02 14:17:36 -06:00
avatars	Merge branch 'master' into plugins	2015-07-24 13:38:18 -04:00
display-plugins	Fixing the avatar / HMD pose compisition for Oculus	2015-07-23 17:48:06 -04:00
embedded-webserver
entities	Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers	2015-07-20 14:50:44 -07:00
entities-renderer	Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers	2015-07-20 14:50:44 -07:00
environment	put back correct include for memcpy	2015-07-17 16:38:20 -07:00
fbx	Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers	2015-07-17 17:59:19 -07:00
gpu	Merge branch 'master' into plugins	2015-07-24 13:38:18 -04:00
input-plugins	Build error on OSX	2015-07-23 15:41:59 -04:00
model	REmove the crappy solution for drawing transparent texture into overlay by a proper shader	2015-07-23 23:09:40 -07:00
networking	Merge pull request #5371 from Atlante45/smart_pointers	2015-07-21 08:52:29 -07:00
octree	add back a removed comment from jurisdiction map	2015-07-17 14:00:02 -07:00
physics	Merge branch 'master' into plugins	2015-07-23 13:42:03 -04:00
plugins	set up sixense/vive menu items with correct event forwarding	2015-07-22 11:36:31 -07:00
render	Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers	2015-07-20 13:51:51 -07:00
render-utils	Merge branch 'master' into plugins	2015-07-24 13:38:18 -04:00
script-engine	Avoid creating a new variable in js print	2015-07-23 15:32:40 -07:00
shared	Merge branch 'master' into plugins	2015-07-23 13:42:03 -04:00
ui	Merge remote-tracking branch 'upstream/master' into marge	2015-07-21 08:59:29 -07:00