Skip to content

Resolve conflicts 2 #233

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
merged 35 commits into from
May 26, 2021
Merged

Resolve conflicts 2 #233

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
a46370b
Merging dev branch into main (#78)
LaurieCheers-unity Dec 18, 2020
2702a7c
Updating instructions for URDF repository (#71)
vidurvij-Unity Jan 4, 2021
926cdf6
Sarah/readme update (#112)
sarah-gibson Feb 3, 2021
9e45928
Update for ROS-TCP-Connector namespace changes
LaurieCheers-unity Feb 4, 2021
2b17c1e
Mpinol/simrealrebased (#107)
sdiao Feb 8, 2021
4d3e005
Update with new instructions (#147)
LaurieCheers-unity Feb 12, 2021
2e1c89b
Update tutorial text (#148)
LaurieCheers-unity Feb 12, 2021
c78d4e9
AIRO-405 Adding Yamato boilerplate to Robotics Hub (#144)
mrpropellers Feb 16, 2021
3667cbe
Hotfix: Remove DemoScripts asmdef
mrpropellers Feb 16, 2021
46a32f0
Use latest main
LaurieCheers-unity Feb 16, 2021
39f96a6
Fixing issue with Demo.cs not working with new URDF Importer co-routine
mrpropellers Feb 20, 2021
f3b9998
remove unused import (#163)
peifeng-unity Feb 23, 2021
9919a29
update package import urls for tcp connector and urdf importer (#166)
peifeng-unity Feb 24, 2021
8a6e213
Update urdf_tutorial.md (#168)
vidurvij-Unity Feb 25, 2021
042de75
Added M prefixes to docs (#167)
LaurieCheers-unity Feb 26, 2021
870efce
Adding Editor version to Ros Integration Readme
mrpropellers Mar 10, 2021
79afbe9
Updating package dependencies to proper versions
mrpropellers Mar 17, 2021
4616452
Updating Contribution Content (#186)
at669 Mar 29, 2021
36d598a
Adding PR template (#191)
at669 Apr 7, 2021
42bf426
Unity service example (#199)
hyounesy Apr 15, 2021
dd47436
Update the list of new physics features (#204)
peifeng-unity Apr 16, 2021
efb86a9
Update to 0.3.0 (#207)
LaurieCheers-unity Apr 21, 2021
15c9305
Removing old version tags from git URLs in quick_setup
mrpropellers Apr 26, 2021
5f6fd0d
Updating tutorials to the glorious new world (#211)
LaurieCheers-unity May 7, 2021
279740b
add changelog (#218)
peifeng-unity May 12, 2021
3701595
Forum links to README, config.yml (#219)
at669 May 13, 2021
0d04b67
Add linter (#227)
sdiao May 26, 2021
dc34c49
Fixing issue with Demo.cs not working with new URDF Importer co-routi…
peifeng-unity Feb 22, 2021
c139d6e
Readme: New Link (#172)
at669 Mar 2, 2021
ef69529
Added newsletter link (#175)
LaurieCheers-unity Mar 3, 2021
29aacee
remove stale merge
peifeng-unity May 26, 2021
5f780df
Minor formmating
sdiao May 26, 2021
e405632
Fix README and git sub module
sdiao May 26, 2021
8b4e04e
Revert unintentional change in urdf_appendix.md
sdiao May 26, 2021
dd91369
Add back tutorials/pick_and_place/ROS/src/ros_tcp_endpoint
sdiao May 26, 2021
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
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,4 @@ Please describe the tests that you ran to verify your changes. Please also provi
- [ ] Updated the [Changelog](https://github.com/Unity-Technologies/Unity-Robotics-Hub/blob/dev/CHANGELOG.md) and described changes in the [Unreleased section](https://github.com/Unity-Technologies/Unity-Robotics-Hub/blob/dev/CHANGELOG.md#unreleased)
- [ ] Updated the documentation as appropriate

## Other comments
## Other comments
2 changes: 1 addition & 1 deletion tutorials/pick_and_place/2_ros_tcp.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,4 +221,4 @@ ROS and Unity have now successfully connected!

---

#### Proceed to [Part 3](3_pick_and_place.md).
#### Proceed to [Part 3](3_pick_and_place.md).