overte-JulianGro/libraries
Brad Davis 8782fe1d93 Merge branch 'master' into smarter_textures
Conflicts:
	libraries/model-networking/src/model-networking/TextureCache.cpp
2017-03-06 15:29:41 -08:00
..
animation redo unsafe optimization 2017-03-04 15:55:53 -08:00
audio Fix recorder.js playback in interface 2017-02-21 19:47:26 +01:00
audio-client Merge pull request #9714 from thoys/fix-recorder-js-playback 2017-02-23 09:59:37 -08:00
auto-updater
avatars Potential non-spammy solution using pseudo-state 2017-03-06 10:03:41 -08:00
controllers only consider standard poses written if the pose was valid 2016-12-12 09:23:01 -08:00
display-plugins Adding new storage backing for gpu::Texture, moving mip format into Storage abstraction 2017-02-19 18:11:56 -08:00
embedded-webserver
entities Merge branch 'master' of github.com:highfidelity/hifi into voxel-paint-opti 2017-02-27 20:56:16 -08:00
entities-renderer Merge remote-tracking branch 'upstream/master' into HEAD 2017-03-03 08:59:24 -08:00
fbx Resolve merging conflict 2017-02-09 09:49:59 -08:00
gl First cut of pal on tablet. 2017-02-08 17:34:03 -08:00
gpu Fix warnings 2017-03-03 14:16:27 -08:00
gpu-gl Fix warnings 2017-03-03 14:16:27 -08:00
input-plugins Added MouseX and MouseY axes to Keyboard device. 2017-02-07 12:02:41 -08:00
ktx Fix warnings 2017-03-03 14:16:27 -08:00
model Fix warnings 2017-03-03 14:16:27 -08:00
model-networking Merge branch 'master' into smarter_textures 2017-03-06 15:29:41 -08:00
networking Merge pull request #9683 from jherico/cache_flush 2017-03-06 11:05:44 -08:00
octree fix for non-void set of should force scene 2017-02-16 16:46:09 -08:00
physics Merge pull request #9609 from sethalves/tablet-ui-fix-equipping 2017-02-06 16:56:11 -08:00
plugins move codec negotiation to client data 2017-02-14 20:46:27 +00:00
procedural cleanup naked qDebug() calls 2016-12-19 22:24:25 -08:00
recording rm debug in Deck.cpp 2017-02-14 20:46:27 +00:00
render Merge branch 'master' into smarter_textures 2017-03-06 15:29:41 -08:00
render-utils Merge branch 'master' into smarter_textures 2017-03-06 15:29:41 -08:00
script-engine Merge branch 'master' into feature/fingers-on-tablet 2017-03-03 09:04:43 -08:00
shared Merge branch 'master' into smarter_textures 2017-03-06 15:29:41 -08:00
ui EventBridge support 2017-02-15 13:59:04 -08:00
ui-plugins