Chris Galvan f278bbcd65 Merge pull request #2094 from aws-lumberyard-dev/cgalvan/gitflow_210712 ...

Merged stabilization/2106 to development

2021-07-12 14:05:19 -05:00

..

Animations

Integrating latest 47acbe8

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

Assets

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

2021-05-26 19:17:17 -05: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

Final update copyright headers to reference license files at the repo root (#1693)

2021-06-30 19:51:55 -07:00

Fonts

Integrating latest 47acbe8

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

Gem

Merge pull request #2094 from aws-lumberyard-dev/cgalvan/gitflow_210712

2021-07-12 14:05:19 -05:00

Levels

Merge AWSCore automation tests to the development branch (#2011)

2021-07-09 10:07:02 -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

Final update copyright headers to reference license files at the repo root (#1693)

2021-06-30 19:51:55 -07:00

Materials

Final update copyright headers to reference license files at the repo root (#1693)

2021-06-30 19:51:55 -07:00

Objects

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

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

physicssurfaces

Integrating up through commit 90f050496

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

Registry

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

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

ScriptCanvas

Merge AWSCore automation tests to the development branch (#2011)

2021-07-09 10:07:02 -07:00

ShaderLib

Final update copyright headers to reference license files at the repo root (#1693)

2021-06-30 19:51:55 -07:00

Shaders

Final update copyright headers to reference license files at the repo root (#1693)

2021-06-30 19:51:55 -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

Final update copyright headers to reference license files at the repo root (#1693)

2021-06-30 19:51:55 -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

AutomatedTesting_Dependencies.xml

Integrating latest 47acbe8

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

CMakeLists.txt

Final update copyright headers to reference license files at the repo root (#1693)

2021-06-30 19:51:55 -07:00

default.blastconfiguration

Reenable Blast Automated tests (#42)

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

EngineFinder.cmake

Final update copyright headers to reference license files at the repo root (#1693)

2021-06-30 19:51:55 -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

surfacetypemateriallibrary.physmaterial

Updating default physics material library with the latest materials (#1056)

2021-06-01 15:16:50 +01:00

test1.lua

Final update copyright headers to reference license files at the repo root (#1693)

2021-06-30 19:51:55 -07:00

test2.lua

Final update copyright headers to reference license files at the repo root (#1693)

2021-06-30 19:51:55 -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