Merge pull request #210 from Kapim/devel

Devel
robofit · Mar 24, 2021 · b999d66 · b999d66
2 parents 01a5084 + 633e9f8
commit b999d66
Show file tree

Hide file tree

Showing 271 changed files with 13,877 additions and 64,655 deletions.
diff --git a/arcor2_AREditor/Assets/2D_EDITOR/Data/actions.json b/arcor2_AREditor/Assets/2D_EDITOR/Data/actions.json
diff --git a/arcor2_AREditor/Assets/2D_EDITOR/Data/actions.json.meta b/arcor2_AREditor/Assets/2D_EDITOR/Data/actions.json.meta
diff --git a/arcor2_AREditor/Assets/2D_EDITOR/Images/box.jpg b/arcor2_AREditor/Assets/2D_EDITOR/Images/box.jpg
diff --git a/arcor2_AREditor/Assets/2D_EDITOR/Images/box.jpg.meta b/arcor2_AREditor/Assets/2D_EDITOR/Images/box.jpg.meta
diff --git a/arcor2_AREditor/Assets/2D_EDITOR/Images/green_button.jpg b/arcor2_AREditor/Assets/2D_EDITOR/Images/green_button.jpg
diff --git a/arcor2_AREditor/Assets/2D_EDITOR/Images/grey_button.jpg b/arcor2_AREditor/Assets/2D_EDITOR/Images/grey_button.jpg
diff --git a/arcor2_AREditor/Assets/2D_EDITOR/Images/puck.png b/arcor2_AREditor/Assets/2D_EDITOR/Images/puck.png
diff --git a/arcor2_AREditor/Assets/2D_EDITOR/Images/question.jpg b/arcor2_AREditor/Assets/2D_EDITOR/Images/question.jpg
diff --git a/arcor2_AREditor/Assets/2D_EDITOR/Images/question.jpg.meta b/arcor2_AREditor/Assets/2D_EDITOR/Images/question.jpg.meta
diff --git a/arcor2_AREditor/Assets/2D_EDITOR/Images/table.jpg b/arcor2_AREditor/Assets/2D_EDITOR/Images/table.jpg
diff --git a/arcor2_AREditor/Assets/2D_EDITOR/Images/table.jpg.meta b/arcor2_AREditor/Assets/2D_EDITOR/Images/table.jpg.meta
diff --git a/arcor2_AREditor/Assets/2D_EDITOR/Images/tester.jpg b/arcor2_AREditor/Assets/2D_EDITOR/Images/tester.jpg