Skip to content

Commit 8739ede

Browse files
LaurieCheers-unitymrpropellerspeifeng-unity
authored
Merging dev branch into main (#78)
* Reverting params.yaml and updating code in server_endpoint.md * TcpServer class was renamed * convert all files with dos2unix (#76) * Minor tutorial tweaks, update version numbers Co-authored-by: Devin Miller <devin.miller@unity3d.com> Co-authored-by: peifeng-unity <56408141+peifeng-unity@users.noreply.github.com>
1 parent 71c090e commit 8739ede

File tree

15 files changed

+39
-781
lines changed

15 files changed

+39
-781
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
.DS_Store
22
.idea
33
.vscode/
4-
*~
4+
tutorials/pick_and_place/PickAndPlaceProject/Packages/packages-lock.json

tutorials/pick_and_place/PickAndPlaceProject/.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
/[Mm]emoryCaptures/
1616

1717
# Asset meta data should only be ignored when the corresponding asset is also ignored
18-
!/[Aa]ssets/**/*.meta
18+
# !/[Aa]ssets/**/*.meta
1919

2020
# Uncomment this line if you wish to ignore the asset store tools plugin
2121
# /[Aa]ssets/AssetStoreTools*

tutorials/pick_and_place/PickAndPlaceProject/Packages/manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"com.unity.ide.visualstudio": "2.0.3",
66
"com.unity.ide.vscode": "1.2.2",
77
"com.unity.robotics.urdf-importer": "https://github.com/Unity-Technologies/URDF-Importer.git#v0.0.4",
8-
"com.unity.robotics.ros-tcp-connector": "https://github.com/Unity-Technologies/ROS-TCP-Connector.git#v0.0.3",
8+
"com.unity.robotics.ros-tcp-connector": "https://github.com/Unity-Technologies/ROS-TCP-Connector.git#v0.1.1",
99
"com.unity.test-framework": "1.1.18",
1010
"com.unity.textmeshpro": "3.0.1",
1111
"com.unity.timeline": "1.4.3",

tutorials/pick_and_place/PickAndPlaceProject/Packages/packages-lock.json

Lines changed: 0 additions & 350 deletions
This file was deleted.

0 commit comments

Comments
 (0)