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
@@ -11,7 +11,7 @@ es3=enabled ; note - bad platform - its not one of the above ones!

 ; without a scan folder, it is an invalid file.
 [ScanFolder Game]
-watch=@ROOT@/@GAMENAME@
+watch=@PROJECTROOT@
 recursive=1
 order=0

@@ -2,7 +2,7 @@

 ; without a scan folder, it is an invalid file.
 [ScanFolder Game]
-watch=@ROOT@/@GAMENAME@
+watch=@PROJECTROOT@
 recursive=1
 order=0

@@ -8,7 +8,7 @@ tags=tools,renderer

 ; without a scan folder, it is an invalid file.
 [ScanFolder Game]
-watch=@ROOT@/@GAMENAME@
+watch=@PROJECTROOT@
 recursive=1
 order=0

@@ -35,16 +35,16 @@ cbc=abc
 fbx.assetinfo=fbx

 [ScanFolder Game]
-watch=@ROOT@/@GAMENAME@
+watch=@PROJECTROOT@
 ; use a special display name here to make sure macros work
-display=@GAMENAME@ Scan Folder
+display=@PROJECTROOT@ Scan Folder
 recursive=1
 order=0

 ; this test makes sure that those macros make sense and are present as well as that order is preserved.
 ; it also makes sure that the friendly name ("FeatureTests") is used, if no display is present and does not lose its case.
 [ScanFolder FeatureTests]
-watch=@ROOT@/@GAMENAME@FeatureTests
+watch=@PROJECTROOT@FeatureTests
 output=featuretestsoutputfolder
 recursive=0
 order=5000
@@ -53,7 +53,7 @@ order=5000
 ; (which is constructed from its name in the square brackets)
 ; instead of other attributes such as the watch folder, or output prefix.
 [ScanFolder FeatureTests2]
-watch=@ROOT@/@GAMENAME@FeatureTests
+watch=@PROJECTROOT@FeatureTests
 output=featuretestsoutputfolder
 recursive=0
 order=6000
@@ -42,7 +42,7 @@ cbc=abc
 fbx.assetinfo=fbx

 [ScanFolder Game]
-watch=@ROOT@/@GAMENAME@
+watch=@PROJECTROOT@
 display=gameoutput
 recursive=1
 order=0
@@ -1,12 +0,0 @@
-<RCC>
-  <qresource prefix="testdata">
-    <file>config_broken_badplatform/AssetProcessorPlatformConfig.ini</file>
-    <file>config_broken_noscans/AssetProcessorPlatformConfig.ini</file>
-    <file>config_broken_recognizers/AssetProcessorPlatformConfig.ini</file>
-    <file>config_broken_noplatform/AssetProcessorPlatformConfig.ini</file>
-    <file>config_regular/AssetProcessorPlatformConfig.ini</file>
-    <file>config_regular_platform_scanfolder/AssetProcessorPlatformConfig.ini</file>
-    <file>EmptyDummyProject/AssetProcessorGamePlatformConfig.ini</file>
-    <file>DummyProject/AssetProcessorGamePlatformConfig.ini</file>
-  </qresource>
-</RCC>