Andrew Meadows a0a1b01ea9 coalesce dupe action data members: _id and _type		2015-07-07 17:50:08 -07:00
..
animation
audio	Allow scripted audio injectors to have options set.	2015-06-23 21:01:34 -07:00
audio-client	Merge pull request #5161 from PhilipRosedale/master	2015-06-22 12:09:08 -07:00
auto-updater	Don't display update dialog if this is a PR build	2015-07-02 14:17:36 -06:00
avatars	Make renderDisplayName const	2015-06-18 15:22:49 +02:00
embedded-webserver
entities	coalesce dupe action data members: _id and _type	2015-07-07 17:50:08 -07:00
entities-renderer	Restore old offset behaviors	2015-07-06 18:21:17 -07:00
environment
fbx	fix syntax	2015-06-19 17:13:29 +02:00
gpu	Merge branch 'master' of https://github.com/highfidelity/hifi into fix_billboard	2015-07-06 18:05:43 -07:00
model	merge from upstream	2015-06-18 15:03:09 -07:00
networking	add stats for PPS for inbound from network into OctreePacketProcessor and processing out of OctreePacketProcessor	2015-07-06 16:03:42 -07:00
octree	CR feedback	2015-07-04 19:13:35 -07:00
physics	coalesce dupe action data members: _id and _type	2015-07-07 17:50:08 -07:00
render	Merge branch 'master' of https://github.com/highfidelity/hifi into yellow	2015-07-06 15:04:02 -07:00
render-utils	Merge branch 'master' of https://github.com/highfidelity/hifi into fix_billboard	2015-07-06 18:05:43 -07:00
script-engine	Exposing the display Item Status to js to turn it on/off	2015-07-01 17:27:41 -07:00
shared	make some arguments const, cleanup some #includes	2015-07-07 17:50:08 -07:00
ui	Merge pull request #5219 from venkatn93/master	2015-06-29 10:51:16 -07:00