5de3ff4c61
Merge pull request #7 from aws-lumberyard-dev/nvsickle/EditorViewportWidgetFixes
...
Fix several EditorViewportWidget bugs
2021-04-12 17:39:29 -07:00
2f117c553d
Merge remote-tracking branch 'upstream/main' into nvsickle/EditorViewportWidgetFixes
2021-04-12 16:27:40 -07:00
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.
2021-04-12 21:22:21 +01:00
22684af141
Merge branch 'main' into nvsickle/EditorViewportWidgetFixes
2021-04-12 12:15:45 -07:00
cb2ee625be
Merge branch 'main' of https://github.com/aws-lumberyard/o3de
2021-04-12 19:51:04 +01:00
a25f5b1317
Merge pull request #10 from aws-lumberyard-dev/SPEC-6230
...
Pipeline fails when using a new empty ebs volume
2021-04-12 11:01:37 -07:00
90bcfb4c2e
Merge pull request #1 from aws-lumberyard-dev/jackalbe_scene_api_tests
...
fake commit
2021-04-12 09:28:12 -05:00
aa0b54838c
Fix PhysXDebug and PhysXEditor loading order ( #14 )
...
Co-authored-by: Ulugbek Adilbekov <ulugbek@amazon.com >
2021-04-12 14:16:01 +01:00
a92da4bcf5
Merge pull request #13 from aws-lumberyard-dev/scale-gizmo-uniform
...
making scale gizmo apply uniform scale to transform
2021-04-12 10:13:35 +01:00
b444c68fd3
Merge branch 'main' into scale-gizmo-uniform
2021-04-10 16:13:44 +01:00
51f1183ff4
making scale gizmo apply uniform scale to transform
2021-04-10 15:58:42 +01:00
fb4468b041
Merge branch 'main' into SPEC-6230
2021-04-09 18:26:42 -07:00
038540c922
Merge pull request #9 from aws-lumberyard-release/remove_packaging_scrubbing_validation
...
Remove scrubbing/validation from packaging script
2021-04-09 18:18:36 -07:00
37379d9d76
Fix indentation in Jenkinsfile
2021-04-09 18:17:03 -07:00
7c5e555a40
Fix indentation in Jenkinsfile
2021-04-09 18:14:14 -07:00
82a73c7ece
Merge branch 'main' into remove_packaging_scrubbing_validation
2021-04-09 17:56:06 -07:00
74c7e99ab7
Merge branch 'main' into SPEC-6230
2021-04-09 17:52:52 -07:00
84c42018c7
Revert AutomatedReview/Jenkinsfile
2021-04-09 17:37:25 -07:00
53d3ae436d
Pipeline fails when using a new empty ebs volume
2021-04-09 17:35:47 -07:00
f7651a6d0f
Cleaning up Jenkinsfile ( #8 )
...
SPEC-6241 GitHub cleanup of Jenkinsfile
2021-04-09 17:25:49 -07:00
33331b75d9
Merge branch 'main' of https://github.com/aws-lumberyard-release/o3de into SPEC-6230
2021-04-09 17:23:56 -07:00
04d171ecef
Pipeline fails when using a new empty ebs volume
2021-04-09 17:09:14 -07:00
3dc9ae7c0f
Merge branch 'main' into remove_packaging_scrubbing_validation
2021-04-09 15:48:44 -07:00
9f42a8f9bd
Remove scrubbing/validation from packaging script
2021-04-09 15:46:41 -07:00
1c47a26494
Clarify the reason for the default view juggling in SetAsActiveViewport
2021-04-09 14:19:41 -07:00
2190787c40
Fix build
2021-04-09 14:19:05 -07:00
d09dc500d3
fake commit
2021-04-09 14:55:39 -05:00
1dabb39b98
Migrate fixes from CodeCommit branch
2021-04-09 12:40:43 -07:00
e8f6463db0
SPEC-3580 Move Jenkins pipeline files to another folder ( #4 )
2021-04-09 12:17:34 -07:00
302c0aef80
Merge pull request #2 from aws-lumberyard-release/test_metrics_param_removal
...
Removing unused arg for test metrics
2021-04-09 11:06:46 -07:00
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.
2021-04-09 08:30:29 -07:00
0d6a0f4836
Merge branch 'main' into test_metrics_param_removal
2021-04-08 20:47:36 -07:00
733899636c
Merge branch 'main' into test_metrics_param_removal
2021-04-08 20:44:15 -07:00
ae62a97894
Merge pull request #3 from aws-lumberyard-release/build/multi-repo-support
...
Use complete Jenkins project name when creating EBS volumes
2021-04-08 19:35:34 -07:00
aef10339d5
Use complete Jenkins project name when creating EBS volumes
...
This change will allow us to support multiple repos in our account by using the full project name for the volumes. Right now multiple repos running the default pipeline will use the same name (e.g. defaultmain<platform>) and will conflict when similar branch names are used.
2021-04-08 17:36:00 -07:00
b32aa9beda
Merge pull request #1 from aws-lumberyard-release/update-lfs-config
...
Updating lfs endpoint
2021-04-08 16:51:11 -07:00
43d39096eb
Removing unused arg for test metrics
2021-04-08 15:13:39 -07:00
4caeb3ffe4
Updating lfs endpoint
2021-04-08 10:45:16 -07:00
afc51ab0d3
Merge pull request #19 from aws-lumberyard-test/metrics_setup
...
Adding MARS test metrics
2021-04-07 20:27:53 -07:00
041714c614
Merge branch 'main' into metrics_setup
2021-04-07 18:24:54 -07:00
4016d6da2f
Merge pull request #20 from AMZN-alexpete/github/staging
...
* Integrating up through commit 90f050496
* Updating 3rdParty link in README
Co-authored-by: Brian Herrera <briher@amazon.com >
2021-04-07 17:59:29 -07:00
4eae31c376
Remove git prune step
2021-04-07 16:51:02 -07:00
91ae6d2771
Remove scrubbing job from the pipeline
...
This will need to be ran in its own pipeline
2021-04-07 15:19:09 -07:00
20828a0bf4
Add credential id to the checkout step for the mars repo
2021-04-07 14:49:22 -07:00
edc77e3366
Fixing syntax error
2021-04-07 14:43:14 -07:00
004db04c06
Restoring LFS functionality lost in merge
2021-04-07 14:37:21 -07:00
ae652cc62a
Updating 3rdParty link in README
2021-04-07 14:06:18 -07:00
c2cbd430fe
Integrating up through commit 90f050496
2021-04-07 14:03:29 -07:00
5d586cbf64
Adding build step to build job name for test metrics
2021-04-06 16:21:15 -07:00
2d13bfda9d
Adding build job name to jenkinsfile for test metrics
2021-04-06 14:55:08 -07:00
Nicholas Van Sickle
nvsickle
Aaron Ruiz Mora
Nicholas Van Sickle
Shirang Jia
jackalbe
Ulugbek Adilbekov
greerdv
greerdv
Esteban Papp
jackalbe
evanchia-ly-sdets
Brian Herrera
evanchia
alexpete