Resolve conflicts 2 (#233)

* 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 Jing <peifeng.jing@unity3d.com>

* Updating instructions for URDF repository  (#71)

* 1. Adding images for URDF tutorial 2. Adding instructions highlighting Disable Collison tag

* Adding link to example of disable collision tag in the niryo_one URDF file

* Sarah/readme update (#112)

* Adding physics roadmap and minor formatting changes

* formatting nits

* Calling out feature requests

* Update for ROS-TCP-Connector namespace changes

* Mpinol/simrealrebased (#107)

* Adding sim and real pnp files.

* Update with new instructions (#147)

* Update tutorial text (#148)

* AIRO-405 Adding Yamato boilerplate to Robotics Hub (#144)

* Adding testing boilerplate

* Adding tests to run after message generation

* Tweaks to ensure run works in Bokken image

* Enabling audio by default, but disabling it in yamato config

* Hotfix: Remove DemoScripts asmdef

The DemoScripts.asmdef was a bit of experimental cruft that snuck in via
my Yamato changes. This causes Demo.cs to compile as an Editor script,
which  means it can no longer be instantiated in the scene hierarchy
(this breaks the demo).  Removing the asmdef puts things back to normal.

Tested by running the demo.

* Use latest main

* Fixing issue with Demo.cs not working with new URDF Importer co-routine

* remove unused import (#163)

* update package import urls for tcp connector and urdf importer (#166)

* Update urdf_tutorial.md (#168)

* Added M prefixes to docs (#167)

* Adding Editor version to Ros Integration Readme

* Updating package dependencies to proper versions

Pick and place tutorial was failing to compile its scripts because
the package manifest was pointing to an older version of
ROS-TCP-Connector.  Updated the manifest and also pulled latest changes
for ros_tcp_endpoint.

Tested by running DemoScene

* Updating Contribution Content (#186)

* Contributing content

* PR feedback

* Adding PR template (#191)

* Unity service example (#199)

* added example of implementing a UnityService

* adding tutorial for unity service

* added a couple comments to the example code

* typos and code standard fixes

* consistency: changing the service name for position_service to pos_srv

* updating the tutorial to match the corresponding script

* Update the list of new physics features (#204)

* add new sections for the released new physics features

Co-authored-by: Amanda <31416491+at669@users.noreply.github.com>

* Update to 0.3.0 (#207)

* Removing old version tags from git URLs in quick_setup

Addressing user issue #209. Our quick_setup guide was still recommending users check out v.0.2.0 of our packages. Removed the reference to a specific package version and instead included a note that users can explicitly declare a package version if desired.

Tested by making the change locally in the package manifest.

* Updating tutorials to the glorious new world (#211)

* add changelog (#218)

add changelog

* Forum links to README, config.yml (#219)

* Add linter (#227)

* Add linter and pre-commit hooks

* Formatting

* Remove setting up ruby

* Fixing issue with Demo.cs not working with new URDF Importer co-routine (#162)

Co-authored-by: Devin Miller <devin.miller@unity3d.com>

* Readme: New Link (#172)

* Fixing issue with Demo.cs not working with new URDF Importer co-routine

* remove unused import (#163)

* README update

* PR feedback

* Blog post link update

Co-authored-by: Devin Miller <devin.miller@unity3d.com>
Co-authored-by: peifeng-unity <peifeng.jing@unity3d.com>

* Added newsletter link (#175)

* remove stale merge

* Minor formmating

* Fix README and git sub module

* Revert unintentional change in urdf_appendix.md

* Add back tutorials/pick_and_place/ROS/src/ros_tcp_endpoint

Co-authored-by: LaurieCheers-unity <73140792+LaurieCheers-unity@users.noreply.github.com>
Co-authored-by: Devin Miller <devin.miller@unity3d.com>
Co-authored-by: Peifeng Jing <peifeng.jing@unity3d.com>
Co-authored-by: vidurvij-Unity <60901103+vidurvij-Unity@users.noreply.github.com>
Co-authored-by: sarah-gibson <72100462+sarah-gibson@users.noreply.github.com>
Co-authored-by: Devin Miller (Unity) <mrpropellers@users.noreply.github.com>
Co-authored-by: peifeng-unity <56408141+peifeng-unity@users.noreply.github.com>
Co-authored-by: Amanda <31416491+at669@users.noreply.github.com>
Co-authored-by: Hamid Younesy <hyounesy@users.noreply.github.com>

Author: 8 people

.github/PULL_REQUEST_TEMPLATE.md

@@ -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

tutorials/pick_and_place/2_ros_tcp.md

@@ -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).