Merge pull request #7120 from aws-lumberyard-dev/cgalvan/gitflow_220124_o3de_main

Merged `stabilization/2111RTE` to `main`
Merge remote-tracking branch 'upstream/stabilization/2111RTE' into cgalvan/gitflow_220124_o3de_main
2022-01-27 12:07:39 -06:00 · 2022-01-24 13:13:43 -06:00 · 2021-12-02 09:36:59 -06:00 · 2021-11-30 12:30:07 -06:00 · 2021-08-11 15:29:33 -05:00 · 2021-08-11 14:13:27 -05:00
1 changed files with 15 additions and 0 deletions
@@ -5,6 +5,21 @@ O3DE (Open 3D Engine) is an open-source, real-time, multi-platform 3D engine tha
 ## Contribute
 For information about contributing to Open 3D Engine, visit [https://o3de.org/docs/contributing/](https://o3de.org/docs/contributing/).
 ## Updates to this readme
 July 06, 2021
 - Switch licenses to APACHE-2.0 OR MIT
 May 14, 2021 
 - Removed instructions for the 3rdParty zip file and downloader URL. This is no longer a requirement. 
 - Updated instructions for dependencies
 - Links to full documentation
 April 7-13, 2021
 - Updates to the 3rdParty zip file
 March 25, 2021
 - Initial commit for instructions
 ## Download and Install
 This repository uses Git LFS for storing large binary files.
Author	SHA1	Message	Date
Chris Galvan	c1d7294c5b	Merge pull request #7120 from aws-lumberyard-dev/cgalvan/gitflow_220124_o3de_main Merged `stabilization/2111RTE` to `main`	2022-01-27 12:07:39 -06:00
Chris Galvan	acc2346678	Merge remote-tracking branch 'upstream/stabilization/2111RTE' into cgalvan/gitflow_220124_o3de_main Signed-off-by: Chris Galvan <chgalvan@amazon.com>	2022-01-24 13:13:43 -06:00
Chris Galvan	1da5ef16a8	Merge pull request #6046 from aws-lumberyard-dev/cgalvan/gitflow_211130_o3de_main Merged `stabilization/2110` to `main`	2021-12-02 09:36:59 -06:00
Chris Galvan	57b201b0da	Merged stabilization/2110 -> main Signed-off-by: Chris Galvan <chgalvan@amazon.com>	2021-11-30 12:30:07 -06:00
Chris Galvan	f8d39e2671	Merge pull request #3049 from aws-lumberyard-dev/cgalvan/gitflow_210811 Merged stabilization/2106 to main	2021-08-11 15:29:33 -05:00
Chris Galvan	575faa4443	Merge remote-tracking branch 'upstream/stabilization/2106' into cgalvan/gitflow_210811 Signed-off-by: Chris Galvan <chgalvan@amazon.com>	2021-08-11 14:13:27 -05:00
Terry Michaels	43603cad5e	Merge pull request #2271 from aws-lumberyard-dev/Foundation/miterenc/ContributingUpdate Updating CONTRIBUTING.md	2021-07-19 14:55:51 -05:00
Terry Michaels	bb52475ce8	Updated text to be more descriptive Signed-off-by: Terry Michaels <miterenc@amazon.com>	2021-07-19 14:55:14 -05:00
Terry Michaels	697dfad486	Fixed typo Signed-off-by: Terry Michaels <miterenc@amazon.com>	2021-07-19 14:27:24 -05:00
Terry Michaels	650e1ab44d	Updating CONTRIBUTING.md Signed-off-by: Terry Michaels <miterenc@amazon.com>	2021-07-19 14:19:46 -05:00
Chris Galvan	d9cce28a53	Merge pull request #2096 from aws-lumberyard-dev/cgalvan/gitflow_210712_main Merged stabilization/2106 to main	2021-07-12 14:06:57 -05:00
Chris Galvan	486ba58628	Merged stabilization/2106 to development; Resolved merge conflicts Signed-off-by: Chris Galvan <chgalvan@amazon.com>	2021-07-12 11:12:41 -05:00
Nicholas Lawson	e7f787572e	Updates licenses to APACHE-2.0 OR MIT (#1685 ) Not to be committed before 7/6/2021 Signed-off-by: lawsonamzn <70027408+lawsonamzn@users.noreply.github.com>	2021-07-06 08:03:35 -07:00
Chris Galvan	837e1c7370	Merge pull request #1764 from aws-lumberyard-dev/cgalvan/gitflow_210702 Merged stabilization/2106 to main	2021-07-02 12:11:27 -05:00
Chris Galvan	efcbe2c4a1	Merge remote-tracking branch 'upstream/stabilization/2106' into cgalvan/gitflow_210702 Signed-off-by: Chris Galvan <chgalvan@amazon.com>	2021-07-02 10:20:42 -05:00
Alex Peterson	d30de01752	Updating LFS config to new endpoint (#1624 ) Signed-off-by: AMZN-alexpete	2021-06-28 11:20:36 -07:00