scspaldi 414bbb5b2a Handled merge conflict. ...

Signed-off-by: scspaldi <scspaldi@amazon.com>

2021-07-19 11:50:36 -07:00

..

Achievements

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

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

AssetMemoryAnalyzer

Merge pull request #2235 from aws-lumberyard-dev/daimini/gitflow_210716_o3de

2021-07-16 17:50:44 -05:00

AssetValidation

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

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

Atom

Merge pull request #1250 from aws-lumberyard-dev/lawalfua/commonToolsApplication

2021-07-19 13:32:09 -05:00

AtomContent

Merge pull request #2235 from aws-lumberyard-dev/daimini/gitflow_210716_o3de

2021-07-16 17:50:44 -05:00

AtomLyIntegration

ATOM-15935 Adding draw to pass support to DynamicDrawContext (#2248)

2021-07-19 10:03:59 -07:00

AtomTressFX

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

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

AudioEngineWwise

Merge pull request #2235 from aws-lumberyard-dev/daimini/gitflow_210716_o3de

2021-07-16 17:50:44 -05:00

AudioSystem

Merge pull request #2235 from aws-lumberyard-dev/daimini/gitflow_210716_o3de

2021-07-16 17:50:44 -05:00

AWSClientAuth

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

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

AWSCore

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

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

AWSGameLift

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

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

AWSMetrics

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

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

Blast

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

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

Camera

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

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

CameraFramework

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

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

CertificateManager

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

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

CrashReporting

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

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

CustomAssetExample

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

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

DebugDraw

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

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

DevTextures

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

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

EditorPythonBindings

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

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

EMotionFX

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

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

ExpressionEvaluation

Merge pull request #2235 from aws-lumberyard-dev/daimini/gitflow_210716_o3de

2021-07-16 17:50:44 -05:00

FastNoise

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

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

GameState

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

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

GameStateSamples

Merge pull request #2235 from aws-lumberyard-dev/daimini/gitflow_210716_o3de

2021-07-16 17:50:44 -05:00

Gestures

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

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

GradientSignal

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

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

GraphCanvas

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

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

GraphModel

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

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

HttpRequestor

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

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

ImGui

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

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

InAppPurchases

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

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

LandscapeCanvas

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

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

LmbrCentral

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

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

LocalUser

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

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

LyShine

ATOM-15935 Adding draw to pass support to DynamicDrawContext (#2248)

2021-07-19 10:03:59 -07:00

LyShineExamples

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

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

Maestro

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

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

MessagePopup

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

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

Metastream

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

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

Microphone

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

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

Multiplayer

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

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

MultiplayerCompression

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

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

NvCloth

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

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

PBSreferenceMaterials

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

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

PhysX

UI tweaks of the physics doc link widget (#2259)

2021-07-19 17:25:23 +01:00

PhysXDebug

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

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

PhysXSamples

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

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

Prefab

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

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

Presence

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

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

PrimitiveAssets

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

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

PythonAssetBuilder

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

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

QtForPython

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

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

RADTelemetry

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

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

SaveData

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

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

SceneLoggingExample

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

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

SceneProcessing

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

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

ScriptCanvas

Merge pull request #2235 from aws-lumberyard-dev/daimini/gitflow_210716_o3de

2021-07-16 17:50:44 -05:00

ScriptCanvasDeveloper

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

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

ScriptCanvasPhysics

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

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

ScriptCanvasTesting

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

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

ScriptedEntityTweener

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

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

ScriptEvents

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

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

SliceFavorites

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

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

StartingPointCamera

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

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

StartingPointInput

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

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

StartingPointMovement

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

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

SurfaceData

Merge pull request #2235 from aws-lumberyard-dev/daimini/gitflow_210716_o3de

2021-07-16 17:50:44 -05:00

TestAssetBuilder

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

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

TextureAtlas

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

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

TickBusOrderViewer

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

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

Twitch

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

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

UiBasics

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

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

Vegetation

Adjust debug text sizing for Vegetation Debugger in viewport. (#2183)

2021-07-16 17:49:33 -05:00

VideoPlaybackFramework

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

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

VirtualGamepad

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

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

WhiteBox

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

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