mbalfour df648db62e Merge branch 'stabilization/2106' into mbalfour/gitflow_210622 ...

# Conflicts:
#	Code/Framework/AzQtComponents/AzQtComponents/Components/Style.cpp
#	Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ViewportMessages.h
#	Gems/AWSCore/Code/Source/Editor/UI/AWSCoreEditorMenu.cpp

2021-06-22 12:55:18 -05:00

..

build

Merge branch 'stabilization/2106' into mbalfour/gitflow_210622

2021-06-22 12:55:18 -05:00

bundler

Renamed osx_gl to mac and es3 to android for cache folders (#949)

2021-05-26 19:17:17 -05:00

commit_validation

Remove legacy serialization and QPropertyTree (#684)

2021-05-11 09:31:02 -06:00

ctest

LYN-3244 Remove ebp_sanity_smoke_no_gpu (#1386)

2021-06-17 14:36:09 -07:00

detect_file_changes

Set scripts to be executable

2021-03-26 09:26:12 -07:00

migration

add copyright notice

2021-06-21 22:28:50 +01:00

o3de

Merge remote-tracking branch 'upstream/stabilization/2106' into nvsickle/MergeStabilizationJun18

2021-06-18 13:25:53 -07:00

scrubbing

Inclusive language edit

2021-05-25 12:59:24 -07:00

CMakeLists.txt

Removing the Pyside implementation of the project manager python scripts (#1112)

2021-06-03 14:37:16 -05:00

o3de.bat

Surrouding the setting of the BASE_PATH within double quotes in the o3de.bat script. This allows to allow paths with spaces in it leading to the engine root directory to work properly when running the script

2021-05-26 10:40:47 -05:00

o3de.py

Adding CLI script for modifying project properties (LYN-3918). Updating O3de to support it.

2021-06-02 21:56:03 -04:00

o3de.sh

O3de updates restricted download (#229)

2021-05-10 12:03:36 -07:00