Ryan Huffman 0f2b9744d1 Merge branch 'console' of github.com:birarda/hifi into console-logging		2016-01-15 10:46:22 -08:00
..
animation	Merge pull request #6702 from hyperlogic/tony/soft-attachments	2016-01-03 08:46:16 -10:00
audio	remove some extra debug that isn't needed	2015-12-21 16:23:23 -07:00
audio-client
auto-updater
avatars	overhaul of MotionState cleanup	2016-01-07 10:19:46 -08:00
controllers	Allow input devices to break up their mappings into multiple files	2015-12-30 22:28:10 -08:00
display-plugins
embedded-webserver	Add status HTTP server to AC Monitor	2016-01-08 10:35:04 -08:00
entities	fixing asserts for EntityItem delete pipeline	2016-01-07 10:19:46 -08:00
entities-renderer	fix crash mode for empty LineEntityItem	2016-01-07 10:19:46 -08:00
environment
fbx
gl	Stop QML hanging the app on shutdown	2016-01-07 12:25:25 -08:00
gpu	Adding Gamma correction to all the Color coming for the attribute stream if used as color	2015-12-18 12:50:21 -08:00
input-plugins
model	Optimize getVertexStream() by using a const&	2015-12-31 11:51:05 -08:00
model-networking
networking	Merge branch 'console' of github.com:birarda/hifi into console-logging	2016-01-15 10:46:22 -08:00
octree	fix warning	2016-01-06 12:53:57 -08:00
physics	Merge pull request #6756 from AndrewMeadows/physics-cleanup-003	2016-01-07 11:04:28 -08:00
plugins	Fix SDL breakage due to missing init	2015-12-31 08:47:27 -08:00
procedural	Render SKY_DOME when SKY_MAP tex is loading	2015-12-29 10:58:23 -08:00
recording
render	Reorder RenderContext initializer to avoid -Wreorder	2015-12-22 14:54:47 -08:00
render-utils	Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting	2016-01-04 19:35:36 -08:00
script-engine	Merge pull request #6759 from huffman/script-engine-slot-exception	2016-01-07 08:54:34 -08:00
shared	Merge branch 'console' of github.com:birarda/hifi into console-logging	2016-01-15 10:46:22 -08:00
ui	Merge pull request #6780 from jherico/z_order	2016-01-06 20:08:52 -08:00