Anthony J. Thibault 756eb54a0a AnimNodeLoader support for InverseKinematics node.		2015-09-09 15:28:21 -07:00
..
animation	AnimNodeLoader support for InverseKinematics node.	2015-09-09 15:28:21 -07:00
audio	resolve conflicts on merge with upstream/master	2015-09-04 12:31:46 -06:00
audio-client
auto-updater
avatars	Merge branch 'master' of https://github.com/highfidelity/hifi into protocol	2015-09-08 08:40:51 -07:00
display-plugins	Merge branch 'master' of github.com:highfidelity/hifi into polyvox-again	2015-09-04 09:12:32 -07:00
embedded-webserver
entities	resolve conflicts on merge with upstream/master	2015-09-08 14:56:23 -07:00
entities-renderer	resolve conflicts on merge with upstream/master	2015-09-08 15:18:39 -07:00
environment
fbx	fix OBJReader loading with URL	2015-09-08 14:51:51 -07:00
gpu	Procedural skybox work	2015-09-08 14:31:16 -07:00
gpu-networking	put back TextureCache headers	2015-09-08 15:23:26 -07:00
input-plugins	Toggle mute while holding the hydras	2015-09-04 16:19:58 -07:00
model	Procedural skybox work	2015-09-08 14:31:16 -07:00
networking	fix Qt includes	2015-09-08 18:19:33 -07:00
octree	resolve conflicts on merge with upstream/master	2015-08-27 14:50:04 -07:00
physics	fix hold action with zero offsetLength	2015-09-04 14:07:12 -07:00
plugins
procedural	resolve conflicts on merge with upstream/master	2015-09-08 15:18:39 -07:00
render	Add AA state to RenderContext and Menu	2015-08-30 20:38:05 -07:00
render-utils	Merge pull request #5724 from hyperlogic/tony/anim-debug-draw-improvements	2015-09-08 17:07:51 -07:00
script-engine	resolve conflicts on merge with upstream/master	2015-09-08 15:18:39 -07:00
shared	resolve conflicts on merge with upstream/master	2015-09-04 12:31:46 -06:00
ui