overte/libraries
motofckr9k 3d05cdd61e Merge remote-tracking branch 'refs/remotes/kasen/master'
Conflicts:
	BUILD_WIN.md
	CODING_STANDARD.md
	LICENSE
	cmake/installer/installer-header.bmp
	cmake/installer/installer.ico
	cmake/installer/uninstaller-header.bmp
	interface/resources/images/about-vircadia.png
	interface/resources/images/vircadia-logo.svg
	interface/resources/qml/LoginDialog.qml
	interface/resources/qml/dialogs/TabletLoginDialog.qml
	interface/resources/qml/hifi/dialogs/TabletAboutDialog.qml
	interface/src/Application.cpp
	pkg-scripts/athena-server.spec
	scripts/system/more/app-more.js
	scripts/system/more/css/styles.css
	scripts/system/more/more.html
2020-06-10 02:49:13 +02:00
..
animation Revert commit 359248829c using -m 1 to temporarily fix issue 383. 2020-06-03 16:08:18 -04:00
audio Update classes' JSDoc per @hideconstructor 2019-12-23 14:13:48 +13:00
audio-client Merge remote-tracking branch 'hifi/master' into merge-hifi-master 2020-04-09 16:46:27 +12:00
auto-updater
avatars Merge pull request #62 from HifiExperiments/blendshapes 2020-05-31 18:34:42 -04:00
avatars-renderer Revert commit 359248829c using -m 1 to temporarily fix issue 383. 2020-06-03 16:08:18 -04:00
baking Revert commit 359248829c using -m 1 to temporarily fix issue 383. 2020-06-03 16:08:18 -04:00
controllers Merge branch 'DOC-55-C' into api-docs 2020-01-14 18:04:32 +13:00
display-plugins merge with master and try to fix opacity mode stuff 2019-10-23 22:21:45 -07:00
embedded-webserver
entities Merge branch 'master' into feature/further-rebranding 2020-06-06 18:43:03 -04:00
entities-renderer Merge pull request #409 from kasenvr/fix/entity-null-check 2020-06-05 13:09:41 -04:00
fbx Merge branch 'master' into fix/revert-instancing-temporarily-1 2020-06-03 22:44:32 -04:00
gl
gpu fix VS2019 (Version 16.5.1) builds 2020-04-07 16:57:05 +02:00
gpu-gl
gpu-gl-common Remove getRaw() from DepthTest 2020-01-14 23:00:08 +01:00
gpu-gles
graphics Merge pull request #301 from HifiExperiments/modelBackface 2020-05-13 16:06:26 -04:00
graphics-scripting Fix up Vircadia URLs 2020-04-27 20:38:23 +12:00
hfm Revert commit 359248829c using -m 1 to temporarily fix issue 383. 2020-06-03 16:08:18 -04:00
image Lots of renamings, more to come. 2020-04-07 04:56:02 -04:00
input-plugins Update Controller.Hardware.Keyboard JSDoc per new touchpad gestures 2019-12-18 12:20:05 +13:00
ktx Include <stdexcept> so building on Windows10 with Visual Studio 2019 works. 2020-06-04 09:35:45 -07:00
material-networking Merge remote-tracking branch 'hifi/master' into merge-hifi-master 2020-04-09 16:46:27 +12:00
midi Lots of renamings, more to come. 2020-04-07 04:56:02 -04:00
model-baker Revert commit 359248829c using -m 1 to temporarily fix issue 383. 2020-06-03 16:08:18 -04:00
model-networking Revert commit 359248829c using -m 1 to temporarily fix issue 383. 2020-06-03 16:08:18 -04:00
networking Merge remote-tracking branch 'refs/remotes/kasen/master' 2020-06-10 02:49:13 +02:00
octree Merge remote-tracking branch 'upstream/kasen/core' into zoneOcclusion 2020-04-03 14:37:14 -07:00
oculusMobile
oculusMobilePlugin
physics Revert commit 359248829c using -m 1 to temporarily fix issue 383. 2020-06-03 16:08:18 -04:00
platform
plugins Lots of renamings, more to come. 2020-04-07 04:56:02 -04:00
pointers Fix misc. JSDoc typo 2019-12-06 21:27:50 +13:00
procedural Revert commit 359248829c using -m 1 to temporarily fix issue 383. 2020-06-03 16:08:18 -04:00
qml change Metaverse API from setting 2019-12-20 11:39:05 +01:00
recording
render Merge branch 'master' into blendshapes 2020-05-07 13:38:59 -07:00
render-utils Revert commit 359248829c using -m 1 to temporarily fix issue 383. 2020-06-03 16:08:18 -04:00
script-engine Merge branch 'master' into fix/other-renamings 2020-05-18 15:10:32 -04:00
shaders
shared Merge pull request #418 from Misterblue/fix/includes-for-VS-build 2020-06-04 17:30:15 -04:00
task
test-utils
ui Merge branch 'master' into fix/other-renamings 2020-05-18 15:10:32 -04:00
ui-plugins
workload add workload job to help debug entity proxies 2019-11-12 10:35:16 -08:00