cdaddc72e8
Merge branch 'main' into sceneapi_script_autotest
2021-04-13 17:54:57 -05:00
7b3b1cd73e
Merge pull request #27 from aws-lumberyard-dev/remove-expired-data
...
Removing expired installer data
2021-04-13 11:55:33 -07:00
a3a0f157bd
Removing expired installer data
2021-04-13 11:53:50 -07:00
7b165cd40d
Merge pull request #5 from aws-lumberyard-dev/github/staging
...
Integrating github/staging through commit b0dd7ed50
2021-04-13 10:03:48 -07:00
921eb742d4
Merge branch 'main' into github/staging
2021-04-13 09:46:26 -07:00
60e6f204d2
Cherrypicking AWS fixes from f57af843
...
This fix brings in a new 3rdparty revision for AWS that fixes a minor dependency issue on Android
2021-04-13 09:19:07 -07:00
5e08ec2fa8
Merge branch 'github/staging' of https://github.com/aws-lumberyard-dev/o3de into github/staging
2021-04-13 09:09:00 -07:00
fba71c0ca4
Removing epb_sanity_smoke_no_gpu_test
2021-04-13 09:08:01 -07:00
442e15a414
Merge branch 'main' into sceneapi_script_autotest
2021-04-13 09:51:05 -05:00
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
9d1a705fab
Merge branch 'main' into sceneapi_script_autotest
2021-04-12 15:38:31 -05: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
63c97d6d3c
Merge branch 'main' into sceneapi_script_autotest
2021-04-12 14:27:41 -05:00
2f1d13e9c1
Merge branch 'main' of https://github.com/aws-lumberyard/o3de
2021-04-12 14:27:02 -05: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
73e5a3693f
Fixing missing execute permissions
2021-04-12 11:03:50 -07: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
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
2021-04-12 12:30:30 -05:00
cd12226849
Merge branch 'main' into github/staging
2021-04-12 08:48:09 -07:00
b8e508c2ee
Cherrypicking MeshCompiler fix
2021-04-12 08:45:38 -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
54233f5838
Merge branch 'github/staging' of https://github.com/aws-lumberyard-release/o3de into github/staging
2021-04-09 17:37:46 -07:00
84c42018c7
Revert AutomatedReview/Jenkinsfile
2021-04-09 17:37:25 -07:00
71bd6c67b8
Removed external projects from build_config
2021-04-09 17:36:59 -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
674b9d6fdf
Remove scrubbing. It cannot run in the o3de repo.
2021-04-09 14:52:20 -07:00
ae04211f8c
Merge branch 'main' into github/staging
2021-04-09 14:42:18 -07:00
6f836e4614
Re-add change removed in latest merge.
2021-04-09 14:40:18 -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
jackalbe
Alex Peterson
alexpete
Nicholas Van Sickle
nvsickle
jackalbe
Aaron Ruiz Mora
Nicholas Van Sickle
Shirang Jia
Ulugbek Adilbekov
greerdv
greerdv
Esteban Papp
Brian Herrera