Merge branch 'development' of https://github.com/o3de/o3de into jckand/DynVegXfailFixes

This commit is contained in:
jckand-amzn
2021-07-08 09:04:26 -05:00
4 changed files with 24 additions and 15 deletions
@@ -1,17 +1,8 @@
---
name: ar_bug_report.md
about: Create a bug for a an issue found in the Automated Review
title: ''
labels: ''
assignees: ''
---
---
name: Automated Review Bug report
about: Create a report when a failure occurs in main branch
title: ''
labels: 'Automated_Review'
title: 'AR Bug Report'
labels: 'needs-triage,kind/bug,kind/automation'
assignees: ''
---
+14
View File
@@ -0,0 +1,14 @@
# Contributing
Welcome to the Open 3D Engine! To learn more about contributing to the [O3DE code repo](README.md), check out the [Contributor's Guide](https://github.com/o3de/community/blob/main/CONTRIBUTING.md).
The [O3DE community repo](https://github.com/o3de/community) contains information about how to get started, how the community organizes, and more.
To contribute, please review our [Code of Conduct](https://github.com/o3de/o3de/blob/development/CODE_OF_CONDUCT.md) first.
## Making contributions with the Developer Certificate of Origin (DCO)
When contributing, your pull requests will require that you have agreed to our DCO found here: [Devloper Certificate of Origin](https://developercertificate.org/)
You can do this by using the -s option in git.
Example: ```git commit -s -m 'my commit message'```
+5 -4
View File
@@ -85,10 +85,11 @@ If you have the Git credential manager core or other credential helpers installe
#### Optional
* WWise - 2019.2.8.7432 minimum: [https://www.audiokinetic.com/download/](https://www.audiokinetic.com/download/)
* Note: This requires registration and installation of a client to download
* You will also need to set a environment variable: `set LY_WWISE_INSTALL_PATH=<path to WWise version>`
* For example: `set LY_WWISE_INSTALL_PATH="C:\Program Files (x86)\Audiokinetic\Wwise 2019.2.8.7432"`
* Wwise - 2021.1.1.7601 minimum: [https://www.audiokinetic.com/download/](https://www.audiokinetic.com/download/)
* Note: This requires registration and installation of a client application to download
* Make sure to select the SDK(C++) component during installation of Wwise
* You will also need to set an environment variable: `set LY_WWISE_INSTALL_PATH=<path to Wwise version>`
* For example: `set LY_WWISE_INSTALL_PATH="C:\Program Files (x86)\Audiokinetic\Wwise 2021.1.1.7601"`
### Quick Start Build Steps
+3
View File
@@ -29,6 +29,9 @@ set(LY_3RDPARTY_PATH "${o3de_default_third_party_path}" CACHE PATH "Path to the
if(LY_3RDPARTY_PATH)
file(TO_CMAKE_PATH ${LY_3RDPARTY_PATH} LY_3RDPARTY_PATH)
if(NOT EXISTS ${LY_3RDPARTY_PATH})
file(MAKE_DIRECTORY ${LY_3RDPARTY_PATH})
endif()
endif()
if(NOT EXISTS ${LY_3RDPARTY_PATH})
message(FATAL_ERROR "3rdParty folder: ${LY_3RDPARTY_PATH} does not exist, call cmake defining a valid LY_3RDPARTY_PATH or use cmake-gui to configure it")