Skip to content

Update project to O3DE 2605.0 (stabilization) #322

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jhanca-robotecai merged 12 commits into from
Apr 20, 2026
Merged

Update project to O3DE 2605.0 (stabilization) #322

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
e64b973
ROS Jazzy and O3DE 26.05 update:
michalpelka Mar 20, 2026
66cb1b4
Code review fixes
jhanca-robotecai Apr 10, 2026
4a48a48
Revert ros2_ws to keep it humble
jhanca-robotecai Apr 10, 2026
7c0c8cc
Revert Docker to push it in separate PR
jhanca-robotecai Apr 10, 2026
2541f0f
Revert UR ROS2 Driver submodule to push it in separate PR
jhanca-robotecai Apr 10, 2026
e504707
Update submodules
jhanca-robotecai Apr 10, 2026
5eb3f5d
DemoLevel1: Remove warnings
jhanca-robotecai Apr 10, 2026
0b6a003
SuperShot and ImportLevel: Remove warnings
jhanca-robotecai Apr 10, 2026
c4541b0
DemoLevel2: Remove warnings
jhanca-robotecai Apr 10, 2026
2a2fe43
Fix OTTO robot in DemoLevelStereo
jhanca-robotecai Apr 13, 2026
b7b6f83
Update submodules
jhanca-robotecai Apr 13, 2026
3342764
Fix material name
jhanca-robotecai Apr 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added Project/Assets/BoxMesh/Box5.fbx
View file
Open in desktop
Binary file not shown.
332 changes: 332 additions & 0 deletions Project/Assets/Factory/Box5.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,332 @@
{
"ContainerEntity": {
"Id": "ContainerEntity",
"Name": "Box4",
"Components": {
"EditorDisabledCompositionComponent": {
"$type": "EditorDisabledCompositionComponent",
"Id": 8715409578771130289
},
"EditorEntityIconComponent": {
"$type": "EditorEntityIconComponent",
"Id": 8256705382262763300
},
"EditorEntitySortComponent": {
"$type": "EditorEntitySortComponent",
"Id": 1541884963070135492,
"Child Entity Order": [
"Entity_[191891890211650]"
]
},
"EditorInspectorComponent": {
"$type": "EditorInspectorComponent",
"Id": 7723945754314690856
},
"EditorLockComponent": {
"$type": "EditorLockComponent",
"Id": 12354894372506658654
},
"EditorOnlyEntityComponent": {
"$type": "EditorOnlyEntityComponent",
"Id": 9007498808683063333
},
"EditorPendingCompositionComponent": {
"$type": "EditorPendingCompositionComponent",
"Id": 14340065101907575651
},
"EditorPrefabComponent": {
"$type": "EditorPrefabComponent",
"Id": 3621804511817194472
},
"EditorVisibilityComponent": {
"$type": "EditorVisibilityComponent",
"Id": 2622557367775789750
},
"TransformComponent": {
"$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
"Id": 4101209608094465705,
"Parent Entity": ""
}
}
},
"Entities": {
"Entity_[143149087751449]": {
"Id": "Entity_[143149087751449]",
"Name": "VIS",
"Components": {
"AZ::Render::EditorMeshComponent": {
"$type": "AZ::Render::EditorMeshComponent",
"Id": 8675883885105925543,
"Controller": {
"Configuration": {
"ModelAsset": {
"assetId": {
"guid": "{06FD692F-3EFF-513B-9773-57B2E3B5AE6D}",
"subId": 280320852
},
"assetHint": "assets/boxmesh/box5.fbx.azmodel"
}
}
}
},
"EditorDisabledCompositionComponent": {
"$type": "EditorDisabledCompositionComponent",
"Id": 11839446511482333085
},
"EditorEntityIconComponent": {
"$type": "EditorEntityIconComponent",
"Id": 14561066232028838835
},
"EditorEntitySortComponent": {
"$type": "EditorEntitySortComponent",
"Id": 7030674297684814699
},
"EditorInspectorComponent": {
"$type": "EditorInspectorComponent",
"Id": 13226171051440185542,
"ComponentOrderEntryArray": [
{
"ComponentId": 8903659711004105110
},
{
"ComponentId": 13569015630530104047,
"SortIndex": 1
},
{
"ComponentId": 13226171051440185542,
"SortIndex": 2
},
{
"ComponentId": 7030674297684814699,
"SortIndex": 3
},
{
"ComponentId": 12358938230356911200,
"SortIndex": 4
},
{
"ComponentId": 4848749736236174155,
"SortIndex": 5
},
{
"ComponentId": 554919628147339253,
"SortIndex": 6
},
{
"ComponentId": 14561066232028838835,
"SortIndex": 7
},
{
"ComponentId": 11839446511482333085,
"SortIndex": 8
},
{
"ComponentId": 8675883885105925543,
"SortIndex": 9
},
{
"ComponentId": 7097559180465575381,
"SortIndex": 10
}
]
},
"EditorLockComponent": {
"$type": "EditorLockComponent",
"Id": 4848749736236174155
},
"EditorMaterialComponent": {
"$type": "EditorMaterialComponent",
"Id": 7097559180465575381,
"Controller": {
"Configuration": {
"materials": [
{
"Key": {
"materialSlotStableId": 1773863654
},
"Value": {
"MaterialAsset": {
"assetId": {
"guid": "{5468360F-1789-50A3-96FF-118192B81B48}"
},
"assetHint": "assets/warehouse/materials/mwarehouseboxes.azmaterial"
}
}
},
{
"Key": {
"materialSlotStableId": 2919702015
},
"Value": {
"MaterialAsset": {
"assetId": {
"guid": "{5468360F-1789-50A3-96FF-118192B81B48}"
},
"assetHint": "assets/warehouse/materials/mwarehouseboxes.azmaterial"
}
}
}
]
}
}
},
"EditorOnlyEntityComponent": {
"$type": "EditorOnlyEntityComponent",
"Id": 13569015630530104047
},
"EditorPendingCompositionComponent": {
"$type": "EditorPendingCompositionComponent",
"Id": 554919628147339253
},
"EditorVisibilityComponent": {
"$type": "EditorVisibilityComponent",
"Id": 12358938230356911200
},
"TransformComponent": {
"$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
"Id": 8903659711004105110,
"Parent Entity": "Entity_[191891890211650]",
"Transform Data": {
"Translate": [
0.0,
0.0,
-0.10000000149011612
]
}
}
}
},
"Entity_[191891890211650]": {
"Id": "Entity_[191891890211650]",
"Name": "Box5",
"Components": {
"Component_[13574867754902005040]": {
"$type": "EditorInspectorComponent",
"Id": 13574867754902005040,
"ComponentOrderEntryArray": [
{
"ComponentId": 16246303725359178974
},
{
"ComponentId": 5935093852243013826,
"SortIndex": 1
},
{
"ComponentId": 7605271439870430818,
"SortIndex": 2
},
{
"ComponentId": 3144205669266579244,
"SortIndex": 3
},
{
"ComponentId": 1552691188429355007,
"SortIndex": 4
},
{
"ComponentId": 17867042698575286426,
"SortIndex": 5
}
]
},
"Component_[13890549230067286886]": {
"$type": "EditorOnlyEntityComponent",
"Id": 13890549230067286886
},
"Component_[14299065573721311548]": {
"$type": "EditorVisibilityComponent",
"Id": 14299065573721311548
},
"Component_[16246303725359178974]": {
"$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
"Id": 16246303725359178974,
"Parent Entity": "ContainerEntity"
},
"Component_[17438889026096965443]": {
"$type": "EditorDisabledCompositionComponent",
"Id": 17438889026096965443
},
"Component_[2635600976954600347]": {
"$type": "EditorEntitySortComponent",
"Id": 2635600976954600347,
"Child Entity Order": [
"Entity_[143149087751449]"
]
},
"Component_[7619205353932880281]": {
"$type": "EditorLockComponent",
"Id": 7619205353932880281
},
"Component_[8458290980975423191]": {
"$type": "EditorEntityIconComponent",
"Id": 8458290980975423191
},
"Component_[9483887954899180333]": {
"$type": "EditorPendingCompositionComponent",
"Id": 9483887954899180333
},
"EditorColliderComponent": {
"$type": "EditorColliderComponent",
"Id": 17867042698575286426,
"ColliderConfiguration": {
"MaterialSlots": {
"Slots": [
{
"Name": "Entire object",
"MaterialAsset": {
"assetId": {
"guid": "{7FC39784-D1D8-5D99-B4B3-1EB59CF8EAF6}",
"subId": 1
},
"assetHint": "factory/conveyorline/box.physicsmaterial"
}
}
]
}
},
"ShapeConfiguration": {
"ShapeType": 1,
"Box": {
"Configuration": [
0.30000001192092896,
0.30000001192092896,
0.20000000298023224
]
}
},
"DebugDrawSettings": {
"LocallyEnabled": false
}
},
"EditorRigidBodyComponent": {
"$type": "EditorRigidBodyComponent",
"Id": 1552691188429355007,
"Configuration": {
"entityId": "",
"Compute Mass": false,
"Mass": 0.5,
"Inertia tensor": [
0.005416667088866234,
0.0,
0.0,
0.0,
0.005416667088866234,
0.0,
0.0,
0.0,
0.0075000012293457985
]
}
},
"EditorTagComponent": {
"$type": "EditorTagComponent",
"Id": 17200051048558680531,
"Tags": [
"Grippable",
"Box"
]
}
}
}
}
}
3 changes: 2 additions & 1 deletion Project/Assets/Factory/Decals/Materials/markings_end1.material
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@
"materialTypeVersion": 5,
"propertyValues": {
"baseColor.textureMap": "markings_end1.png",
"normal.textureMap": "markings_end1.png",
"normal.useTexture": false,
"opacity.factor": 0.9399999976158142,
"opacity.mode": "Blended"
}
}
}
3 changes: 2 additions & 1 deletion Project/Assets/Factory/Decals/Materials/markings_end2.material
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@
"materialTypeVersion": 5,
"propertyValues": {
"baseColor.textureMap": "markings_end2.png",
"normal.textureMap": "markings_end2.png",
"normal.useTexture": false,
"opacity.factor": 1.0,
"opacity.mode": "Blended"
}
}
}
3 changes: 2 additions & 1 deletion Project/Assets/Factory/Decals/Materials/markings_mid1.material
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@
"materialTypeVersion": 5,
"propertyValues": {
"baseColor.textureMap": "markings_mid1.png",
"normal.textureMap": "markings_mid1.png",
"normal.useTexture": false,
"opacity.factor": 1.0,
"opacity.mode": "Blended"
}
}
}
3 changes: 2 additions & 1 deletion Project/Assets/Factory/Decals/Materials/markings_mid2.material
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@
"materialTypeVersion": 5,
"propertyValues": {
"baseColor.textureMap": "markings_mid2.png",
"normal.textureMap": "markings_mid2.png",
"normal.useTexture": false,
"opacity.factor": 1.0,
"opacity.mode": "Blended"
}
}
}
3 changes: 2 additions & 1 deletion Project/Assets/Factory/Decals/Materials/tire_tracks_approach1.material
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@
"materialTypeVersion": 5,
"propertyValues": {
"baseColor.textureMap": "tire_tracks_approach1.png",
"normal.textureMap": "tire_tracks_approach1.png",
"normal.useTexture": false,
"opacity.factor": 1.0,
"opacity.mode": "Blended"
}
}
}
Loading