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

91 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
jackalbe a7f5462f3d
Merge pull request #114 from aws-lumberyard-dev/sceneapi_script_regression 
{LYN-2635} Helios - Wrote auto tests for Python asset builder and scene API
 5 years ago
lumberyard-employee-dm d6788996fc
Merge pull request #130 from aws-lumberyard-dev/LYN-3055 
Fixed issue if the "/Amazon/AzCore/Bootstrap/<platform>_assets" or
 5 years ago
AMZN-stankowi 4c2260af97
Lyn 2651 rebased to main (#74) 
* Helios - LYN-2651 Lerping bones, cleaned up key frame generation for morph targets. Merge from 1.0.
 5 years ago
mcgarrah 9412078992 Fixed issue if the "/Amazon/AzCore/Bootstrap/<platform>_assets" or 
"/Amazon/AzCore/Bootstrap/assets" key is set, then it would append that
value to the default asset platform value for the OS
 5 years ago
jackalbe ce6d9e51ee Merge branch 'main' into sceneapi_script_regression 5 years ago
mcgarrah 6d3b9e4f51 Merge remote-tracking branch 'upstream/main' into LYN-2726-ProjectRoot 5 years ago
Nicholas Van Sickle 944dab2ecb
Merge pull request #121 from aws-lumberyard-dev/nvsickle/ViewportFixesFrom10Round1 
Cherry-pick from 1.0: Fix EditorViewportWidget stealing keyboard focus
 5 years ago
lumberyard-employee-dm 1e80012df1
Merge pull request #79 from aws-lumberyard-dev/LYN-2461-Bootstrap 
Removed AssetProcessor Settings from the bootstrap.cfg file as they get overridden by the Engine/Registry/bootstrap.setreg file and is therefore a "trap" to set them.
Users will not see any functionality change from modifiying those values.
 5 years ago
chiyenteng 41db22be3d
[CherryPick][LYN-2738] Fix Reflect functions of IAnimSequence and CAnimSequence (#103) 
* [CherryPick][LYN-2738] Fix Reflect functions of IAnimSequence and CAnimSequence (#85)
 5 years ago
mcgarrah 603ee5bf83 Updated the MergeSettingsToRegistry_AddRuntimeFilePaths to use the default asset platform associated with the OS, if the /Amazon/AzCore/Bootstrap/assets key isn't found in the settings registry 5 years ago
mcgarrah 96ef349931 Update the AzFramework and AzCore cmake files to point at the new location of the PlatformDefaults.h and PlatformDefaults.cpp file 
Added an inline namespace for the PlatformDefaults code to ease with aliasing it into the AzFramework namespace
 5 years ago
mcgarrah bf2732a26d Moved the PlatformDefaults files from AzFramework to AzCore 5 years ago
mcgarrah 373f60f29c Added a call to update the runtime file paths again after merging all Engine, Gem and Project Settings Registry in case they modified the asset platform key which is used for setting the project cache root 5 years ago
nvsickle a519bd6d0c Fix EditorViewportWidget stealing keyboard focus 
grabKeyboard was used by CRenderViewport to ensure it received some events, but that logic is no longer needed and the corresponding release was removed. This just removes grabKeyboard entirely - eventually all input event logic will be removed as well.
 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
mcgarrah 6dadc84581 Merge branch 'main' of https://github.com/aws-lumberyard/o3de into LYN-2726-ProjectRoot 5 years ago
jackalbe 085aa78ec9 Merge branch 'main' into sceneapi_script_regression 5 years ago
alexpete 10faddb113 Integrating github/staging through commit ef88e6e 5 years ago
Tom Hulton-Harrop 405276a7ae
Merge pull request #37 from aws-lumberyard-dev/hultonha_LYN-2528_whitebox_prefab 
Add Json serialization support for ByteStream

Fixes serialization issue with the White Box component when Prefabs are enabled.
 5 years ago
jjjoness 0854d5d0da
Merge pull request #99 from aws-lumberyard-dev/LYN-1901 
Lyn 1901
 5 years ago
amzn-sean 2a53f018fa
Merge pull request #70 from aws-lumberyard-dev/physx_system_comp 
SystemComponent is now only built once in the PhysX.Static target
 5 years ago
hultonha 102a0e5dc8 Merge branch 'main' into hultonha_LYN-2528_whitebox_prefab 5 years ago
greerdv a757d327a0 Merge branch 'main' into non-uniform-scale-visibility 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
karlberg 8074e0fb18 Remove formal template parameter name to resolve shadowed variable warning on clang 5 years ago
kberg-amzn c2f9019f7c
Merge pull request #65 from aws-lumberyard-dev/MultiplayerComponents 
Multiplayer components
 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
Nicholas Van Sickle 2f698626cf
Merge pull request #64 from aws-lumberyard-dev/nvsickle/CherryPickContextMenuFix 
Cherry-pick: Fix context menu popping up in EditorViewportWidget when it shouldn't
 5 years ago
jackalbe 0997a2cfbf Merge branch 'main' into sceneapi_script_regression 5 years ago
jackalbe 80f8c0f68b behavior context class SceneGraph::NodeIndex -> "NodeIndex" 5 years ago
srikappa 4da29a09d2 Merge branch 'main' into Prefab/RelativePathForNewPrefabs 5 years ago
hultonha 9d84fdcb23 Merge branch 'main' into hultonha_LYN-2528_whitebox_prefab 5 years ago
greerdv 3bbef11d15 Merge branch 'main' into non-uniform-scale-visibility 5 years ago
greerdv 10ab7666db Merge branch 'main' into limit_max_scale 5 years ago
amzn-sean 23cf2d5d68 SystemComponent is now only build in PhysX.Static, instead of most of the Physx projects. 5 years ago
jjjoness 390aa36480 Merge branch 'main' into LYN-1901 5 years ago
jjjoness 11081aeddd Changed logo to O3DE 5 years ago
hultonha 7c5f7181eb updates following review feedback - remove explicit resize and update concrete type to alias 5 years ago
lumberyard-employee-dm 8019312b35
Merge pull request #28 from aws-lumberyard-dev/LYN-2883 
Updating the FOLDER filtering in the LyTestWrappers.cmake custom targets to remove leading '..' from the VS folder filter
 5 years ago
srikappa 2410d299c1 Make creation of new prefabs use a relative path to the project 5 years ago
karlberg 88120999f9 Merge remote-tracking branch 'origin' into MultiplayerComponents 5 years ago
nvsickle f7aabebb37 Fix context menu popping up when it shouldn't 5 years ago
SJ 03aaf33b6e
Merge pull request #62 from aws-lumberyard-dev/SPEC-6295 
[iOS] Fix build issues
 5 years ago
Nicholas Van Sickle 7484a983b8
Merge pull request #51 from aws-lumberyard-dev/nvsickle/EnableAtomViewport 
Switch on the Atom-native viewport by default
 5 years ago
mcgarrah d29fe24396 Merge remote-tracking branch 'upstream/main' into LYN-2883 5 years ago
amzn-sj 7609248c49 Fix build errors 5 years ago