overte/libraries
Brad Hefta-Gaub ac49feda22 Merge branch 'master' of https://github.com/highfidelity/hifi into removeDisableEntityNACKS
Conflicts:
	libraries/entities/src/EntityEditPacketSender.h
2016-05-21 09:23:45 -07:00
..
animation remove some unnecessary dependencies 2016-05-14 14:50:02 -07:00
audio Remove delayLoad 2016-05-09 18:09:48 -07:00
audio-client PR comments 2016-03-31 13:19:26 -07:00
auto-updater
avatars Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3 2016-05-19 09:49:18 -07:00
controllers Doing a pass over the input plugins and controller code 2016-05-20 14:50:23 -07:00
display-plugins Moving GL backend out of GPU 2016-05-16 12:54:17 -07:00
embedded-webserver Pospone logging of the shutdown reason 2016-01-21 17:54:10 -08:00
entities Merge branch 'master' of https://github.com/highfidelity/hifi into removeDisableEntityNACKS 2016-05-21 09:23:45 -07:00
entities-renderer merge from upstream 2016-05-20 17:07:34 -07:00
fbx remove some unnecessary dependencies 2016-05-14 14:50:02 -07:00
gl Moving GL backend out of GPU 2016-05-16 12:54:17 -07:00
gpu PR feedback 2016-05-18 23:11:36 -07:00
gpu-gl Guard against zero-sized gl buffer copy 2016-05-20 09:27:50 -07:00
input-plugins Doing a pass over the input plugins and controller code 2016-05-20 14:50:23 -07:00
model Fixing the metallic simple material rendering black from obj 2016-05-13 16:33:14 -07:00
model-networking remove some unnecessary dependencies 2016-05-14 14:50:02 -07:00
networking merge from upstream 2016-05-20 17:07:34 -07:00
octree Fix JurisdictionMap not initializing correctly 2016-05-17 15:12:45 -07:00
physics merge from upstream 2016-05-20 17:07:34 -07:00
plugins Doing a pass over the input plugins and controller code 2016-05-20 14:50:23 -07:00
procedural Moving GL backend out of GPU 2016-05-16 12:54:17 -07:00
recording Remove delayLoad 2016-05-09 18:09:48 -07:00
render Merge branch 'master' of github.com:highfidelity/hifi into update-model-meta 2016-05-16 10:53:39 -07:00
render-utils Merge pull request #7922 from samcake/red 2016-05-20 09:33:55 -07:00
script-engine Merge branch 'master' of github.com:highfidelity/hifi into fix/debug-script-crash 2016-05-20 09:31:30 -07:00
shared clean up stream formatting of vec3 and friends 2016-05-20 09:41:26 -07:00
ui Merge pull request #7834 from huffman/feat/user-agent-plugins 2016-05-19 11:53:14 -07:00