| .. |
|
animation
|
Revert "Merge from upstream/master"
|
2017-03-28 17:39:45 -07:00 |
|
audio
|
Fix the crash in Debug builds, caused by undeclared metatype for AudioInjector*
|
2017-03-30 08:52:04 -07:00 |
|
audio-client
|
Revert "Actually merge from master"
|
2017-03-24 17:56:48 -07:00 |
|
auto-updater
|
Switch to JSON for application settings
|
2016-10-12 10:20:19 -07:00 |
|
avatars
|
Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2
|
2017-03-27 09:10:12 -07:00 |
|
controllers
|
only consider standard poses written if the pose was valid
|
2016-12-12 09:23:01 -08:00 |
|
display-plugins
|
Revert "Actually merge from master"
|
2017-03-24 17:56:48 -07:00 |
|
embedded-webserver
|
|
|
|
entities
|
Merge pull request #10034 from davidkelly/dk/avatarEntityIssue
|
2017-03-30 10:12:19 -07:00 |
|
entities-renderer
|
Revert "Merge from upstream/master"
|
2017-03-28 17:39:45 -07:00 |
|
fbx
|
Revert "Merge from upstream/master"
|
2017-03-28 17:39:45 -07:00 |
|
gl
|
Revert "Merge from upstream/master"
|
2017-03-28 17:39:45 -07:00 |
|
gpu
|
Revert "Merge from upstream/master"
|
2017-03-28 17:39:45 -07:00 |
|
gpu-gl
|
Revert "Merge from upstream/master"
|
2017-03-28 17:39:45 -07:00 |
|
input-plugins
|
Revert "Merge from upstream/master"
|
2017-03-28 17:39:45 -07:00 |
|
ktx
|
Revert "Revert "Don't hold KTX files open for longer than transfers require""
|
2017-03-28 14:45:04 -07:00 |
|
model
|
Revert "Merge from upstream/master"
|
2017-03-28 17:39:45 -07:00 |
|
model-networking
|
Revert "Merge from upstream/master"
|
2017-03-28 17:39:45 -07:00 |
|
networking
|
Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2
|
2017-03-27 09:10:12 -07:00 |
|
octree
|
Revert "Actually merge from master"
|
2017-03-24 17:56:48 -07:00 |
|
physics
|
Revert "Actually merge from master"
|
2017-03-24 17:56:48 -07:00 |
|
plugins
|
Expose ASW activation status, provide normalized present rate information
|
2017-03-03 10:46:05 -08:00 |
|
procedural
|
cleanup naked qDebug() calls
|
2016-12-19 22:24:25 -08:00 |
|
recording
|
Revert "Actually merge from master"
|
2017-03-24 17:56:48 -07:00 |
|
render
|
Revert "Actually merge from master"
|
2017-03-24 17:56:48 -07:00 |
|
render-utils
|
Revert "Merge from upstream/master"
|
2017-03-28 17:39:45 -07:00 |
|
script-engine
|
Fix tablet-close behavior for PAL; remove users-tablet.js
|
2017-03-29 14:53:45 -07:00 |
|
shared
|
Revert "Merge from upstream/master"
|
2017-03-28 17:39:45 -07:00 |
|
ui
|
Revert "Merge from upstream/master"
|
2017-03-28 17:39:45 -07:00 |
|
ui-plugins
|
|
|
