Compare commits

...

16 Commits

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`
4 years ago
Chris Galvan acc2346678 Merge remote-tracking branch 'upstream/stabilization/2111RTE' into cgalvan/gitflow_220124_o3de_main
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
4 years ago
Chris Galvan 1da5ef16a8
Merge pull request #6046 from aws-lumberyard-dev/cgalvan/gitflow_211130_o3de_main
Merged `stabilization/2110` to `main`
4 years ago
Chris Galvan 57b201b0da Merged stabilization/2110 -> main
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
4 years ago
Chris Galvan f8d39e2671
Merge pull request #3049 from aws-lumberyard-dev/cgalvan/gitflow_210811
Merged stabilization/2106 to main
4 years ago
Chris Galvan 575faa4443 Merge remote-tracking branch 'upstream/stabilization/2106' into cgalvan/gitflow_210811
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
4 years ago
Terry Michaels 43603cad5e
Merge pull request #2271 from aws-lumberyard-dev/Foundation/miterenc/ContributingUpdate
Updating CONTRIBUTING.md
5 years ago
Terry Michaels bb52475ce8 Updated text to be more descriptive
Signed-off-by: Terry Michaels <miterenc@amazon.com>
5 years ago
Terry Michaels 697dfad486 Fixed typo
Signed-off-by: Terry Michaels <miterenc@amazon.com>
5 years ago
Terry Michaels 650e1ab44d Updating CONTRIBUTING.md
Signed-off-by: Terry Michaels <miterenc@amazon.com>
5 years ago
Chris Galvan d9cce28a53
Merge pull request #2096 from aws-lumberyard-dev/cgalvan/gitflow_210712_main
Merged stabilization/2106 to main
5 years ago
Chris Galvan 486ba58628 Merged stabilization/2106 to development; Resolved merge conflicts
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
5 years ago
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>
5 years ago
Chris Galvan 837e1c7370
Merge pull request #1764 from aws-lumberyard-dev/cgalvan/gitflow_210702
Merged stabilization/2106 to main
5 years ago
Chris Galvan efcbe2c4a1 Merge remote-tracking branch 'upstream/stabilization/2106' into cgalvan/gitflow_210702
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
5 years ago
Alex Peterson d30de01752
Updating LFS config to new endpoint (#1624)
Signed-off-by: AMZN-alexpete
5 years ago

@ -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.

Loading…
Cancel
Save