Skip to content

Commit

Permalink
Merge pull request #312 from aws-lumberyard-dev/cgalvan/gitflow_23050…
Browse files Browse the repository at this point in the history
…1_o3de-extras

Merged `stabilization/2305` into `main`
  • Loading branch information
AMZN-alexpete authored May 3, 2023
2 parents c5451aa + 1039e1f commit 8fa1bfd
Show file tree
Hide file tree
Showing 1,264 changed files with 115,405 additions and 495 deletions.
20 changes: 20 additions & 0 deletions .automatedtesting.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"REGISTER_ENGINES": [
],
"REGISTER_PROJECTS": [
"Projects/OpenXRTest"
],
"REGISTER_GEMS": [
"Gems/XR",
"Gems/OpenXRVk"
],
"REGISTER_TEMPLATES": [
"Templates/Multiplayer"
],
"REGISTER_RESTRICTED": [
],
"ENABLE_GEMS": [
"Gems/XR",
"Gems/OpenXRVk"
]
}
3 changes: 3 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -125,3 +125,6 @@ Gems/AtomLyIntegration/CommonFeatures/Assets/Objects/Lucy/Lucy_low.fbx filter=lf
Gems/AtomLyIntegration/CommonFeatures/Assets/Objects/Lucy/.wip/marmoset_bake.tbscene filter=lfs diff=lfs merge=lfs -text
Gems/AtomLyIntegration/CommonFeatures/Assets/Objects/Lucy/.wip/Brass/brass_bake.spp filter=lfs diff=lfs merge=lfs -text
Gems/AtomLyIntegration/CommonFeatures/Assets/Objects/Lucy/.wip/stone/stone_bake.spp filter=lfs diff=lfs merge=lfs -text
Gems/WarehouseAssets/docs/images/*.png filter= diff= merge= -text
Templates/Ros2ProjectTemplate/Screenshots/*.png filter= diff= merge= -text
Templates/Ros2FleetRobotTemplate/Screenshots/*.png filter= diff= merge= -text
36 changes: 36 additions & 0 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
# SIG-Build (@o3de/sig-build-maintainers @o3de/sig-build-reviewers)

# SIG-Content (@o3de/sig-content-maintainers @o3de/sig-content-reviewers)

# SIG-Core (@o3de/sig-core-reviewers @o3de/sig-core-maintainers)

# SIG-Docs-Community

# SIG-Graphics-Audio (@o3de/sig-graphics-audio-maintainers @o3de/sig-graphics-audio-reviewers)

# SIG-Network (@o3de/sig-network-maintainers)
Templates/Multiplayer/ @o3de/sig-network-maintainers

# SIG-Operations

# SIG-Platform (@o3de/sig-platform-reviewers @o3de/sig-platform-maintainers)
Gems/OpenXRVk/ @o3de/sig-platform-reviewers @o3de/sig-platform-maintainers
Gems/XR/ @o3de/sig-platform-reviewers @o3de/sig-platform-maintainers
Projects/OpenXRTest/ @o3de/sig-platform-reviewers @o3de/sig-platform-maintainers

# SIG-Release

# SIG-Security

# SIG-Simulation (@o3de/sig-simulation-reviewers @o3de/sig-simulation-maintainers)
Gems/ROS2/ @o3de/sig-simulation-reviewers @o3de/sig-simulation-maintainers

# SIG-Testing (@o3de/sig-testing-reviewers)

# SIG-UI-UX






20 changes: 20 additions & 0 deletions .github/ISSUE_TEMPLATE/ar_bug_report.md.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
---
name: Automated Review bug report
about: Create an issue for a bug found in the Automated Review
title: 'AR Bug Report'
labels: 'needs-triage,kind/bug,kind/automation'
assignees: ''

---

**Describe the bug**
A clear and concise description of what the bug is.

**Failed Jenkins Job Information:**
The name of the job that failed, job build number, and code snippit of the failure.

**Attachments**
Attach the Jenkins job log as a .txt file and any other relevant information.

**Additional context**
Add any other context about the problem here.
50 changes: 50 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_template.md.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
---
name: Bug report
about: Create a report to help us improve
title: 'Bug Report'
labels: 'needs-triage,needs-sig,kind/bug'

---

**Describe the bug**
A clear and concise description of what the bug is. Try to isolate the issue to help the community to reproduce it easily and increase chances for a fast fix.

**Assets required**
[!Important!] Please provide sample assets needed to reproduce the issue, either as an [attachment](https://docs.github.com/en/get-started/writing-on-github/working-with-advanced-formatting/attaching-files) or as a link to a public asset in Github.

**Steps to reproduce**
Steps to reproduce the behavior:
1. Go to '...'
2. Click on '...'
3. Select attached asset '...'
4. Scroll down to '...'
5. See error

**Expected behavior**
A clear and concise description of what you expected to happen.

**Actual behavior**
A clear and concise description of what actually happened.

**Screenshots/Video**
If applicable, add screenshots and/or a video to help explain your problem.

**Found in Branch**
Name of or link to the branch where the issue occurs.

**Commit ID from [o3de/o3de](https://github.com/o3de/o3de) and [o3de/o3de-extras](https://github.com/o3de/o3de-extras) repositories**
Please provide the SHA/hash that identifies the latest commit from the o3de/o3de and o3de/o3de-extras repository if the issue is reproducible in the development or other official branches.
You can get the commit ID by running the `git rev-parse HEAD` command on your current branch.


**Desktop/Device (please complete the following information):**
- Device: [e.g. PC, Mac, iPhone, Samsung]
- OS: [e.g. Windows, macOS, iOS, Android, Linux, including distribution and version (e. g. Ubuntu 22.04 / Windows 11 22H2)]

- Version [e.g. 10, Monterey, Oreo]
- CPU [e.g. Intel I9-9900k , Ryzen 5900x, ]
- GPU [AMD 6800 XT, NVidia RTX 3090]
- Memory [e.g. 16GB]

**Additional context**
Add any other context about the problem here.
6 changes: 6 additions & 0 deletions .github/ISSUE_TEMPLATE/config.yml.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
blank_issues_enabled: false
contact_links:
- name: Documentation Issues
about: Report issues with the O3DE.org/docs documentation
url: https://github.com/o3de/o3de.org/issues/new/choose

23 changes: 23 additions & 0 deletions .github/ISSUE_TEMPLATE/deprecation_template.md.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
---
name: Deprecation Notice
about: A notice for one or more feature or API deprecations
title: 'Deprecation Notice'
labels: 'needs-triage,needs-sig,kind/deprecation'

---

## Deprecated APIs
List the fully qualified APIs/types. For example, `AZ::Quaternion::SetFromEulerRadians(const Vector3&)`

## Alternatives APIs
List new or updated APIs to replace deprecated API.
For example, use
`Quaternion AZ::Quaternion::CreateFromEulerRadiansXYZ(const Vector3&)`
to repleace
`void AZ::Quaternion::SetFromEulerRadians(const Vector3&)` and `Quaternion AZ::Quaternion::ConvertEulerRadiansToQuaternion(const Vector3&)`

## Last Release
Describe the last release version before this deprecation. For example: `stabilization/2210`

## Additional Context
Add some information about the reasons for the deprecations
20 changes: 20 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
---

name: Feature request
about: Suggest an idea for this project
title: 'Feature Request'
labels: 'needs-triage,needs-sig'

---

**Is your feature request related to a problem? Please describe.**
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]

**Describe the solution you'd like**
A clear and concise description of what you want to happen.

**Describe alternatives you've considered**
A clear and concise description of any alternative solutions or features you've considered.

**Additional context**
Add any other context or screenshots about the feature request here.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,6 @@ _savebackup/
*.swatches
/imgui.ini

# Ignore Oculus OpenXR Mobile SDK files except the README.md file
Gems/OpenXRVk/External/OculusOpenXRMobileSDK/**
!Gems/OpenXRVk/External/OculusOpenXRMobileSDK/README.md
20 changes: 20 additions & 0 deletions Gems/AzQtComponentsForPython/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
#
# Copyright (c) Contributors to the Open 3D Engine Project.
# For complete copyright and license terms please see the LICENSE at the root of this distribution.
#
# SPDX-License-Identifier: Apache-2.0 OR MIT
#
#

# Query the gem name from the gem.json file if possible
# otherwise fallback to using ${Name}
o3de_find_ancestor_gem_root(gempath gem_name "${CMAKE_CURRENT_SOURCE_DIR}")
if (NOT gem_name)
set(gem_name "AzQtComponentsForPython")
endif()

set(gem_path ${CMAKE_CURRENT_LIST_DIR})
set(gem_json ${gem_path}/gem.json)
o3de_restricted_path(${gem_json} gem_restricted_path gem_parent_relative_path)

add_subdirectory(Code)
48 changes: 48 additions & 0 deletions Gems/AzQtComponentsForPython/Code/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
#
# Copyright (c) Contributors to the Open 3D Engine Project.
# For complete copyright and license terms please see the LICENSE at the root of this distribution.
#
# SPDX-License-Identifier: Apache-2.0 OR MIT
#
#

o3de_pal_dir(pal_dir ${CMAKE_CURRENT_LIST_DIR}/Platform/${PAL_PLATFORM_NAME} "${gem_restricted_path}" "${gem_path}" "${gem_parent_relative_path}")

include(${pal_dir}/PAL_${PAL_PLATFORM_NAME_LOWERCASE}.cmake)

if (PAL_TRAIT_AZQTCOMPONENTSFORPYTHON_SUPPORTED)
find_package(Qt5 5.12 REQUIRED COMPONENTS Core Gui Widgets)

# Find the qt package location.
ly_get_package_association("Qt" QT_PACKAGE_NAME)
ly_package_get_target_folder(${QT_PACKAGE_NAME} QT_DOWNLOAD_LOCATION)
set(QT_MODULE_DIR ${QT_DOWNLOAD_LOCATION}/${QT_PACKAGE_NAME}/qt)

# The library we're creating bindings for.
set(AZQTCOMPONENTS_LIBRARY "AzQtComponents")

#Define the shared library for which we will create bindings.
set_property(TARGET ${AZQTCOMPONENTS_LIBRARY} PROPERTY PREFIX "")

add_shiboken_project(
NAME AzQtComponentsForPython
NAMESPACE Gem
MODULE_NAME azqtpyside
WRAPPED_HEADER ${CMAKE_CURRENT_LIST_DIR}/bindings_azqtcomponents.h
TYPESYSTEM_FILE ${CMAKE_CURRENT_LIST_DIR}/bindings_azqtcomponents.xml
GENERATED_FILES ${CMAKE_CURRENT_LIST_DIR}/generated_files.cmake
LICENSE_HEADER ${CMAKE_CURRENT_LIST_DIR}/license_header.txt
DEPENDENCIES
${AZQTCOMPONENTS_LIBRARY}
Gem::EditorPythonBindings.Static
INCLUDE_DIRS
${LY_ROOT_FOLDER}/Code/Framework/AzCore
${LY_ROOT_FOLDER}/Code/Framework/AzQtComponents
${LY_ROOT_FOLDER}/Code/Framework/AzCore/Platform/${PAL_PLATFORM_NAME}
${QT_MODULE_DIR}/include
${QT_MODULE_DIR}/include/QtWidgets
${QT_MODULE_DIR}/include/QtCore
${QT_MODULE_DIR}/include/QtGui
)

endif()
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#
# Copyright (c) Contributors to the Open 3D Engine Project.
# For complete copyright and license terms please see the LICENSE at the root of this distribution.
#
# SPDX-License-Identifier: Apache-2.0 OR MIT
#
#

set(PAL_TRAIT_AZQTCOMPONENTSFORPYTHON_SUPPORTED FALSE)
10 changes: 10 additions & 0 deletions Gems/AzQtComponentsForPython/Code/Platform/Linux/PAL_linux.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
#
# Copyright (c) Contributors to the Open 3D Engine Project.
# For complete copyright and license terms please see the LICENSE at the root of this distribution.
#
# SPDX-License-Identifier: Apache-2.0 OR MIT
#
#

set(PAL_TRAIT_AZQTCOMPONENTSFORPYTHON_SUPPORTED TRUE)

9 changes: 9 additions & 0 deletions Gems/AzQtComponentsForPython/Code/Platform/Mac/PAL_mac.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#
# Copyright (c) Contributors to the Open 3D Engine Project.
# For complete copyright and license terms please see the LICENSE at the root of this distribution.
#
# SPDX-License-Identifier: Apache-2.0 OR MIT
#
#

set(PAL_TRAIT_AZQTCOMPONENTSFORPYTHON_SUPPORTED FALSE)
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#
# Copyright (c) Contributors to the Open 3D Engine Project.
# For complete copyright and license terms please see the LICENSE at the root of this distribution.
#
# SPDX-License-Identifier: Apache-2.0 OR MIT
#
#

set(PAL_TRAIT_AZQTCOMPONENTSFORPYTHON_SUPPORTED TRUE)
9 changes: 9 additions & 0 deletions Gems/AzQtComponentsForPython/Code/Platform/iOS/PAL_ios.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#
# Copyright (c) Contributors to the Open 3D Engine Project.
# For complete copyright and license terms please see the LICENSE at the root of this distribution.
#
# SPDX-License-Identifier: Apache-2.0 OR MIT
#
#

set(PAL_TRAIT_AZQTCOMPONENTSFORPYTHON_SUPPORTED FALSE)
Loading

0 comments on commit 8fa1bfd

Please sign in to comment.