overte-HifiExperiments/libraries
David Rowe 1aa28b7f54 Merge remote-tracking branch 'upstream/master' into 21856-d
# Conflicts:
#	interface/src/LODManager.h
2018-05-02 07:50:55 +12:00
..
animation Merge remote-tracking branch 'upstream/master' into 21856-d 2018-05-02 07:50:55 +12:00
audio Merge remote-tracking branch 'upstream/master' into 21856-d 2018-05-02 07:50:55 +12:00
audio-client List which contexts each namespace and object is available in 2018-04-28 20:00:28 +12:00
auto-updater Improve installer campaign+type for updates and user activity data 2018-04-26 08:32:18 -07:00
avatars Docs to JSDoc review 2018-04-26 21:10:28 +12:00
avatars-renderer Doc review 2018-04-25 15:09:47 +12:00
baking Merge pull request #12369 from simon-walton/BugFix 2018-03-22 12:03:47 -07:00
controllers Merge remote-tracking branch 'upstream/master' into 21856-d 2018-05-02 07:50:55 +12:00
display-plugins List which contexts each namespace and object is available in 2018-04-28 20:00:28 +12:00
embedded-webserver Update direct _requestHeaders access to be consistent with other reads 2018-03-16 15:28:27 -07:00
entities Merge remote-tracking branch 'upstream/master' into 21856-d 2018-05-02 07:50:55 +12:00
entities-renderer Revert "HOTFIX version of PR 12969: Attempt to shutdown web surfaces more consistently" 2018-04-25 09:43:20 -07:00
fbx remove some uncatagorized logging, suppress some categories by default 2018-04-20 16:08:57 -07:00
gl Working on splash rendering 2018-04-17 14:17:41 -07:00
gpu Set jitter to O on RenderableWebEntityItems 2018-04-20 12:02:17 +02:00
gpu-gl reorganizing shader defines to fix compilation errors 2018-04-17 15:11:56 -07:00
gpu-gl-common Merge branch 'master' of https://github.com/highfidelity/hifi into taa-zvork 2018-04-24 11:37:00 -07:00
gpu-gles reorganizing shader defines to fix compilation errors 2018-04-17 15:11:56 -07:00
graphics Merge pull request #12921 from SamGondelman/precisionq 2018-04-23 10:17:35 -07:00
graphics-scripting List which contexts each namespace and object is available in 2018-04-28 20:00:28 +12:00
image add etc2/eac support 2018-04-05 18:59:22 -07:00
input-plugins Doc review 2018-04-21 12:45:00 +12:00
ktx add etc2/eac support 2018-04-05 18:59:22 -07:00
midi
model-networking List which contexts each namespace and object is available in 2018-04-28 20:00:28 +12:00
networking Merge remote-tracking branch 'upstream/master' into 21856-d 2018-05-02 07:50:55 +12:00
octree fix for both functions 2018-04-25 14:39:04 -07:00
physics fix physics related crash-on-exit 2018-05-01 09:15:44 -07:00
plugins Merge branch 'master' of github.com:highfidelity/hifi into add-more-hmd-data 2018-04-16 10:10:55 -07:00
pointers atlernate fix for selected entities 2018-03-30 13:44:54 -07:00
procedural cleanup and fix forward procedural rendering 2018-04-11 13:03:57 -07:00
qml Revert "HOTFIX version of PR 12969: Attempt to shutdown web surfaces more consistently" 2018-04-25 09:43:20 -07:00
recording
render Merged with master 2018-04-20 08:13:25 +02:00
render-utils Merge pull request #12986 from hyperlogic/bug-fix/debug-rendering-over-background 2018-04-27 15:56:44 -07:00
script-engine Merge remote-tracking branch 'upstream/master' into 21856-d 2018-05-02 07:50:55 +12:00
shared Merge remote-tracking branch 'upstream/master' into 21856-d 2018-05-02 07:50:55 +12:00
task Tweaks for clang error and gcc warning 2018-04-12 10:44:41 -07:00
trackers Docs to JSDoc review 2018-04-26 21:10:28 +12:00
ui List which contexts each namespace and object is available in 2018-04-28 20:00:28 +12:00
ui-plugins Working on splash rendering 2018-04-17 14:17:41 -07:00
workload