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