birkeh
/
o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
362 Commits
3 Branches
3 Tags
148 MiB
development
monroegm-disable-blank-issue-2
main
2111.2
2111.1
2107.1
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '7e48bee48f'
${ noResults }
Commit Graph

25 Commits (7e48bee48fbef40e281ffb3f68aa82dcedf7e515)

Author SHA1 Message Date
mnaumov 7e48bee48f Fixing thumbnail pixelation 5 years ago
Chris Galvan 7f169855f3 Merge branch 'main' into cgalvan/EntityHelperRefactor 5 years ago
Chris Galvan 06d6ab9715 [LYN-2255] Updated unit test to use matchers to reduce lines and improve readability. Also fixed some other minor code feedback. 5 years ago
mcgarrah 6d3b9e4f51 Merge remote-tracking branch 'upstream/main' into LYN-2726-ProjectRoot 5 years ago
Esteban Papp a6c7815685
SPEC-6371 Change the asset_profile and test_profile steps to be no_unity so it doesnt recompile 5 years ago
alexpete 10faddb113 Integrating github/staging through commit ef88e6e 5 years ago
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
 5 years ago
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
 5 years ago
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
 5 years ago
srikappa 4da29a09d2 Merge branch 'main' into Prefab/RelativePathForNewPrefabs 5 years ago
greerdv 10ab7666db Merge branch 'main' into limit_max_scale 5 years ago
srikappa 2410d299c1 Make creation of new prefabs use a relative path to the project 5 years ago
Chris Galvan 0f13a71bd2 [LYN-2255] Refactored some EditorEntityHelpers so they can be re-used. 5 years ago
nvsickle bf0db7a3c6 Merge remote-tracking branch 'upstream/main' into nvsickle/EnableAtomViewport 5 years ago
alexpete 8469c9ca0a Integrating github/staging through commit 5f214be 5 years ago
nvsickle f6e98d5014 Fix viewport context menu hiding cursor and sometimes popping up repeatedly 5 years ago
Alex Peterson cd12226849
Merge branch 'main' into github/staging 5 years ago
greerdv 8ee92978f4 setting max value for scale 5 years ago
greerdv 51f1183ff4 making scale gizmo apply uniform scale to transform 5 years ago
alexpete c5b955d281 Integrating github/staging through commit b0dd7ed 5 years ago
alexpete 1044dc3da1 Integrating github/staging through commit ab87ed9 5 years ago
alexpete c2cbd430fe Integrating up through commit 90f050496 5 years ago
alexpete 36c4e827bd Integrating latest from github/staging 
Integrating up through commit 5e1bdae
 5 years ago
alexpete 75dc720198 Integrating latest 47acbe8 5 years ago
alexpete a10351f38d Initial commit 5 years ago