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
@@ -35,7 +35,7 @@ using namespace AssetProcessor;
 namespace AssetProcessor
 {
    const char* const TEST_BOOTSTRAP_DATA =
-        "sys_game_folder = TestProject                                                      \r\n\
+        "project_path = TestProject                                                         \r\n\
        assets = pc                                                                         \r\n\
        -- ip and port of the asset processor.Only if you need to change defaults           \r\n\
        -- remote_ip = 127.0.0.1                                                            \r\n\