Merge branch 'master' into main2

# Conflicts:
#	.gitmodules
#	SkyEngine.uproject
This commit is contained in:
Lucas 2024-09-19 21:01:55 +02:00
commit b1f689872b

View file

@ -581,9 +581,29 @@
"Name": "JsonBlueprintUtilities", "Name": "JsonBlueprintUtilities",
"Enabled": true "Enabled": true
}, },
{
"Name": "VisualStudioTools",
"Enabled": true,
"MarketplaceURL": "com.epicgames.launcher://ue/marketplace/product/362651520df94e4fa65492dbcba44ae2",
"SupportedTargetPlatforms": [
"Win64"
]
},
{
"Name": "ChannelMachine",
"Enabled": true,
"MarketplaceURL": "com.epicgames.launcher://ue/marketplace/product/1203c14fac16490bacab6a7d3577edff",
"SupportedTargetPlatforms": [
"Win64"
]
},
{ {
"Name": "CommonUI", "Name": "CommonUI",
"Enabled": true "Enabled": true
},
{
"Name": "AnimationBudgetAllocator",
"Enabled": true
} }
], ],
"TargetPlatforms": [ "TargetPlatforms": [