samcake f9562bedd9 Merge branch 'master' of https://github.com/highfidelity/hifi into yellow		2015-07-02 18:14:45 -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	try again without macro	2015-04-07 09:59:04 -07:00
entities	Merge pull request #5205 from SeijiEmery/unit-tests	2015-07-02 20:58:09 -04:00
entities-renderer	something working ?	2015-07-02 18:12:03 -07:00
environment	wire up atmosphere.hasStars property	2015-05-04 14:19:13 -07:00
fbx	fix syntax	2015-06-19 17:13:29 +02:00
gpu	Merge branch 'master' of https://github.com/highfidelity/hifi into yellow	2015-07-02 15:06:32 -07:00
model	merge from upstream	2015-06-18 15:03:09 -07:00
networking	Merge pull request #5232 from sethalves/actions-over-wire-and-sim-ownership	2015-07-02 14:57:27 -07:00
octree	Merge pull request #5232 from sethalves/actions-over-wire-and-sim-ownership	2015-07-02 14:57:27 -07:00
physics	responses to code review	2015-07-01 10:42:04 -07:00
render	maybe i have solved the passing of the status	2015-07-02 17:31:29 -07:00
render-utils	Merge branch 'master' of https://github.com/highfidelity/hifi into yellow	2015-07-02 15:06:32 -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	Merge pull request #5232 from sethalves/actions-over-wire-and-sim-ownership	2015-07-02 14:57:27 -07:00
ui	Merge pull request #5219 from venkatn93/master	2015-06-29 10:51:16 -07:00