birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
abce15ea20fc31e8b20171a53c9046148ee71d13
o3de/Gems
T
History
Chris Santora c371c3a6cd Merge pull request #304 from aws-lumberyard-dev/Atom/santorac/ShaderCollectionItemFixMain-LYN-2905 
Cherrypicked the fix from the 1.0 branch to main (see #301).

Added a check for m_shaderAsset.IsReady() before trying to use the asset data. Also added a check before calling BlockUntilLoadComplete() to prevent reporting an error message unnecessarily.

Set the reflection name for ShaderCollection::Item to "ShaderCollectionItem" so it doesn't show up as just "Item" in Script Canvas.
2021-05-04 17:56:08 -07:00
..
Achievements
Integrating github/staging through commit ab87ed9
2021-04-09 11:27:37 -07:00
AssetMemoryAnalyzer
Red code legacy renderer (#383)
2021-04-30 07:31:42 -06:00
AssetValidation
LYN-2537 AssetBundler updates (#426)
2021-05-03 20:09:37 -05:00
Atom
Merge pull request #304 from aws-lumberyard-dev/Atom/santorac/ShaderCollectionItemFixMain-LYN-2905
2021-05-04 17:56:08 -07:00
AtomContent
Add newlines to the end of all files
2021-04-23 09:43:40 -07:00
AtomLyIntegration
Merge pull request #537 from aws-lumberyard-dev/Atom/dmcdiar/LYN-3256
2021-05-04 14:05:11 -07:00
AtomTressFX
Set scripts to be executable
2021-03-26 09:26:12 -07:00
AudioEngineWwise
SPEC-6565 Cleanup paths to Tools/Python
2021-04-28 13:33:37 -07:00
AudioSystem
LYN-2537 engine assets (#254)
2021-04-28 21:38:43 -05:00
AutomatedLauncherTesting
Integrating latest from github/staging
2021-03-26 14:32:02 -07:00
AWSClientAuth
lyn2919: Update all references to O3DE
2021-04-30 15:59:49 -07:00
AWSCore
Merge pull request #497 from aws-lumberyard-dev/lyn2919
2021-05-04 09:21:48 -07:00
AWSMetrics
lyn2919: Update all references to O3DE
2021-04-30 15:59:49 -07:00
Blast
Removed legacy render components (#421)
2021-04-30 15:05:10 -05:00
Camera
Add newlines to the end of all files
2021-04-23 09:43:40 -07:00
CameraFramework
Add newlines to the end of all files
2021-04-23 09:43:40 -07:00
CertificateManager
Add newlines to the end of all files
2021-04-23 09:43:40 -07:00
CrashReporting
[SPEC-6071][Crashpad] Make Crashpad available through 3rdParty system for Windows
2021-04-27 09:48:50 -07:00
CustomAssetExample
Integrating github/staging through commit 5f214be
2021-04-13 17:18:57 -07:00
DebugDraw
LYN-2537 engine assets (#254)
2021-04-28 21:38:43 -05:00
DevTextures
Integrating latest 47acbe8
2021-03-25 13:57:57 -07:00
EditorPythonBindings
{LYN-2185} Helios - Added GraphObjectProxy::GetMethodList() function (#392)
2021-05-04 12:55:47 -05:00
EMotionFX
Merged main in
2021-05-04 10:13:50 -05:00
ExpressionEvaluation
Add newlines to the end of all files
2021-04-23 09:43:40 -07:00
FastNoise
Add newlines to the end of all files
2021-04-23 09:43:40 -07:00
GameEffectSystem
Add newlines to the end of all files
2021-04-23 09:43:40 -07:00
GameState
Add newlines to the end of all files
2021-04-23 09:43:40 -07:00
GameStateSamples
Add newlines to the end of all files
2021-04-23 09:43:40 -07:00
Gestures
Add newlines to the end of all files
2021-04-23 09:43:40 -07:00
GradientSignal
Minor compile warning cleanup
2021-05-03 16:33:06 -05:00
GraphCanvas
LYN-2537 engine assets (#254)
2021-04-28 21:38:43 -05:00
GraphModel
Add newlines to the end of all files
2021-04-23 09:43:40 -07:00
HttpRequestor
Add newlines to the end of all files
2021-04-23 09:43:40 -07:00
ImageProcessing
LYN-2537 engine assets (#254)
2021-04-28 21:38:43 -05:00
ImGui
Merged main in
2021-05-04 10:13:50 -05:00
InAppPurchases
Add newlines to the end of all files
2021-04-23 09:43:40 -07:00
LandscapeCanvas
Add newlines to the end of all files
2021-04-23 09:43:40 -07:00
LmbrCentral
Legacy Mesh component removal
2021-05-03 17:17:18 -05:00
LocalUser
Integrating latest from github/staging
2021-03-26 14:32:02 -07:00
LyShine
Merge pull request #528 from aws-lumberyard-dev/cgalvan/RemoveLegacyMaterial
2021-05-03 19:18:19 -05:00
LyShineExamples
[LYN-3357] Cherry-pick fix to UI textures to make them process as the correct type.
2021-05-03 14:38:08 -05:00
Maestro
LYN-2537 engine assets (#254)
2021-04-28 21:38:43 -05:00
MessagePopup
Integrating github/staging through commit ab87ed9
2021-04-09 11:27:37 -07:00
Metastream
Fixes for compile failures with Clang on Windows (#532)
2021-05-03 22:46:28 -07:00
Microphone
Add newlines to the end of all files
2021-04-23 09:43:40 -07:00
Multiplayer
Merge branch 'main' into mpgem_editor
2021-04-29 15:14:28 -07:00
MultiplayerCompression
Add newlines to the end of all files
2021-04-23 09:43:40 -07:00
NvCloth
Performance pass to Cloth CPU Skinning
2021-05-04 12:09:56 +01:00
PBSreferenceMaterials
Add newlines to the end of all files
2021-04-23 09:43:40 -07:00
PhysicsEntities
Add newlines to the end of all files
2021-04-23 09:43:40 -07:00
PhysX
Legacy Mesh component removal
2021-05-03 17:17:18 -05:00
PhysXDebug
Adding OUTPUT_NAME to physics gems shared libraries to avoid conflicting with their 3rdParty libraries
2021-04-29 18:00:06 +01:00
PhysXSamples
[LYN-3135] Animation Editor: Some of the default animation assets are broken (#348)
2021-04-27 18:40:04 +02:00
Prefab
[SPEC-6436] wrapped stray PrefabBuilder.Tests around PAL_TRAIT_BUILD_TESTS_SUPPORTED
2021-04-20 15:10:37 -07:00
Presence
Add newlines to the end of all files
2021-04-23 09:43:40 -07:00
PrimitiveAssets
Add newlines to the end of all files
2021-04-23 09:43:40 -07:00
PythonAssetBuilder
Add newlines to the end of all files
2021-04-23 09:43:40 -07:00
QtForPython
Add newlines to the end of all files
2021-04-23 09:43:40 -07:00
RADTelemetry
Add newlines to the end of all files
2021-04-23 09:43:40 -07:00
SaveData
Integrating github/staging through commit 5f214be
2021-04-13 17:18:57 -07:00
SceneLoggingExample
Add newlines to the end of all files
2021-04-23 09:43:40 -07:00
SceneProcessing
Use the material id from the base mesh when optimizing blend shapes (#517)
2021-05-03 15:43:42 -07:00
ScriptCanvas
Auto gen updates fixing property declarations.
2021-05-03 09:37:23 -07:00
ScriptCanvasDeveloper
LYN-2537 engine assets (#254)
2021-04-28 21:38:43 -05:00
ScriptCanvasDiagnosticLibrary/Code
merge from main
2021-04-27 15:30:42 -07:00
ScriptCanvasPhysics
Add newlines to the end of all files
2021-04-23 09:43:40 -07:00
ScriptCanvasTesting
Unifying operators in Matrix3x3, Matrix3x4 and Matrix4x4
2021-05-04 19:12:01 +01:00
ScriptedEntityTweener
Add newlines to the end of all files
2021-04-23 09:43:40 -07:00
ScriptEvents
Add newlines to the end of all files
2021-04-23 09:43:40 -07:00
SliceFavorites
Integrating latest from github/staging
2021-03-26 14:32:02 -07:00
StartingPointCamera
Add newlines to the end of all files
2021-04-23 09:43:40 -07:00
StartingPointInput
LYN-2537 engine assets (#254)
2021-04-28 21:38:43 -05:00
StartingPointMovement
Add newlines to the end of all files
2021-04-23 09:43:40 -07:00
SurfaceData
Add newlines to the end of all files
2021-04-23 09:43:40 -07:00
SVOGI
Add newlines to the end of all files
2021-04-23 09:43:40 -07:00
TestAssetBuilder
Integrating github/staging through commit 5f214be
2021-04-13 17:18:57 -07:00
TextureAtlas
Integrating latest from github/staging
2021-03-26 14:32:02 -07:00
TickBusOrderViewer
Integrating latest from github/staging
2021-03-26 14:32:02 -07:00
Twitch
Add newlines to the end of all files
2021-04-23 09:43:40 -07:00
UiBasics
[LYN-3357] Cherry-pick fix to UI textures to make them process as the correct type.
2021-05-03 14:38:08 -05:00
Vegetation
Removed outdated comments.
2021-05-04 11:04:51 -05:00
Vegetation_Gem_Assets
Add newlines to the end of all files
2021-04-23 09:43:40 -07:00
VideoPlaybackFramework
Integrating latest from github/staging
2021-03-26 14:32:02 -07:00
VirtualGamepad
Add newlines to the end of all files
2021-04-23 09:43:40 -07:00
WhiteBox
Deleted AzFramework::AtomActiveInterface
2021-05-03 15:40:32 -05:00
CMakeLists.txt
Deleted Visibility gem, it was Cry only gem
2021-05-03 15:37:16 -04:00