birkeh
/
o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,629 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 '6651ae3d78'
${ noResults }
Commit Graph

8629 Commits (6651ae3d784d9e2eb7a7f30f36f9729c3cba9852)
 

Author SHA1 Message Date
Alex Peterson 921eb742d4
Merge branch 'main' into github/staging 5 years ago
alexpete 60e6f204d2 Cherrypicking AWS fixes from f57af843 
This fix brings in a new 3rdparty revision for AWS that fixes a minor dependency issue on Android
 5 years ago
sphrose a71a5746cc [LY-113714] 
Jira: LY-113714
https://jira.agscollab.com/browse/LY-113714
 5 years ago
alexpete 5e08ec2fa8 Merge branch 'github/staging' of https://github.com/aws-lumberyard-dev/o3de into github/staging 5 years ago
alexpete fba71c0ca4 Removing epb_sanity_smoke_no_gpu_test 5 years ago
pereslav b68d07ff88 Deleted temp test file 5 years ago
jackalbe 442e15a414 Merge branch 'main' into sceneapi_script_autotest 5 years ago
pereslav eb6d586a92 Test file. Will be deleted 5 years ago
hultonha 063b8a6d54 update some reinterpret_cast calls to static_cast 5 years ago
hultonha 8846e159e0 Add new ByteStream serializer to support storing binary data in json (for now) 5 years ago
greerdv 2313471ab9 Merge branch 'main' into non-uniform-scale-visibility 5 years ago
greerdv 90e52d69bc fixing bug with subdivision level for runtime asset colliders and adding caching for collider aabbs 5 years ago
greerdv 87a3dfc968 fixing bug in editor bodies for rigid bodies with non-uniformly scaled asset colliders with position offsets 5 years ago
greerdv a99786fe59 fixing bug with visibility aabb for non-uniformly scaled polygon prism at activation 5 years ago
mcgarrah ea7b8309b5 Updating the FOLDER filtering in the LyTestWrappers.cmake custom targets to remove leading '..' from the VS folder filter 5 years ago
AMZN-mnaumov 1a7bf94917
Merge branch 'main' into Atom/mnaumov/ATOM-14904_2 5 years ago
Nicholas Van Sickle 5de3ff4c61
Merge pull request #7 from aws-lumberyard-dev/nvsickle/EditorViewportWidgetFixes 
Fix several EditorViewportWidget bugs
 5 years ago
nvsickle 2f117c553d Merge remote-tracking branch 'upstream/main' into nvsickle/EditorViewportWidgetFixes 5 years ago
mnaumov f188e1c9a7 Fixing ShaderVariantAsyncLoader shutdown not releasing it's assets 5 years ago
greerdv 106d14cf57
Merge branch 'main' into limit_max_scale 5 years ago
jackalbe 9d1a705fab Merge branch 'main' into sceneapi_script_autotest 5 years ago
Aaron Ruiz Mora 9f88698c3a
Merge pull request #19 from aws-lumberyard-dev/LatestDevMain 
Merging the latest from aws-lumberyad-dev:main to aws-lumberyard:main so dev's main is not ahead of the source of truth.
 5 years ago
greerdv 8e9851d8ea
Merge branch 'main' into limit_max_scale 5 years ago
mbalfour a7aa6a9747 Merge branch 'main' of https://github.com/aws-lumberyard/o3de 5 years ago
AMZN-mnaumov 51a1b19730
Merge branch 'main' into Atom/mnaumov/ATOM-14904 5 years ago
jackalbe 63c97d6d3c Merge branch 'main' into sceneapi_script_autotest 5 years ago
jackalbe 2f1d13e9c1 Merge branch 'main' of https://github.com/aws-lumberyard/o3de 5 years ago
Nicholas Van Sickle 22684af141
Merge branch 'main' into nvsickle/EditorViewportWidgetFixes 5 years ago
moraaar cb2ee625be Merge branch 'main' of https://github.com/aws-lumberyard/o3de 5 years ago
Alex Peterson 73e5a3693f Fixing missing execute permissions 5 years ago
Shirang Jia a25f5b1317
Merge pull request #10 from aws-lumberyard-dev/SPEC-6230 
Pipeline fails when using a new empty ebs volume
 5 years ago
jackalbe 77d06ecef7 ATOM-14889: Fix for scriptProcessorRule doesn't save with field empty 
* removed the script rule from the Editor, now will only be supported via a script or JSON manual edits
* Mesh Serialization - scriptProcessorRule doesn't save with field empty, but produces no error
* added a test to make sure Script Processor Rule operates with an empty filename

Jira: https://jira.agscollab.com/browse/ATOM-14889
Tests: Launched the Editor to removed the script rule from the Editor
 5 years ago
luissemp 724105a4ef Merge branch 'main' of https://github.com/aws-lumberyard/o3de into main 5 years ago
Alex Peterson cd12226849
Merge branch 'main' into github/staging 5 years ago
alexpete b8e508c2ee Cherrypicking MeshCompiler fix 5 years ago
mbalfour 62330d8386 Merge branch 'main' of https://github.com/aws-lumberyard/o3de 5 years ago
jackalbe 90bcfb4c2e
Merge pull request #1 from aws-lumberyard-dev/jackalbe_scene_api_tests 
fake commit
 5 years ago
Ulugbek Adilbekov aa0b54838c
Fix PhysXDebug and PhysXEditor loading order (#14) 
Co-authored-by: Ulugbek Adilbekov <ulugbek@amazon.com>
 5 years ago
greerdv 8ee92978f4 setting max value for scale 5 years ago
hultonha 5fc4aeaf09 add alias for AZStd::vector<u8> before potential change 5 years ago
greerdv a92da4bcf5
Merge pull request #13 from aws-lumberyard-dev/scale-gizmo-uniform 
making scale gizmo apply uniform scale to transform
 5 years ago
greerdv b444c68fd3 Merge branch 'main' into scale-gizmo-uniform 5 years ago
greerdv 51f1183ff4 making scale gizmo apply uniform scale to transform 5 years ago
mnaumov 0dd57ae901 Adding mutex to ImageProcessingBus 5 years ago
Shirang Jia c8a3bc036a
Merge pull request #11 from aws-lumberyard/main 
Merging from main to 1.0
 5 years ago
Shirang Jia fb4468b041
Merge branch 'main' into SPEC-6230 5 years ago
Shirang Jia 038540c922
Merge pull request #9 from aws-lumberyard-release/remove_packaging_scrubbing_validation 
Remove scrubbing/validation from packaging script
 5 years ago
Shirang Jia 37379d9d76
Fix indentation in Jenkinsfile 5 years ago
Shirang Jia 7c5e555a40
Fix indentation in Jenkinsfile 5 years ago
Shirang Jia 82a73c7ece
Merge branch 'main' into remove_packaging_scrubbing_validation 5 years ago