Commit Graph

21 Commits

Author SHA1 Message Date
mcgarrah 6d3b9e4f51 Merge remote-tracking branch 'upstream/main' into LYN-2726-ProjectRoot 2021-04-16 21:12:55 -05:00
Esteban Papp a6c7815685 SPEC-6371 Change the asset_profile and test_profile steps to be no_unity so it doesnt recompile 2021-04-16 16:06:54 -07:00
alexpete 10faddb113 Integrating github/staging through commit ef88e6e 2021-04-16 12:05:11 -07:00
mcgarrah bff55bd688 LYN-2726 Updated the Settings Registry Merge Utils logic to determine
the project root and engine root to fix issues with running the Editor
or AssetProcessor from within the project folder overriding the
project_path with the engine root bootstrap.cfg project_path entry

The order in which the project path is overridden as follows
1. The <engine-root>/bootstrap.cfg is first merged into the Settings
   Registry. Any '/Amazon/AzCore/Bootstrap/project_path' would be used
   if the following steps don't override that key.
2. Followed by general *.setreg/*.setregpatch files being merged into
   the Settings Registry which can override the
   '/Amazon/AzCore/Bootstrap/project_path' key
3. Next a project.json file searched upwards from the current executable
   directory to determine the project path
4. Finally if a command line parameter that overrides the project path
   is supplied it is used instead
2021-04-15 22:40:58 -05:00
srikappa-amzn 76af009190 Merge pull request #72 from aws-lumberyard-dev/Prefab/RelativePathForNewPrefabs
Make creation of new prefabs use a relative path to the project
2021-04-15 13:20:18 -07:00
Terry Michaels 020d7801bb Make sure Recent Files list is correctly enabled/disabled when the list changes (#73)
Make sure Recent Files list is correctly enabled/disabled when the recent files list changes
2021-04-15 14:28:57 -05:00
srikappa 4da29a09d2 Merge branch 'main' into Prefab/RelativePathForNewPrefabs 2021-04-15 11:01:15 -07:00
greerdv 10ab7666db Merge branch 'main' into limit_max_scale 2021-04-15 13:44:53 +01:00
srikappa 2410d299c1 Make creation of new prefabs use a relative path to the project 2021-04-14 17:51:15 -07:00
nvsickle bf0db7a3c6 Merge remote-tracking branch 'upstream/main' into nvsickle/EnableAtomViewport 2021-04-14 10:47:18 -07:00
alexpete 8469c9ca0a Integrating github/staging through commit 5f214be 2021-04-13 17:18:57 -07:00
nvsickle f6e98d5014 Fix viewport context menu hiding cursor and sometimes popping up repeatedly 2021-04-13 11:08:22 -07:00
Alex Peterson cd12226849 Merge branch 'main' into github/staging 2021-04-12 08:48:09 -07:00
greerdv 8ee92978f4 setting max value for scale 2021-04-12 13:07:40 +01:00
greerdv 51f1183ff4 making scale gizmo apply uniform scale to transform 2021-04-10 15:58:42 +01: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