overte/libraries
Nissim Hadar 34aab4a9c8 Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork
# Conflicts:
#	libraries/entities-renderer/src/RenderableZoneEntityItem.cpp
2018-02-12 17:50:39 -08:00
..
animation Merge pull request #12328 from Atlante45/fix/misc-bugs 2018-02-12 14:31:38 -08:00
audio refuse to handle positional audio streams with NaN position 2018-02-02 11:21:50 -08:00
audio-client Fix bug when calling switchOutputToAudioDevice() with the active device. 2018-01-11 18:22:34 -08:00
auto-updater
avatars allow overlay children to follow avatar from one domain to another 2018-02-08 17:17:04 -08:00
avatars-renderer Merge pull request #12205 from jherico/no_widgets 2018-02-05 15:32:54 -08:00
baking rename libraries/model(src/model) -> libraries/graphics(src/graphics) 2018-01-16 12:44:44 -05:00
controllers Code review feedback 2018-01-04 14:21:53 -08:00
display-plugins Merge remote-tracking branch 'upstream/master' into fix/shader_length 2018-02-06 15:55:01 -08:00
embedded-webserver
entities Global graphics flag default to on. 2018-02-08 15:52:20 -08:00
entities-renderer Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork 2018-02-12 17:50:39 -08:00
fbx fix uint warnings 2018-02-08 16:56:13 -08:00
gl Migrating QML rendering off the main thread 2018-02-06 11:53:09 -08:00
gpu Merge pull request #12323 from Zvork/shadow 2018-02-12 14:41:13 -08:00
gpu-gl Migrating QML rendering off the main thread 2018-02-06 11:53:09 -08:00
gpu-gles Fixing merge errors 2018-02-09 10:30:57 -08:00
graphics Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork 2018-02-12 17:50:39 -08:00
image Infinite loop guard 2018-01-19 11:42:13 -08:00
input-plugins
ktx
midi Fix Bitwise operators. 2018-01-19 16:59:47 -08:00
model-networking Don't process empty images 2018-01-19 11:42:31 -08:00
networking Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork 2018-02-12 17:50:39 -08:00
octree Orthographic octree selection seems to be working 2018-02-02 09:40:57 +01:00
physics quickfix for velocity spike for Tractor action 2018-02-06 12:06:27 -08:00
plugins Merge pull request #12328 from Atlante45/fix/misc-bugs 2018-02-12 14:31:38 -08:00
pointers Revert "Display both lasers on tablet and Web surfaces" 2018-01-24 14:51:42 -08:00
procedural Merged with master 2018-01-17 15:49:46 +01:00
qml Migrating QML rendering off the main thread 2018-02-06 11:53:09 -08:00
recording Misc bug fixes 2018-02-02 13:10:49 -08:00
render Merge pull request #12323 from Zvork/shadow 2018-02-12 14:41:13 -08:00
render-utils Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork 2018-02-12 17:50:39 -08:00
script-engine Merge pull request #12205 from jherico/no_widgets 2018-02-05 15:32:54 -08:00
shared Merge pull request #11537 from jherico/threaded_qml 2018-02-12 15:32:33 -08:00
trackers Remove some unneeded Qt dependencies 2018-01-28 22:18:24 -08:00
ui Merge pull request #11537 from jherico/threaded_qml 2018-02-12 15:32:33 -08:00
ui-plugins Remove some unneeded Qt dependencies 2018-01-28 22:18:24 -08:00