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
..
+android_interface	force LOD to be 20-20 on android, and force lodAngleDeg to 0.248	2019-10-09 14:04:44 -07:00
+android_questInterface
communityModules	Made Gridchat muted by default	2020-04-10 21:39:11 +01:00
communityScripts/explore	Update title.	2020-03-27 14:44:33 -04:00
developer	Add automaticLookAt.js to the developer scripts	2019-11-26 13:42:01 -07:00
modules	Fix linux specific script engine crash	2019-08-15 13:07:43 -07:00
simplifiedUI	Merge remote-tracking branch 'hifi/master' into merge-hifi-master	2020-04-09 16:46:27 +12:00
system	Merge remote-tracking branch 'refs/remotes/kasen/master'	2020-06-10 02:49:13 +02:00
tutorials	Eliminated some JavaScript warnings due to missing commas	2019-03-28 16:06:31 +02:00
defaultScripts.js	Update to explore app.	2020-03-26 22:28:39 -04:00
simplifiedUIBootstrapper.js	Add Click to Zoom to the repo and bootstrapper	2019-11-14 17:05:47 -08:00