Brad Davis fa27550df4 Merge remote-tracking branch 'upstream/master' into render_cursor		2015-06-11 02:21:02 -07:00
..
animation
audio	Merge branch 'master' of https://github.com/highfidelity/hifi into restartable-non-local-sound	2015-06-08 15:45:30 -07:00
audio-client	add a sound once first AM packet received	2015-06-08 11:30:12 -07:00
avatars	Undo the merge with the broken master checking. What could go wrong?	2015-05-28 13:48:27 -07:00
embedded-webserver
entities	Hyperlink properties now propagate locally and over network	2015-06-10 13:12:18 -07:00
entities-renderer	renderBoundingBox() for sim-ownership debug	2015-06-10 14:24:00 -07:00
environment
fbx	Merge branch 'master' of https://github.com/highfidelity/hifi into fix-attachments	2015-06-10 08:53:33 -07:00
gpu	first take on the materialKey	2015-06-09 12:17:10 -07:00
model	Fixing the blackout when entering a zone with a skybox thatis not loaded yet or just a constant color skybox	2015-06-10 01:50:52 -07:00
networking	store an in-memory history of the last addresses	2015-06-09 18:59:58 -07:00
octree	Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into lod	2015-06-03 19:47:51 +02:00
physics	reset simulation bid counters on object activation	2015-06-10 12:40:14 -07:00
render	Fixing the blackout when entering a zone with a skybox thatis not loaded yet or just a constant color skybox	2015-06-10 01:50:52 -07:00
render-utils	Merge remote-tracking branch 'upstream/master' into render_cursor	2015-06-11 02:21:02 -07:00
script-engine	Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching	2015-06-08 13:50:50 -07:00
shared	woops, forgot to include this in last commit	2015-06-10 12:41:15 -07:00
ui	Add new address bar dialog error message	2015-06-01 09:01:11 -07:00