Seth Alves af2c00b235 still recovering from troubled merge		2015-03-13 18:21:59 -07:00
..
animation
audio	fix stereo to stereo resampling	2015-03-10 15:50:30 -07:00
audio-client	fix stereo to stereo resampling	2015-03-10 15:50:30 -07:00
avatars	propagate skeleton's bounding box into AvatarData	2015-03-13 09:39:47 -07:00
embedded-webserver
entities	don't copy hull points	2015-03-13 18:05:02 -07:00
entities-renderer	namechanges: setFooInMeters() --> setFoo()	2015-03-09 09:56:15 -07:00
environment
fbx	fix obj reader	2015-03-13 17:31:52 -07:00
gpu	Merge branch 'master' of github.com:highfidelity/hifi into avatars-can-collide	2015-03-11 07:17:19 -07:00
model	fix some lingering warnings	2015-03-12 12:36:39 -07:00
networking	merge from upstream	2015-03-13 18:04:55 -07:00
octree	CR feedback	2015-03-10 15:27:44 -07:00
physics	still recovering from troubled merge	2015-03-13 18:21:59 -07:00
render-utils	move PhysicsEntity so that ModelEntityItem can initiate a model download	2015-03-11 18:34:27 -07:00
script-engine
shared	collision with a hull sort of works. there is a new memory corruption problem	2015-03-13 15:41:57 -07:00