Esteban Papp f20d17398c Merge branch 'development' into cmake/linux_fix_warn_unused ...

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Editor/Objects/TrackGizmo.cpp

2021-08-25 14:50:05 -07:00

..

3rdParty

Merge pull request #3338 from aws-lumberyard-dev/santorac/RapidJSON_3rdParty

2021-08-23 09:48:55 -07:00

install

Create RUN target as helpers for the project-centric workflow (#2520) (#2635)

2021-07-29 16:50:50 -07:00

Platform

Merge branch 'development' into cmake/linux_fix_warn_unused

2021-08-25 11:47:19 -07:00

TestImpactFramework

Erase existing artifacts before generation.

2021-08-19 11:16:14 +01:00

Tools

Fix android gradle scripts to prevent cmake_dependencies.<game>.<game>_gamelauncher from being wiped out of the APK

2021-08-13 18:22:40 -07:00

__init__.py

Shorten copyright headers by splitting into 2 lines (#2213)

2021-07-16 15:25:48 -07:00

3rdParty.cmake

Shorten copyright headers by splitting into 2 lines (#2213)

2021-07-16 15:25:48 -07:00

3rdPartyPackages.cmake

Make locations for LY_PACKAGE_DOWNLOAD_CACHE_LOCATION and LY_PACKAGE_UNPACK_LOCATION relative to LY_3RDPARTY_PATH across configurations (#2360)

2021-07-22 16:42:51 -07:00

AzAutoGen.py

Copy jinja/py files to the install folder (#2643)

2021-08-02 13:53:13 -07:00

cmake_files.cmake

fixes after merge

2021-08-12 16:44:01 -07:00

CMakeFiles.cmake

Shorten copyright headers by splitting into 2 lines (#2213)

2021-07-16 15:25:48 -07:00

CommandExecution.cmake

Shorten copyright headers by splitting into 2 lines (#2213)

2021-07-16 15:25:48 -07:00

Configurations.cmake

Allowing to build with ASan enabled

2021-08-12 14:36:32 -07:00

createplatformfiles.py

Shorten copyright headers by splitting into 2 lines (#2213)

2021-07-16 15:25:48 -07:00

Dependencies.cmake

Shorten copyright headers by splitting into 2 lines (#2213)

2021-07-16 15:25:48 -07:00

Deployment.cmake

Some var cleanup so it shows better-organized in cmake-gui. Some vars… (#2361)

2021-07-26 14:14:56 -07:00

EngineJson.cmake

Some var cleanup so it shows better-organized in cmake-gui. Some vars… (#2361)

2021-07-26 14:14:56 -07:00

FileUtil.cmake

Some var cleanup so it shows better-organized in cmake-gui. Some vars… (#2361)

2021-07-26 14:14:56 -07:00

Findo3de.cmake

Fix an issue with project-centric ninja builds [Linux] (#3429)

2021-08-25 12:16:40 -07:00

gemcmake.py

Shorten copyright headers by splitting into 2 lines (#2213)

2021-07-16 15:25:48 -07:00

Gems.cmake

Merge pull request #2235 from aws-lumberyard-dev/daimini/gitflow_210716_o3de

2021-07-16 17:50:44 -05:00

GeneralSettings.cmake

Shorten copyright headers by splitting into 2 lines (#2213)

2021-07-16 15:25:48 -07:00

Install.cmake

CMakeLists.txt frrom templates are not being installed (#3456)

2021-08-25 12:12:36 -07:00

LyAutoGen.cmake

Copy jinja/py files to the install folder (#2643)

2021-08-02 13:53:13 -07:00

LYPackage_S3Downloader.cmake

Shorten copyright headers by splitting into 2 lines (#2213)

2021-07-16 15:25:48 -07:00

LYPython.cmake

Fixed cmake Python so it correctly reinstalls a local python package if its setup.py changes

2021-07-20 23:16:09 +02:00

LySet.cmake

Shorten copyright headers by splitting into 2 lines (#2213)

2021-07-16 15:25:48 -07:00

LYTestWrappers.cmake

Fixes a nightly build and a CMake warning (#2941)

2021-08-10 14:05:14 -07:00

LYWrappers.cmake

Change LY_UNITY_BUILD default to "ON" (#3244)

2021-08-17 12:05:51 -07:00

mocfix.py

Shorten copyright headers by splitting into 2 lines (#2213)

2021-07-16 15:25:48 -07:00

Monolithic.cmake

Shorten copyright headers by splitting into 2 lines (#2213)

2021-07-16 15:25:48 -07:00

O3DEJson.cmake

Some var cleanup so it shows better-organized in cmake-gui. Some vars… (#2361)

2021-07-26 14:14:56 -07:00

OutputDirectory.cmake

Shorten copyright headers by splitting into 2 lines (#2213)

2021-07-16 15:25:48 -07:00

Packaging.cmake

Resolved conflicts in merge from stabilization/2106 -> development.

2021-08-11 15:33:50 -05:00

PackagingConfig.cmake

Shorten copyright headers by splitting into 2 lines (#2213)

2021-07-16 15:25:48 -07:00

PAL.cmake

Shorten copyright headers by splitting into 2 lines (#2213)

2021-07-16 15:25:48 -07:00

PALTools.cmake

Shorten copyright headers by splitting into 2 lines (#2213)

2021-07-16 15:25:48 -07:00

projectcmake.py

Shorten copyright headers by splitting into 2 lines (#2213)

2021-07-16 15:25:48 -07:00

Projects.cmake

Shorten copyright headers by splitting into 2 lines (#2213)

2021-07-16 15:25:48 -07:00

reroot.py

Shorten copyright headers by splitting into 2 lines (#2213)

2021-07-16 15:25:48 -07:00

RuntimeDependencies.cmake

Shorten copyright headers by splitting into 2 lines (#2213)

2021-07-16 15:25:48 -07:00

SettingsRegistry.cmake

Create RUN target as helpers for the project-centric workflow (#2520) (#2635)

2021-07-29 16:50:50 -07:00

UnitTest.cmake

Shorten copyright headers by splitting into 2 lines (#2213)

2021-07-16 15:25:48 -07:00

Version.cmake

Shorten copyright headers by splitting into 2 lines (#2213)

2021-07-16 15:25:48 -07:00

waffiles2cmake.py

Shorten copyright headers by splitting into 2 lines (#2213)

2021-07-16 15:25:48 -07:00

warn_fix.py

Shorten copyright headers by splitting into 2 lines (#2213)

2021-07-16 15:25:48 -07:00