overte-thingvellir/libraries
Brad Davis f73cd1d65e Merge branch 'RC-21' back into master
Conflicts:
	libraries/gpu-gl/src/gpu/gl45/GL45BackendTexture.cpp
2016-09-28 09:58:13 -07:00
..
animation GLM update and GLI integration 2016-09-09 10:18:15 -07:00
audio Merge pull request #8652 from zzmp/fix/audio-injector 2016-09-23 16:07:16 -07:00
audio-client rm unused DEFAULT_GATE_THRESHOLD 2016-09-21 18:04:07 -07:00
auto-updater enabled qnetworkrequest redirects everywhere I could find them 2016-09-06 17:35:06 -07:00
avatars enabled qnetworkrequest redirects everywhere I could find them 2016-09-06 17:35:06 -07:00
controllers catagorize some qDebugs 2016-09-14 21:39:45 -07:00
display-plugins fix unix build 2016-09-20 15:54:57 -07:00
embedded-webserver add -Wsuggest-override to compile flags and deal with fallout 2016-08-18 09:51:41 -07:00
entities fix an AC script's ability to delete entities 2016-09-26 17:14:45 -07:00
entities-renderer re-enable web entity-items on linux 2016-09-22 10:25:26 -07:00
fbx catagorize some qDebugs 2016-09-14 21:39:45 -07:00
gl reload qml with scripts 2016-09-23 14:27:47 -07:00
gpu Code review comments 2016-09-23 12:05:11 -07:00
gpu-gl Merge branch 'RC-21' back into master 2016-09-28 09:58:13 -07:00
input-plugins
model Restore proper mip handling to skybox 2016-09-23 12:05:04 -07:00
model-networking Identify pre-generated textures 2016-09-23 12:04:56 -07:00
networking Migrate logging functionality to shared library 2016-09-23 12:04:58 -07:00
octree merge from upstream 2016-08-20 15:25:04 -07:00
physics catagorize some qDebugs 2016-09-14 21:39:45 -07:00
plugins catagorize some qDebugs 2016-09-14 21:39:45 -07:00
procedural catagorize some qDebugs 2016-09-14 21:39:45 -07:00
recording use the correct Qt windows macro 2016-09-01 11:33:20 -07:00
render Disable support for framebuffer resizing 2016-09-23 12:04:57 -07:00
render-utils Disable support for framebuffer resizing 2016-09-23 12:04:57 -07:00
script-engine Merge pull request #8650 from zzmp/fix/reload-qml-with-js 2016-09-26 11:00:13 -07:00
shared Merge branch 'master' of github.com:highfidelity/hifi into clean/audio-config 2016-09-23 13:11:52 -07:00
steamworks-wrapper try, try again 2016-08-18 11:45:03 -07:00
ui Working on Qt 5.6 compatibility 2016-09-06 17:35:04 -07:00
ui-plugins Working on reprojection 2016-08-12 22:28:22 -07:00