phistere 0a8621ba0a Merge branch 'main' into ly-as-sdk/LYN-2948

2021-05-16 11:51:00 -05:00

..

Animations

Integrating latest 47acbe8

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

Assets

{LYN-3787} Fix for infinite loop in the scene builder's import phase (#747)

2021-05-13 17:50:02 -05:00

Config

Integrating github/staging through commit ab87ed9

2021-04-09 11:27:37 -07:00

Editor/Scripts

Set scripts to be executable

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

Fonts

Integrating latest 47acbe8

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

Gem

Merge pull request #613 from aws-lumberyard-dev/SPEC-6690

2021-05-13 11:37:25 -05:00

Levels

removed spacings in CMakeList and removed the tags.txt file in the prefab level

2021-05-12 16:27:51 -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

Integrating latest 47acbe8

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

Materials

Integrating github/staging through commit ab87ed9

2021-04-09 11:27:37 -07:00

Objects

Include Meshes in all Actor assets in the AutomatedTesting project (#182)

2021-04-23 12:13:08 -07:00

physicssurfaces

Integrating up through commit 90f050496

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

Registry

(cherry-pick from 1.0) Fix registry colliding by using a different extension for the files used to override registry

2021-05-06 11:39:19 +01:00

ScriptCanvas

test_ScriptEvents_ReturnSetTypeSuccessfully

2021-05-06 15:07:35 +05:30

ShaderLib

Removed RayTracingSceneSrg.srgi from AutomatedTesting

2021-05-01 16:02:06 -07:00

Shaders

Integrating github/staging through commit ab87ed9

2021-04-09 11:27:37 -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

test_ScriptEvents_ReturnSetTypeSuccessfully

2021-05-06 15:07:35 +05:30

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

Updating the AutomatedTesting project to support being built as an External Project

2021-04-13 19:35:59 -05:00

default.blastconfiguration

Reenable Blast Automated tests (#42)

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

EngineFinder.cmake

Fixing runtime dependencies (including qt deploy). Running AP/Editor again

2021-05-10 14:55:03 -07:00

game.cfg

Fixed All Physics automated tests (#129)

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

preview.png

Integrating latest 47acbe8

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

project.json

Integrating latest 47acbe8

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

surfacetypemateriallibrary.physmaterial

Integrating latest 47acbe8

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

test1.lua

Integrating latest 47acbe8

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

test2.lua

Integrating latest 47acbe8

2021-03-25 13:57:57 -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