You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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		5 years ago
..
build	Merge branch 'stabilization/2106' into mbalfour/gitflow_210622	5 years ago
bundler	Renamed osx_gl to mac and es3 to android for cache folders (#949)	5 years ago
commit_validation	Remove legacy serialization and QPropertyTree (#684)	5 years ago
ctest	LYN-3244 Remove ebp_sanity_smoke_no_gpu (#1386)	5 years ago
detect_file_changes	Set scripts to be executable	5 years ago
migration	add copyright notice	5 years ago
o3de	Merge remote-tracking branch 'upstream/stabilization/2106' into nvsickle/MergeStabilizationJun18	5 years ago
scrubbing	Inclusive language edit	5 years ago
CMakeLists.txt	Removing the Pyside implementation of the project manager python scripts (#1112)	5 years ago
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	5 years ago
o3de.py	Adding CLI script for modifying project properties (LYN-3918). Updating O3de to support it.	5 years ago
o3de.sh	O3de updates restricted download (#229)	5 years ago