Brad Davis a049b14d13 Merge remote-tracking branch 'upstream/master' into plugins		2015-07-28 10:04:19 -07: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 proprocessor usage	2015-07-27 10:30:08 -04:00
embedded-webserver
entities	Fixed float constant.	2015-07-27 09:28:56 -07:00
entities-renderer	Converted magic numbers to constants.	2015-07-27 09:27:16 -07:00
environment	put back correct include for memcpy	2015-07-17 16:38:20 -07:00
fbx	if obj data isn't from a url, don't dereference null url pointer	2015-07-27 19:06:14 -07:00
gpu	Coding standard and building	2015-07-27 11:55:17 -07:00
input-plugins	Make OpenVR windows only for now	2015-07-27 09:45:15 -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	only output no listener for type message one time	2015-07-24 09:36:27 -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	Attempting to fix offscreen UI event handling	2015-07-25 19:26:38 -04:00
render	Merge branch 'master' of https://github.com/highfidelity/hifi into avatar	2015-07-22 10:27:39 -07:00
render-utils	Merge remote-tracking branch 'upstream/master' into plugins	2015-07-28 10:04:19 -07: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