Chris Galvan 0f8ea17235 Merge pull request #3051 from aws-lumberyard-dev/cgalvan/gitflow_210811_dev ...

Merged stabilization/2106 to development

2021-08-11 17:41:29 -05:00

..

Animations

Cleaning motion asset infos (#2197)

2021-07-16 10:19:38 +02:00

Assets

moved default location of surfacetypemateriallibrary.physmaterial (#2786)

2021-08-04 13:10:17 +01:00

Config

Fix resource mappings file names and client auth warnings and asserts. Fix cdk permissions (#1487)

2021-06-22 16:31:46 -07:00

Editor/Scripts

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

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

Fonts

Integrating latest 47acbe8

2021-03-25 13:57:57 -07:00

Gem

Merge pull request #3051 from aws-lumberyard-dev/cgalvan/gitflow_210811_dev

2021-08-11 17:41:29 -05:00

Levels

Create a new automated test for Prefab basic workflows (#2715)

2021-08-11 14:11:26 -07:00

libs

Integrating latest 47acbe8

2021-03-25 13:57:57 -07:00

LightingPresets

ATOM-13950 Material Editor: Removing auto select option from lighting and model presets

2021-04-18 12:12:32 -05:00

LuaScripts

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

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

Materials

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

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

Objects

Cleaning motion asset infos (#2197)

2021-07-16 10:19:38 +02:00

Passes

Reenable support for UI Elements that use Render Targets (#2352)

2021-08-03 10:14:09 -07:00

physicssurfaces

Integrating up through commit 90f050496

2021-04-07 14:03:29 -07:00

Registry

moved default location of surfacetypemateriallibrary.physmaterial (#2786)

2021-08-04 13:10:17 +01:00

ScriptCanvas

Update automation tests for the AWS gems to reduce the run time (#2148)

2021-07-20 13:39:54 -07:00

ShaderLib

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

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

Shaders

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

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

Slices

Updating test asset for DistanceBetweenFilter tests

2021-05-10 15:10:32 -05:00

sounds

Updating to support Wwise SDK 2021.1.1.X (#686)

2021-05-11 15:16:32 -05:00

TestAssets

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

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

textures

Integrating latest 47acbe8

2021-03-25 13:57:57 -07:00

UI

Integrating latest from github/staging

2021-03-26 14:32:02 -07:00

AssetProcessorGamePlatformConfig.setreg

MaterialEditor BasicTests added to AutomatedTesting for AR (#3022)

2021-08-11 12:15:31 -07:00

AutomatedTesting_Dependencies.xml

Integrating latest 47acbe8

2021-03-25 13:57:57 -07:00

CMakeLists.txt

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

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

default.blastconfiguration

Reenable Blast Automated tests (#42)

2021-04-15 16:16:31 +01:00

EngineFinder.cmake

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

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

game.cfg

Fixed All Physics automated tests (#129)

2021-04-26 15:25:34 +01:00

preview.png

Updated Project Manager O3DE Logos with Rotated Squares Version (#1595)

2021-06-25 13:54:02 -07:00

project.json

Integrating latest 47acbe8

2021-03-25 13:57:57 -07:00

test1.lua

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

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

test2.lua

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

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

test123.scriptcanvas

Integrating latest 47acbe8

2021-03-25 13:57:57 -07:00

UtilTest_PhysxConfig_Override.physxconfiguration

Integrating latest 47acbe8

2021-03-25 13:57:57 -07:00