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
..
avatar	Put away animation into resource and update script to use local resource path.	2019-11-21 14:50:05 -08:00
config	Shadows are completely working with settings on both pipeline	2018-12-17 17:34:47 -08:00
controllers	Resurrect gamepad Y teleport button	2019-12-08 12:38:48 +13:00
fonts	Simplified UI v1	2019-05-10 10:49:25 -07:00
html	Merge branch 'master' into feature/further-rebranding	2020-06-06 18:43:03 -04:00
icons	moved files	2019-06-17 16:45:54 -07:00
images	Merge remote-tracking branch 'refs/remotes/kasen/master'	2020-06-10 02:49:13 +02:00
mention-sounds
meshes	Fixes to banner; swap out avatar on client; reviewer comments; other WIP	2019-04-26 18:45:48 -07:00
qml	Merge remote-tracking branch 'refs/remotes/kasen/master'	2020-06-10 02:49:13 +02:00
QtWebEngine/UIDelegates	update imports for utilities / all other qml files found	2018-11-06 14:21:14 +05:30
serverless	DEV-2463: Put FTUE users in an empty serverless domain instead of the tutorial	2019-10-23 14:32:03 -07:00
shaders	replicate default skybox	2018-11-19 19:14:07 -05:00
snapshot/img
sounds	Merge branch 'master' into loginInitiative2	2018-12-12 18:00:07 -08:00
styles
visage