11 Commits

Author	SHA1	Message	Date
Chris Galvan	d7574777a8	Resolved merge conflicts ... Signed-off-by: Chris Galvan <chgalvan@amazon.com>	2021-07-02 12:42:44 -05:00
Steve Pham	b4a2edec6a	Final update copyright headers to reference license files at the repo root (#1693) ... * Final update copyright headers to reference license files at the repo root Signed-off-by: spham <spham@amazon.com> * Fix copyright validator unit tests to support the stale O3DE header scenario Signed-off-by: spham <spham@amazon.com>	2021-06-30 19:51:55 -07:00
Gene Walters	6fb2558e44	Merge branch 'upstream/development' into genewalt/gitflow_210628 ... Signed-off-by: Gene Walters <genewalt@amazon.com>	2021-06-29 15:40:46 -07:00
John	0e0f266fdd	Provisional implementation of PythonCoverage gem ... Signed-off-by: John <jonawals@amazon.com>	2021-06-29 17:43:33 +01:00
Steve Pham	70042fcdcd	O3DE Copyright Updates for Linux Foundation (#1504)	2021-06-23 10:55:22 -07:00
AMZN-AlexOteiza	3f32cc929c	Fixed All Physics automated tests (#129) ... * Fixed all Tests. * Fixed tests stdout redirection * Changed return code for failed tests to be 0xF * Small improvements on automated testing code * Created Periodic test suite and moved tests * Made physics main to only have one test for now * Renamed all tests to have leading AutomatedTesting::	2021-04-26 15:25:34 +01:00
alexpete	8469c9ca0a	Integrating github/staging through commit 5f214be	2021-04-13 17:18:57 -07:00
Brian Herrera	39f53338bf	Merge branch 'main' into LoadPipelineFromGitHub	2021-03-26 17:05:57 -07:00
alexpete	36c4e827bd	Integrating latest from github/staging ... Integrating up through commit 5e1bdae	2021-03-26 14:32:02 -07:00
Brian Herrera	e8bbb5a0d5	Set scripts to be executable ... This is required to build on linux/mac	2021-03-26 09:26:12 -07:00
alexpete	75dc720198	Integrating latest 47acbe8	2021-03-25 13:57:57 -07:00