Commit Graph

38 Commits

Author SHA1 Message Date
greerdv ccccfb2c5b more tidying up 2021-05-25 14:56:08 +01:00
greerdv 7def4741cd merge from main 2021-05-19 12:14:25 +01:00
karlberg 74385a575f Merge remote-tracking branch 'origin' into MultiplayerComponents 2021-05-11 13:43:17 -07:00
karlberg 5440d0926d Fixing some dependencies in script canvas and emfx 2021-05-11 13:42:44 -07:00
Terry Michaels 8ddfcabae7 Removed unneeded comments (#673) 2021-05-10 22:02:30 -05:00
chcurran a30d8eb886 Expose Raw BC Properties to Node Palette. 2021-05-05 14:59:08 -07:00
chcurran 071a642804 Auto gen updates fixing property declarations. 2021-05-03 09:37:23 -07:00
chcurran 1d7fc92930 Fixes errors in function scope variables that require static initialization 2021-04-29 18:19:14 -07:00
chcurran f52975be83 use long brackets to implement SC strings in Lua 2021-04-28 22:40:41 -07:00
lumberyard-employee-dm 3dec5d3b71 LYN-2537 engine assets (#254)
* LYN-2537 Moved the Engine and Editor folder to be within the EngineAssets folder

* Fixed Documentation in bootstrap.cfg to correct the path to the user project specific registry file

* Adding a newline to the output of AssetCatalog 'Registering asset..., but type is not set' message

* Updating the AssetProcessorPlatformConfig.setreg Scan Folder to detect
the @ENGINEROOT@/EngineAssets/Engine path for engine runtime assets and
@ENGINEROOT@/EngineAssets/Editor path for engine tool assets

* Updating references to Icons and other assets to account for moving the
Engine and Editor folder under a single EngineAssets folder

* Moving the Engine Settings Registry folder from Engine/Registry -> Registry

* Removed the LY_PROJECT_CMAKE_PATH define as it is not portable to other locations. It is hard coded to the project location that was used for the CMake configuration. Furthermore it paths with backslashes within it are treated as escape characters and not a path separator

* Updated the LyTestTools asset_processor.py script to copy the exclude.filetag from the EngineAssets/Engine directory now

* Fixed Atom Shader Preprocessing when running using an External Project

* Updated the TSGenerateAction.cpp to fix the build error with using a renamed variable

* Updated the Install_Common.cmake ly_setup_others function to install the
EngineAssets directory and the each of the Gem's Assets directory while
maintaining the relative directory structure to the Engine Root
Also updated the install step to install the Registry folder at the
engine root

* Fixed the copying of the Registry folder to be in the install root, instead of under a second 'Registry' folder

* Moving the AssetProcessorPlatformConfig.setreg file over to the Registry folder

* Updated the LyTestTools and C++ code to point that the new location of
the AssetProcessorPlatformConfig.setreg file inside of the Registry
folder

* Renamed Test AssetProcessor*Config.ini files to have the .setreg extension

* Converted the AssetProcessor test setreg files from ini format to json
format using the SerializeContextTools convert-ini command

* Updated the AssetProcessor CMakeLists.txt to copy over the test setreg files to the build folder

* Updated the assetprocessor test file list to point at the renamed AsssetProcessor*Config setreg filenames

* Removed the Output Prefix code from the AssetProcessor. The complexity that it brought to the AP code is not needed, as users can replicate the behavior by just moving there assets underneath a another folder, underneath the scan folder

* Adding back support to read the AssetProcessorPlatformConfig.setreg file from the asset root. This is only needed for C++ UnitTests as they run in an environment where the accessing the Engine Settings Registry is not available

* Updating the Install_common.cmake logic to copy any "Assets" folder to
the install layout.
The Script has also been updated to copy over the "Assets" folder in the
Engine Root to the install layout instead of an "EngineAssets" folder

* Updating References to EngineAssets source asset folder in code to be the Assets source folder

* Moved the Engine Source Asset folder of 'EngineAssets' to a new folder name of 'Assets'. This is inline with the naming scheme we use for Gem asset folders

* Adding the EngineFinder.cmake to the AutomatedTesting project to allow it to work in a project centric manner

* Updating the LyTestTools copy_assets_to_project function to be able to copy assets with folders to the temporary project root
Fixed an issue in LyTestTools where the temporary log directory could have shutil.rmtree being called twice on it leading to an exception which fails an automated test

Updated the asset_procesor_gui_tests_2 AddScanFolder test to not use the
output prefix, but instead place the source asset root into a
subdirectory

* Correct the AssetProcessorPlatformConfig Scan Folders for the EngineAssets directory to point at the Assets directory

* Updated the asset procesor batch dependency test scan folder to point at the 'Assets' folder instead of 'EngineAssets'
2021-04-28 21:38:43 -05:00
chcurran 812f624020 add missing numeric caster for platform safe Lua integer use 2021-04-27 14:22:29 -07:00
chcurran 66dd89aacd Fixes for branching runtime, nested user branch parse-error, unit tests for both. LYN-3338 2021-04-27 12:08:49 -07:00
greerdv b113f09a71 first pass of changing transform to use float for scale internally rather than Vector3 2021-04-27 18:12:46 +01:00
chcurran b7aeb98d5a Merge branch 'main' into carlitosan-parser-fixes 2021-04-23 15:55:19 -07:00
chcurran bc11711ab9 Fix and test for LYN-2817, container input in user functions 2021-04-23 15:52:29 -07:00
Chris Burel 28170ffe41 Add newlines to the end of all files 2021-04-23 09:43:40 -07:00
chcurran 5409f85f96 Merge branch 'main' into carlitosan-parser-fixes 2021-04-22 16:15:54 -07:00
chcurran cb7a26ce5e Editor for stability and overloaded nodes. LYN-2904, LYN-3059, LYN-3234, LYN-2888 2021-04-22 16:13:24 -07:00
amzn-sj 4b88d3683d Merge branch 'main' into LYN-3077 2021-04-22 10:11:13 -07:00
amzn-sj 3aa0544076 Fix AssetProcessor crash on Mac 2021-04-22 10:06:28 -07:00
chcurran 134f07eb5a Fixes for node palette exclusion, restrict asset variable type to fix LYN-3090 2021-04-21 21:36:31 -07:00
chcurran 4faa64e31d Fix string format build error 2021-04-21 09:42:33 -07:00
chcurran 58dcbe42e4 Check for string param types in single result slot. LYN-2855 2021-04-20 17:51:05 -07:00
chcurran 4ae75a71d0 safety check on empty datum LYN-2855 2021-04-20 17:33:34 -07:00
chcurran bfe192cce8 Merge branch 'main' into carlitosan_scripting_first 2021-04-20 16:45:03 -07:00
chcurran fa947d84f7 Reflect testing enum properly 2021-04-20 14:44:51 -07:00
chcurran 961f2ef113 Replace string/hash based execution out look up for indices, 10-50% speed up in lookup code. Fix bugs calling dependent functions. 2021-04-20 12:04:57 -07:00
luissemp 83324762b5 Brought over SC's command line fixes and add_node example script 2021-04-20 10:40:53 -07:00
luissemp f938fde4b0 Compile fix 2021-04-15 11:54:45 -07:00
luissemp f5791ee60a Fixed compile error and added Setters to Node Palette 2021-04-15 10:08:07 -07:00
luissemp 53e84b3820 Fixed scoping rules for variables 2021-04-15 09:35:09 -07:00
alexpete 8469c9ca0a Integrating github/staging through commit 5f214be 2021-04-13 17:18:57 -07:00
alexpete c5b955d281 Integrating github/staging through commit b0dd7ed 2021-04-09 12:03:26 -07:00
alexpete 1044dc3da1 Integrating github/staging through commit ab87ed9 2021-04-09 11:27:37 -07:00
alexpete c2cbd430fe Integrating up through commit 90f050496 2021-04-07 14:03:29 -07:00
alexpete 36c4e827bd Integrating latest from github/staging
Integrating up through commit 5e1bdae
2021-03-26 14:32:02 -07:00
alexpete 75dc720198 Integrating latest 47acbe8 2021-03-25 13:57:57 -07:00
alexpete a10351f38d Initial commit 2021-03-08 14:30:57 -08:00