karlberg
|
ca3df5d6c8
|
Various bug fixes to get entity replication working
|
5 years ago |
Alex Peterson
|
7b3b1cd73e
|
Merge pull request #27 from aws-lumberyard-dev/remove-expired-data
Removing expired installer data
|
5 years ago |
alexpete
|
a3a0f157bd
|
Removing expired installer data
|
5 years ago |
|
Alex Peterson
|
7b165cd40d
|
Merge pull request #5 from aws-lumberyard-dev/github/staging
Integrating github/staging through commit b0dd7ed50
|
5 years ago |
|
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 |
|
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 |
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 |
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 |
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 |
|
Alex Peterson
|
cd12226849
|
Merge branch 'main' into github/staging
|
5 years ago |
|
alexpete
|
b8e508c2ee
|
Cherrypicking MeshCompiler fix
|
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
|
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 |
|
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 |
|
Shirang Jia
|
74c7e99ab7
|
Merge branch 'main' into SPEC-6230
|
5 years ago |
|
alexpete
|
54233f5838
|
Merge branch 'github/staging' of https://github.com/aws-lumberyard-release/o3de into github/staging
|
5 years ago |
|
shiranj
|
84c42018c7
|
Revert AutomatedReview/Jenkinsfile
|
5 years ago |
|
alexpete
|
71bd6c67b8
|
Removed external projects from build_config
|
5 years ago |
|
shiranj
|
53d3ae436d
|
Pipeline fails when using a new empty ebs volume
|
5 years ago |
Esteban Papp
|
f7651a6d0f
|
Cleaning up Jenkinsfile (#8)
SPEC-6241 GitHub cleanup of Jenkinsfile
|
5 years ago |
|
shiranj
|
33331b75d9
|
Merge branch 'main' of https://github.com/aws-lumberyard-release/o3de into SPEC-6230
|
5 years ago |
|
shiranj
|
04d171ecef
|
Pipeline fails when using a new empty ebs volume
|
5 years ago |
|
Shirang Jia
|
3dc9ae7c0f
|
Merge branch 'main' into remove_packaging_scrubbing_validation
|
5 years ago |
|
shiranj
|
9f42a8f9bd
|
Remove scrubbing/validation from packaging script
|
5 years ago |
Brian Herrera
|
674b9d6fdf
|
Remove scrubbing. It cannot run in the o3de repo.
|
5 years ago |
|
Brian Herrera
|
ae04211f8c
|
Merge branch 'main' into github/staging
|
5 years ago |
|
Brian Herrera
|
6f836e4614
|
Re-add change removed in latest merge.
|
5 years ago |
|
nvsickle
|
1c47a26494
|
Clarify the reason for the default view juggling in SetAsActiveViewport
|
5 years ago |
|
nvsickle
|
2190787c40
|
Fix build
|
5 years ago |
jackalbe
|
d09dc500d3
|
fake commit
|
5 years ago |
|
nvsickle
|
1dabb39b98
|
Migrate fixes from CodeCommit branch
|
5 years ago |
|
Esteban Papp
|
e8f6463db0
|
SPEC-3580 Move Jenkins pipeline files to another folder (#4)
|
5 years ago |
|
alexpete
|
8caec43f2a
|
Updating 3rdparty link in README to rev12
|
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 |
evanchia-ly-sdets
|
302c0aef80
|
Merge pull request #2 from aws-lumberyard-release/test_metrics_param_removal
Removing unused arg for test metrics
|
5 years ago |
|
Brian Herrera
|
69fdd42d59
|
Set default repo to o3de
Using env prevents setting different repos in a single instance. This will need to be set in another way.
|
5 years ago |