birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
f1b688f435e9c6dfde77060bb759af8d7c013f92
o3de/Gems
T
History
pappeste f1b688f435 Merge branch 'main' into ly-as-sdk/LYN-2948 
# Conflicts:
#	CMakeLists.txt
#	Code/Tools/ProjectManager/Source/GemCatalog/GemInfo.h
#	Gems/AtomLyIntegration/AtomViewportDisplayInfo/gem.json
#	cmake/LYWrappers.cmake
#	cmake/SettingsRegistry.cmake
#	scripts/o3de/tests/unit_test_current_project.py
2021-05-27 10:29:19 -07:00
..
Achievements
The new gem registration and usage system
2021-05-20 10:47:03 -07:00
AssetMemoryAnalyzer
The new gem registration and usage system
2021-05-20 10:47:03 -07:00
AssetValidation
Merge branch 'main' into ly-as-sdk/LYN-2948
2021-05-27 10:29:19 -07:00
Atom
Merge branch 'main' into ly-as-sdk/LYN-2948
2021-05-27 10:29:19 -07:00
AtomContent
Adding empty CMakeLists.txt to Asset only gems to fit the new definition
2021-05-21 03:24:13 -05:00
AtomLyIntegration
Merge branch 'main' into ly-as-sdk/LYN-2948
2021-05-27 10:29:19 -07:00
AtomTressFX
Adding empty CMakeLists.txt to Asset only gems to fit the new definition
2021-05-21 03:24:13 -05:00
AudioEngineWwise
Merge branch 'main' into ly-as-sdk/LYN-2948
2021-05-27 10:29:19 -07:00
AudioSystem
Merge remote-tracking branch 'origin/lawsonamzn_prototype_gem_naming_conventions' into ly-as-sdk/LYN-2948-phistere
2021-05-26 00:38:51 -05:00
AutomatedLauncherTesting
Merge remote-tracking branch 'origin/lawsonamzn_prototype_gem_naming_conventions' into ly-as-sdk/LYN-2948-phistere
2021-05-26 00:38:51 -05:00
AWSClientAuth
Merge remote-tracking branch 'origin/ly-as-sdk/LYN-2948-phistere' into ly-as-sdk/LYN-2948
2021-05-26 09:06:49 -07:00
AWSCore
Merge remote-tracking branch 'origin/lawsonamzn_prototype_gem_naming_conventions' into ly-as-sdk/LYN-2948-phistere
2021-05-26 00:38:51 -05:00
AWSMetrics
Merge remote-tracking branch 'origin/lawsonamzn_prototype_gem_naming_conventions' into ly-as-sdk/LYN-2948-phistere
2021-05-26 00:38:51 -05:00
Blast
Merge branch 'main' into ly-as-sdk/LYN-2948
2021-05-27 10:29:19 -07:00
Camera
The new gem registration and usage system
2021-05-20 10:47:03 -07:00
CameraFramework
The new gem registration and usage system
2021-05-20 10:47:03 -07:00
CertificateManager
The new gem registration and usage system
2021-05-20 10:47:03 -07:00
CrashReporting
The new gem registration and usage system
2021-05-20 10:47:03 -07:00
CustomAssetExample
The new gem registration and usage system
2021-05-20 10:47:03 -07:00
DebugDraw
Merge branch 'main' into ly-as-sdk/LYN-2948
2021-05-27 10:29:19 -07:00
DevTextures
Adding empty CMakeLists.txt to Asset only gems to fit the new definition
2021-05-21 03:24:13 -05:00
EditorPythonBindings
Merge branch 'main' into ly-as-sdk/LYN-2948
2021-05-27 10:29:19 -07:00
EMotionFX
Merge branch 'main' into ly-as-sdk/LYN-2948
2021-05-27 10:29:19 -07:00
ExpressionEvaluation
The new gem registration and usage system
2021-05-20 10:47:03 -07:00
FastNoise
Merge remote-tracking branch 'origin/lawsonamzn_prototype_gem_naming_conventions' into ly-as-sdk/LYN-2948-phistere
2021-05-26 00:38:51 -05:00
GameState
The new gem registration and usage system
2021-05-20 10:47:03 -07:00
GameStateSamples
Merge remote-tracking branch 'origin/lawsonamzn_prototype_gem_naming_conventions' into ly-as-sdk/LYN-2948-phistere
2021-05-26 00:38:51 -05:00
Gestures
The new gem registration and usage system
2021-05-20 10:47:03 -07:00
GradientSignal
Merge remote-tracking branch 'origin/lawsonamzn_prototype_gem_naming_conventions' into ly-as-sdk/LYN-2948-phistere
2021-05-26 00:38:51 -05:00
GraphCanvas
Merge remote-tracking branch 'origin/lawsonamzn_prototype_gem_naming_conventions' into ly-as-sdk/LYN-2948-phistere
2021-05-26 00:38:51 -05:00
GraphModel
The new gem registration and usage system
2021-05-20 10:47:03 -07:00
HttpRequestor
The new gem registration and usage system
2021-05-20 10:47:03 -07:00
ImGui
Merge remote-tracking branch 'origin/lawsonamzn_prototype_gem_naming_conventions' into ly-as-sdk/LYN-2948-phistere
2021-05-26 00:38:51 -05:00
InAppPurchases
The new gem registration and usage system
2021-05-20 10:47:03 -07:00
LandscapeCanvas
Merge remote-tracking branch 'origin/lawsonamzn_prototype_gem_naming_conventions' into ly-as-sdk/LYN-2948-phistere
2021-05-26 00:38:51 -05:00
LmbrCentral
Merge branch 'main' into ly-as-sdk/LYN-2948
2021-05-27 10:29:19 -07:00
LocalUser
The new gem registration and usage system
2021-05-20 10:47:03 -07:00
LyShine
Merge branch 'main' into ly-as-sdk/LYN-2948
2021-05-27 10:29:19 -07:00
LyShineExamples
Merge branch 'main' into ly-as-sdk/LYN-2948
2021-05-27 10:29:19 -07:00
Maestro
Merge remote-tracking branch 'origin/lawsonamzn_prototype_gem_naming_conventions' into ly-as-sdk/LYN-2948-phistere
2021-05-26 00:38:51 -05:00
MessagePopup
The new gem registration and usage system
2021-05-20 10:47:03 -07:00
Metastream
The new gem registration and usage system
2021-05-20 10:47:03 -07:00
Microphone
The new gem registration and usage system
2021-05-20 10:47:03 -07:00
Multiplayer
Merge branch 'main' into ly-as-sdk/LYN-2948
2021-05-27 10:29:19 -07:00
MultiplayerCompression
The new gem registration and usage system
2021-05-20 10:47:03 -07:00
NvCloth
Merge branch 'main' into ly-as-sdk/LYN-2948
2021-05-27 10:29:19 -07:00
PBSreferenceMaterials
Merge branch 'main' into ly-as-sdk/LYN-2948
2021-05-27 10:29:19 -07:00
PhysicsEntities
Adding empty CMakeLists.txt to Asset only gems to fit the new definition
2021-05-21 03:24:13 -05:00
PhysX
Merge branch 'main' into ly-as-sdk/LYN-2948
2021-05-27 10:29:19 -07:00
PhysXDebug
Merge remote-tracking branch 'origin/lawsonamzn_prototype_gem_naming_conventions' into ly-as-sdk/LYN-2948-phistere
2021-05-26 00:38:51 -05:00
PhysXSamples
Merge branch 'main' into ly-as-sdk/LYN-2948
2021-05-27 10:29:19 -07:00
Prefab
Merge branch 'main' into ly-as-sdk/LYN-2948
2021-05-27 10:29:19 -07:00
Presence
The new gem registration and usage system
2021-05-20 10:47:03 -07:00
PrimitiveAssets
Adding empty CMakeLists.txt to Asset only gems to fit the new definition
2021-05-21 03:24:13 -05:00
PythonAssetBuilder
The new gem registration and usage system
2021-05-20 10:47:03 -07:00
QtForPython
The new gem registration and usage system
2021-05-20 10:47:03 -07:00
RADTelemetry
The new gem registration and usage system
2021-05-20 10:47:03 -07:00
SaveData
The new gem registration and usage system
2021-05-20 10:47:03 -07:00
SceneLoggingExample
The new gem registration and usage system
2021-05-20 10:47:03 -07:00
SceneProcessing
Merge branch 'main' into ly-as-sdk/LYN-2948
2021-05-27 10:29:19 -07:00
ScriptCanvas
Merge remote-tracking branch 'origin/lawsonamzn_prototype_gem_naming_conventions' into ly-as-sdk/LYN-2948-phistere
2021-05-26 00:38:51 -05:00
ScriptCanvasDeveloper
Merge remote-tracking branch 'origin/lawsonamzn_prototype_gem_naming_conventions' into ly-as-sdk/LYN-2948-phistere
2021-05-26 00:38:51 -05:00
ScriptCanvasPhysics
Merge remote-tracking branch 'origin/lawsonamzn_prototype_gem_naming_conventions' into ly-as-sdk/LYN-2948-phistere
2021-05-26 00:38:51 -05:00
ScriptCanvasTesting
Merge remote-tracking branch 'origin/lawsonamzn_prototype_gem_naming_conventions' into ly-as-sdk/LYN-2948-phistere
2021-05-26 00:38:51 -05:00
ScriptedEntityTweener
The new gem registration and usage system
2021-05-20 10:47:03 -07:00
ScriptEvents
The new gem registration and usage system
2021-05-20 10:47:03 -07:00
SliceFavorites
The new gem registration and usage system
2021-05-20 10:47:03 -07:00
StartingPointCamera
Merge remote-tracking branch 'origin/lawsonamzn_prototype_gem_naming_conventions' into ly-as-sdk/LYN-2948-phistere
2021-05-26 00:38:51 -05:00
StartingPointInput
Merge remote-tracking branch 'origin/lawsonamzn_prototype_gem_naming_conventions' into ly-as-sdk/LYN-2948-phistere
2021-05-26 00:38:51 -05:00
StartingPointMovement
The new gem registration and usage system
2021-05-20 10:47:03 -07:00
SurfaceData
Merge remote-tracking branch 'origin/lawsonamzn_prototype_gem_naming_conventions' into ly-as-sdk/LYN-2948-phistere
2021-05-26 00:38:51 -05:00
TestAssetBuilder
The new gem registration and usage system
2021-05-20 10:47:03 -07:00
TextureAtlas
Simplified the o3de package gem enable/disable logic
2021-05-26 04:46:16 -05:00
TickBusOrderViewer
The new gem registration and usage system
2021-05-20 10:47:03 -07:00
Twitch
Merge remote-tracking branch 'origin/lawsonamzn_prototype_gem_naming_conventions' into ly-as-sdk/LYN-2948-phistere
2021-05-26 00:38:51 -05:00
UiBasics
Merge branch 'main' into ly-as-sdk/LYN-2948
2021-05-27 10:29:19 -07:00
Vegetation
Merge branch 'main' into ly-as-sdk/LYN-2948
2021-05-27 10:29:19 -07:00
Vegetation_Gem_Assets
Adding empty CMakeLists.txt to Asset only gems to fit the new definition
2021-05-21 03:24:13 -05:00
VideoPlaybackFramework
The new gem registration and usage system
2021-05-20 10:47:03 -07:00
VirtualGamepad
The new gem registration and usage system
2021-05-20 10:47:03 -07:00
WhiteBox
Merge branch 'main' into ly-as-sdk/LYN-2948
2021-05-27 10:29:19 -07:00