Tommy Walton 8887b55fc8 Merge commit 'c44d03a40df0899851c6cbd929a673fac48ce82b' into amzn-tommy/gitflow_211116_o3de2 ...

Signed-off-by: Tommy Walton <waltont@amazon.com>

2021-11-16 12:53:42 -08:00

..

Animations

Cleaning motion asset infos (#2197)

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

Assets

Fixed casing of all .fbx.assetinfo files to match their .fbx (#5490)

2021-11-11 09:31:28 +00:00

Config

Hair - Adding the Hair Gem to the automated testing (#4498)

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

Editor/Scripts

[profiler_capture_api] added trailing newlines to a couple new files

2021-10-28 14:39:17 -07:00

Fonts

…

Gem

Merge commit 'c44d03a40df0899851c6cbd929a673fac48ce82b' into amzn-tommy/gitflow_211116_o3de2

2021-11-16 12:53:42 -08:00

Levels

Merge remote-tracking branch 'upstream/stabilization/2110' into nvsickle/StabToDevNov21

2021-11-11 10:15:52 -08:00

libs

…

LightingPresets

…

LuaScripts

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

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

Materials

Made material property auto-rename procedure apply to Material Component at runtime. This ensures that an material property overrides and any gameplay scripts that work with property overrides can get the benefit of the material type version update procedure.

2021-10-28 09:44:32 -07:00

multiple_mesh_one_material

Squashed commit of Procedural Prefab work (#4481)

2021-10-06 07:14:38 -05:00

Objects

Move wrinkle mask data out of default object srg (#4578)

2021-10-14 08:58:50 -07:00

Passes

AutomatedTesting - adding Hair to MainPipeline (#5200)

2021-11-02 15:38:38 -04:00

physicssurfaces

…

Registry

Deleted PhysXSamples gem (#4753)

2021-10-18 12:53:16 +01:00

ScriptCanvas

Fixed Physics SC tests (#4001)

2021-09-09 09:32:43 +02:00

ShaderLib

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

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

Slices

…

sounds

…

TestAssets

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

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

textures

ATOM-16575 clean up image builder presets files (#4611)

2021-10-11 15:18:39 -07:00

UI

…

AssetProcessorGamePlatformConfig.setreg

MaterialEditor BasicTests added to AutomatedTesting for AR (#3022)

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

AutomatedTesting_Dependencies.xml

Archive Component - Rewrite and additional work on Archive and Asset Bundler (#4332)

2021-10-01 10:15:16 -05:00

CMakeLists.txt

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

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

default.blastconfiguration

…

EngineFinder.cmake

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

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

game.cfg

…

preview.png

…

project.json

…

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

…

UtilTest_PhysxConfig_Override.physxconfiguration

…