birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
03cf71b12d7322ac15e6dbcf9a00cdaef4e8ecea
o3de/Gems
T
History
Esteban Papp e28d04aea6 Merge branch 'development' into cmake/SPEC-7484 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Editor/CryEditDoc.cpp
#	Code/Editor/CryEditDoc.h
#	Code/Legacy/CryCommon/CryArray.h
#	Code/Legacy/CryCommon/CryString.h
#	Code/Legacy/CryCommon/UnicodeBinding.h
#	Code/Legacy/CrySystem/LocalizedStringManager.cpp
#	Gems/LyShine/Code/Source/StringUtfUtils.h
#	Gems/PhysXDebug/Code/Source/SystemComponent.cpp
2021-08-05 20:05:25 -07:00
..
Achievements
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
AssetMemoryAnalyzer
AssetMemoryAnalyzer
2021-07-27 19:29:14 -07:00
AssetValidation
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
Atom
Merge branch 'development' into cmake/SPEC-7484
2021-08-05 20:05:25 -07:00
AtomContent
Merge pull request #2235 from aws-lumberyard-dev/daimini/gitflow_210716_o3de
2021-07-16 17:50:44 -05:00
AtomLyIntegration
Merge branch 'development' into cmake/SPEC-7484
2021-08-05 20:05:25 -07:00
AtomTressFX
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
AudioEngineWwise
Don't require a specific version of Wwise SDK, allow for later versions to be used (#2484)
2021-07-27 18:18:03 -05:00
AudioSystem
Fixes resource selectors not showing (#2621)
2021-07-29 14:56:13 -05:00
AWSClientAuth
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
AWSCore
more fixes for w4267
2021-07-27 19:32:11 -07:00
AWSGameLift
Fixes for release builds
2021-07-19 15:48:18 -07:00
AWSMetrics
merging from development + fixing linux
2021-07-27 19:32:07 -07:00
BarrierInput
more fixes for w4267
2021-07-27 19:32:11 -07:00
Blast
Merge branch 'development' into cmake/SPEC-7484
2021-08-05 20:05:25 -07:00
Camera
more fixes for w4267
2021-07-27 19:32:11 -07:00
CameraFramework
LYN-4774 Fix missing box icons inside the main Viewport (#2297)
2021-07-21 16:33:04 -07:00
CertificateManager
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
CrashReporting
Gems/Atom builds
2021-07-30 18:53:50 -07:00
CustomAssetExample
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
DebugDraw
LYN-4774 Fix missing box icons inside the main Viewport (#2297)
2021-07-21 16:33:04 -07:00
DevTextures
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
EditorPythonBindings
Debug Trace Messages for Automation queues bus calls. (#2328)
2021-07-23 08:40:03 +01:00
EMotionFX
Merge branch 'development' into cmake/SPEC-7484
2021-08-05 20:05:25 -07:00
ExpressionEvaluation
Merge pull request #2235 from aws-lumberyard-dev/daimini/gitflow_210716_o3de
2021-07-16 17:50:44 -05:00
FastNoise
LYN-4774 Fix missing box icons inside the main Viewport (#2297)
2021-07-21 16:33:04 -07:00
GameState
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
GameStateSamples
Merge branch 'development' into cmake/SPEC-7484
2021-08-05 20:05:25 -07:00
Gestures
Gems/Gestures
2021-08-02 14:04:18 -07:00
GradientSignal
Merge branch 'development' into cmake/SPEC-2513_w4267
2021-08-02 18:03:04 -07:00
GraphCanvas
fix for double asset registration and multiple outs from loop nodes
2021-07-28 16:51:25 -07:00
GraphModel
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
HttpRequestor
Merge branch 'development' into cmake/SPEC-7179
2021-07-16 15:42:37 -07:00
ImGui
Merge branch 'development' into cmake/SPEC-2513_w4267
2021-08-02 18:03:04 -07:00
InAppPurchases
InAppPurchases
2021-07-27 19:30:13 -07:00
LandscapeCanvas
LYN-4774 Fix missing box icons inside the main Viewport (#2297)
2021-07-21 16:33:04 -07:00
LmbrCentral
Merge branch 'development' into cmake/SPEC-7484
2021-08-05 20:05:25 -07:00
LocalUser
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
LyShine
Merge branch 'development' into cmake/SPEC-7484
2021-08-05 20:05:25 -07:00
LyShineExamples
Merge branch 'development' into cmake/SPEC-7179
2021-07-16 15:42:37 -07:00
Maestro
Merge branch 'development' into cmake/SPEC-7484
2021-08-05 20:05:25 -07:00
MessagePopup
MessagePopup
2021-07-27 19:30:37 -07:00
Metastream
Gems\MetaStream
2021-08-02 16:04:46 -07:00
Microphone
Microphone
2021-07-27 19:30:43 -07:00
Multiplayer
Merge branch 'development' into cmake/SPEC-2513_w4267
2021-08-05 14:57:24 -07:00
MultiplayerCompression
MultiplayerCompression
2021-07-27 19:30:55 -07:00
NvCloth
Merge branch 'development' into cmake/SPEC-2513_w4267
2021-08-05 14:57:24 -07:00
PBSreferenceMaterials
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
PhysX
Merge branch 'development' into cmake/SPEC-2513_w4267
2021-08-05 14:57:24 -07:00
PhysXDebug
Merge branch 'development' into cmake/SPEC-7484
2021-08-05 20:05:25 -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
Improve ui object tree to show the actual instance class (#2844)
2021-08-05 12:03:02 +02:00
RADTelemetry
Some var cleanup so it shows better-organized in cmake-gui. Some vars… (#2361)
2021-07-26 14:14:56 -07:00
SaveData
Gems/Atom builds
2021-07-30 18:53:50 -07:00
SceneLoggingExample
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
SceneProcessing
SceneProcessing
2021-07-27 19:31:19 -07:00
ScriptCanvas
Merge branch 'development' into cmake/SPEC-2513_w4267
2021-08-05 14:57:24 -07:00
ScriptCanvasDeveloper
Merge branch 'development' into cmake/SPEC-7179
2021-07-16 15:42:37 -07:00
ScriptCanvasPhysics
Merge branch 'development' into cmake/SPEC-7179
2021-07-16 15:42:37 -07:00
ScriptCanvasTesting
Merge branch 'development' into carlitosan_fix_for
2021-07-28 19:10:59 -07:00
ScriptedEntityTweener
Merge branch 'development' into cmake/SPEC-7179
2021-07-16 15:42:37 -07:00
ScriptEvents
AZStd::ref prevented compiler from using RVO
2021-07-30 19:31:43 +02:00
SliceFavorites
SliceFavorites
2021-07-27 19:31:31 -07:00
StartingPointCamera
Merge branch 'development' into cmake/SPEC-7179
2021-07-16 15:42:37 -07:00
StartingPointInput
Corrected the text message (#2483)
2021-07-27 13:12:36 -05:00
StartingPointMovement
Merge branch 'development' into cmake/SPEC-7179
2021-07-16 15:42:37 -07:00
SurfaceData
SurfaceData
2021-07-27 19:31:37 -07:00
TestAssetBuilder
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
TextureAtlas
Merge branch 'development' into cmake/SPEC-7179
2021-07-16 15:42:37 -07:00
TickBusOrderViewer
Merge branch 'development' into cmake/SPEC-7179
2021-07-16 15:42:37 -07:00
Twitch
Merge branch 'development' into cmake/SPEC-7179
2021-07-16 15:42:37 -07:00
UiBasics
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
Vegetation
Merge branch 'development' into cmake/SPEC-2513_w4267
2021-08-02 18:03:04 -07:00
VideoPlaybackFramework
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
VirtualGamepad
Merge branch 'development' into cmake/SPEC-7179
2021-07-16 15:42:37 -07:00
WhiteBox
Merge branch 'development' into cmake/SPEC-2513_w4267
2021-08-02 18:03:04 -07:00