birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
3b1873b0454b3f767c0a43d9cc81d8a97ee83dc6
o3de/Gems
T
History
Chris Galvan 3b1873b045 Merged stabilization/2106 -> development (resolved merge conflicts). 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2021-07-08 13:56:47 -05:00
..
Achievements
Merged conflicts from pulling down latest development
2021-07-02 16:29:27 -05:00
AssetMemoryAnalyzer
Merged conflicts from pulling down latest development
2021-07-02 16:29:27 -05:00
AssetValidation
Merged conflicts from pulling down latest development
2021-07-02 16:29:27 -05:00
Atom
Merged stabilization/2106 -> development (resolved merge conflicts).
2021-07-08 13:56:47 -05:00
AtomContent
Merged conflicts from pulling down latest development
2021-07-02 16:29:27 -05:00
AtomLyIntegration
Merged stabilization/2106 -> development (resolved merge conflicts).
2021-07-08 13:56:47 -05:00
AtomTressFX
Merged conflicts from pulling down latest development
2021-07-02 16:29:27 -05:00
AudioEngineWwise
Merged conflicts from pulling down latest development
2021-07-02 16:29:27 -05:00
AudioSystem
Merged conflicts from pulling down latest development
2021-07-02 16:29:27 -05:00
AutomatedLauncherTesting
Merged conflicts from pulling down latest development
2021-07-02 16:29:27 -05:00
AWSClientAuth
merge stabilization/2106 into development
2021-07-06 17:34:04 +01:00
AWSCore
merge stabilization/2106 into development
2021-07-06 17:34:04 +01:00
AWSGameLift
Merged conflicts from pulling down latest development
2021-07-02 16:29:27 -05:00
AWSMetrics
merge stabilization/2106 into development
2021-07-06 17:34:04 +01:00
Blast
Merged stabilization/2106 -> development (resolved merge conflicts).
2021-07-08 13:56:47 -05:00
Camera
Merged conflicts from pulling down latest development
2021-07-02 16:29:27 -05:00
CameraFramework
Merged conflicts from pulling down latest development
2021-07-02 16:29:27 -05:00
CertificateManager
Merged conflicts from pulling down latest development
2021-07-02 16:29:27 -05:00
CrashReporting
Updated gem.json for all top-level Gems. (#1715) (#1917)
2021-07-07 13:29:33 -05:00
CustomAssetExample
Merged conflicts from pulling down latest development
2021-07-02 16:29:27 -05:00
DebugDraw
Updated gem.json for all top-level Gems. (#1715) (#1917)
2021-07-07 13:29:33 -05:00
DevTextures
Merged conflicts from pulling down latest development
2021-07-02 16:29:27 -05:00
EditorPythonBindings
Merged conflicts from pulling down latest development
2021-07-02 16:29:27 -05:00
EMotionFX
Merged stabilization/2106 -> development (resolved merge conflicts).
2021-07-08 13:56:47 -05:00
ExpressionEvaluation
Merged conflicts from pulling down latest development
2021-07-02 16:29:27 -05:00
FastNoise
Updated gem.json for all top-level Gems. (#1715) (#1917)
2021-07-07 13:29:33 -05:00
GameState
Updated gem.json for all top-level Gems. (#1715) (#1917)
2021-07-07 13:29:33 -05:00
GameStateSamples
Merged conflicts from pulling down latest development
2021-07-02 16:29:27 -05:00
Gestures
Updated gem.json for all top-level Gems. (#1715) (#1917)
2021-07-07 13:29:33 -05:00
GradientSignal
Merged conflicts from pulling down latest development
2021-07-02 16:29:27 -05:00
GraphCanvas
Merge branch 'stabilization/2106' of https://github.com/o3de/o3de into carlitosan/thecleansing
2021-07-07 14:49:23 -07:00
GraphModel
Merge branch 'stabilization/2106' of https://github.com/o3de/o3de into carlitosan/thecleansing
2021-07-07 14:49:23 -07:00
HttpRequestor
Merged conflicts from pulling down latest development
2021-07-02 16:29:27 -05:00
ImGui
Add DPI scaling to IMGUI
2021-07-07 11:51:15 -07:00
InAppPurchases
Merged conflicts from pulling down latest development
2021-07-02 16:29:27 -05:00
LandscapeCanvas
Merged conflicts from pulling down latest development
2021-07-02 16:29:27 -05:00
LmbrCentral
Merged conflicts from pulling down latest development
2021-07-02 16:29:27 -05:00
LocalUser
Merged conflicts from pulling down latest development
2021-07-02 16:29:27 -05:00
LyShine
merge stabilization/2106 into development
2021-07-06 17:34:04 +01:00
LyShineExamples
Merged conflicts from pulling down latest development
2021-07-02 16:29:27 -05:00
Maestro
Updated gem.json for all top-level Gems. (#1715) (#1917)
2021-07-07 13:29:33 -05:00
MessagePopup
Merged conflicts from pulling down latest development
2021-07-02 16:29:27 -05:00
Metastream
Merged conflicts from pulling down latest development
2021-07-02 16:29:27 -05:00
Microphone
merge stabilization/2106 into development
2021-07-06 17:34:04 +01:00
Multiplayer
Merge branch 'stabilization/2106' into hultonha/gitflow_210707_o3de
2021-07-07 16:25:06 +01:00
MultiplayerCompression
Merged conflicts from pulling down latest development
2021-07-02 16:29:27 -05:00
NvCloth
Udating SHA for nvcloth windows package.
2021-07-08 11:55:59 +01:00
PBSreferenceMaterials
Merged conflicts from pulling down latest development
2021-07-02 16:29:27 -05:00
PhysX
Merged stabilization/2106 -> development (resolved merge conflicts).
2021-07-08 13:56:47 -05:00
PhysXDebug
Merged conflicts from pulling down latest development
2021-07-02 16:29:27 -05:00
PhysXSamples
Merged conflicts from pulling down latest development
2021-07-02 16:29:27 -05:00
Prefab
Merged conflicts from pulling down latest development
2021-07-02 16:29:27 -05:00
Presence
Updated gem.json for all top-level Gems. (#1715) (#1917)
2021-07-07 13:29:33 -05:00
PrimitiveAssets
Merged conflicts from pulling down latest development
2021-07-02 16:29:27 -05:00
PythonAssetBuilder
Merged conflicts from pulling down latest development
2021-07-02 16:29:27 -05:00
QtForPython
Merged conflicts from pulling down latest development
2021-07-02 16:29:27 -05:00
RADTelemetry
Merged conflicts from pulling down latest development
2021-07-02 16:29:27 -05:00
SaveData
Updated gem.json for all top-level Gems. (#1715) (#1917)
2021-07-07 13:29:33 -05:00
SceneLoggingExample
Merged conflicts from pulling down latest development
2021-07-02 16:29:27 -05:00
SceneProcessing
Merge branch 'stabilization/2106' into hultonha/gitflow_210707_o3de
2021-07-07 16:25:06 +01:00
ScriptCanvas
Merged stabilization/2106 -> development (resolved merge conflicts).
2021-07-08 13:56:47 -05:00
ScriptCanvasDeveloper
Merge branch 'stabilization/2106' of https://github.com/o3de/o3de into carlitosan/thecleansing
2021-07-07 14:49:23 -07:00
ScriptCanvasPhysics
Merged conflicts from pulling down latest development
2021-07-02 16:29:27 -05:00
ScriptCanvasTesting
Merge branch 'stabilization/2106' of https://github.com/o3de/o3de into carlitosan/thecleansing
2021-07-07 14:49:23 -07:00
ScriptedEntityTweener
Merged conflicts from pulling down latest development
2021-07-02 16:29:27 -05:00
ScriptEvents
Merged conflicts from pulling down latest development
2021-07-02 16:29:27 -05:00
SliceFavorites
Merged conflicts from pulling down latest development
2021-07-02 16:29:27 -05:00
StartingPointCamera
Merged conflicts from pulling down latest development
2021-07-02 16:29:27 -05:00
StartingPointInput
Merge branch 'stabilization/2106' of https://github.com/o3de/o3de into carlitosan/thecleansing
2021-07-07 14:49:23 -07:00
StartingPointMovement
Merged conflicts from pulling down latest development
2021-07-02 16:29:27 -05:00
SurfaceData
Merged conflicts from pulling down latest development
2021-07-02 16:29:27 -05:00
TestAssetBuilder
Merged conflicts from pulling down latest development
2021-07-02 16:29:27 -05:00
TextureAtlas
Merged conflicts from pulling down latest development
2021-07-02 16:29:27 -05:00
TickBusOrderViewer
Merged conflicts from pulling down latest development
2021-07-02 16:29:27 -05:00
Twitch
Updated gem.json for all top-level Gems. (#1715) (#1917)
2021-07-07 13:29:33 -05:00
UiBasics
Updated gem.json for all top-level Gems. (#1715) (#1917)
2021-07-07 13:29:33 -05:00
Vegetation
Fixed Vegetation Debugger to work with Atom rendering and AZ::Console. (#1924)
2021-07-07 16:05:38 -05:00
VideoPlaybackFramework
Merged conflicts from pulling down latest development
2021-07-02 16:29:27 -05:00
VirtualGamepad
Merged conflicts from pulling down latest development
2021-07-02 16:29:27 -05:00
WhiteBox
Merged conflicts from pulling down latest development
2021-07-02 16:29:27 -05:00