Merge pull request #183 from Kapim/devel

Devel
robofit · Nov 10, 2020 · a627339 · a627339
2 parents 0f44e90 + c8f1af6
commit a627339
Show file tree

Hide file tree

Showing 7,290 changed files with 844 additions and 284,362 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -14,10 +14,6 @@
 	path = arcor2_AREditor/Submodules/Unity3DRuntimeTransformGizmo
 	url = https://github.com/xBambusekD/Unity3DRuntimeTransformGizmo.git
 	ignore = dirty
-[submodule "arcor2_AREditor/Submodules/usfb"]
-	path = arcor2_AREditor/Submodules/usfb
-	url = https://github.com/adrenak/usfb.git
-	ignore = dirty
 [submodule "arcor2_AREditor/Submodules/RosSharp"]
 	path = arcor2_AREditor/Submodules/RosSharp
 	url = https://github.com/xBambusekD/ros-sharp.git

diff --git a/README.md b/README.md
@@ -33,6 +33,7 @@ ARCOR2 AR Editor
    - [UI Graph](https://assetstore.unity.com/packages/tools/gui/ui-graph-51304)
    - [Joystick Pack](https://assetstore.unity.com/packages/tools/input-management/joystick-pack-107631)
    - [Native Camera for Android & iOS](https://assetstore.unity.com/packages/tools/integration/native-camera-for-android-ios-117802) (only if you want to build Android version)
+   - [Trilib 2](https://assetstore.unity.com/packages/tools/modeling/trilib-2-model-loading-package-157548) - manually delete folder Trilib/Plugins/NewtonSoft.Json/ otherwise, there will be most likely conflicts
    - [Simple Collada](https://assetstore.unity.com/packages/tools/input-management/simple-collada-19579)
      - requires to apply patch (<b>/scripts/ColladaImporter.patch</b> and <b>/scripts/StringExtensions.patch</b>) on script ColladaImporter.cs and OrbCreationExtensions/StringExtensions.cs
      - SimpleCollada asset must be moved to Assets/Submodule folder in order to patch script works