Integrating latest from github/staging

Integrating up through commit 5e1bdae
2021-03-26 14:31:50 -07:00
parent 9c54341af8
commit 36c4e827bd
764 changed files with 11453 additions and 20251 deletions
@@ -146,7 +146,6 @@ public:
    QString GetLevelDataFolder();
    QString GetSearchPath(EEditorPathName path);
    QString GetResolvedUserFolder();
-    QString GetProjectName() override;
    bool ExecuteConsoleApp(const QString& CommandLine, QString& OutputText, bool bNoTimeOut = false, bool bShowWindow = false);
    virtual bool IsInGameMode() override;
    virtual void SetInGameMode(bool inGame) override;