Atlante45 0037a1f4a7 Win build fix		2015-09-11 14:21:55 +02:00
..
animation	Clean up of AnimNodeLoader after merge from master.	2015-09-10 11:47:41 -07:00
audio	resolve conflicts on merge with upstream/master	2015-09-04 12:31:46 -06:00
audio-client
auto-updater
avatars	Protect avatarLock.	2015-09-09 11:11:06 -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	Merge pull request #5741 from AndrewMeadows/brokenCapsules	2015-09-09 09:33:57 -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	Win build fix	2015-09-11 14:21:55 +02:00
octree	repair to packing of query data from headless viewer	2015-09-10 14:35:44 -07:00
physics	Snapshot of no-judder, before cleanup.	2015-09-07 09:57:05 -07:00
plugins
procedural	Eliminate excessive debug logging from procedural setup	2015-09-10 10:57:37 -07:00
render
render-utils	Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates	2015-09-09 10:37:11 -07:00
script-engine	fix CR feedback, add examples	2015-09-10 09:06:56 -07:00
shared	Remove optional "parent" argument.	2015-09-09 11:04:17 -07:00
ui