Gene Walters d2da35aec3 merging latest dev + resolving 1 conflict ...

Signed-off-by: Gene Walters <genewalt@amazon.com>

2021-10-06 16:55:58 -07:00

..

Animations

Cleaning motion asset infos (#2197)

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

Assets

Standarization: Python files

2021-09-05 22:19:57 +02:00

Config

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

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

Editor/Scripts

Squashed commit of Procedural Prefab work (#4481)

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

Fonts

Integrating latest 47acbe8

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

Gem

merging latest dev + resolving 1 conflict

2021-10-06 16:55:58 -07:00

Levels

merging latest dev + resolving 1 conflict

2021-10-06 16:55:58 -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

multiple_mesh_one_material

Squashed commit of Procedural Prefab work (#4481)

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

Objects

Jack remains in A-pose while it's animation is playing (#3038)

2021-08-12 09:07:04 +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

Fixed PhysX and Blast creation of default config files (#4497)

2021-10-06 09:46:04 +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

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

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

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