Skip to content

Commit

Permalink
Merge pull request #4 from iuli4n/dev-iulian-main
Browse files Browse the repository at this point in the history
Dev iulian main
  • Loading branch information
iuli4n committed Oct 12, 2022
2 parents 08a1644 + 8ffec87 commit 18d5338
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 10 deletions.
17 changes: 10 additions & 7 deletions LICENSE.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,22 @@ LICENSES
This project contains multiple libraries each licensed as follows. Any use of third party code included in this software or third party libraries linked the software is subject to the third party licenses pertaining to such third party code.

====
## AR CYB Project
## AR CYBS Project

(c) 2022 Harvard University
Licensed under MIT License (see [LICENSES.txt](LICENSES.txt))
Licensed under the 3-Clause BSD License

The majority of this work was created by Iulian Radu while at the Harvard University Graduate School of Education in the Learning, Innovation and Technology Lab (https://lit.gse.harvard.edu), with advice from P.I. Bertrand Schneider, and support from other contributors to the source code: Max Cembalest, Tugce Joy, Kyle Lenhart, Max Weinstein, Elliot Lee, Shankar Ravi, Davide Zhang. For research publications related to this project please see https://lit.gse.harvard.edu/pubs
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

MIT License
1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.

The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.

THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

The majority of this work was originally created by Iulian Radu while at the Harvard University Graduate School of Education in the Learning, Innovation and Technology Lab (https://lit.gse.harvard.edu), with advice from P.I. Bertrand Schneider, and support from other contributors to the source code: Max Cembalest, Tugce Joy, Kyle Lenhart, Max Weinstein, Elliot Lee, Shankar Ravi, Davide Zhang. For research publications related to this project please see https://lit.gse.harvard.edu/pubs

====
## OTHER LIBRARIES INCLUDED IN THIS PROJECT:
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,19 +45,19 @@ The most up to date version of this repository is found at:

- **Features for creating presentations:** Save/load scenes you've created, and create step-by-step presentations. Virtual laser pointers and drawings for annotating the scenes.

- Summary of features: see [features list](https://github.com/shankar-r19/CYBS-MArkdown-files/blob/main/1.2.%20AR%20CYB%20Software%20Features.md)
- Summary of features: see [features list](/Documentation/1.2_AR_CYB_Software_Features.md)

# Licenses

* This project contains multiple software libraries, described in [LICENSE.md](LICENSE.md) file. The Harvard CYBS project is licensed under MIT license. The external libraries are licensed under their respective licenses, and any use of third party code included in this software or third party libraries linked the software is subject to the third party licenses pertaining to such third party code.
* This project contains multiple software libraries, described in [LICENSE.md](LICENSE.md) file. The Harvard CYBS project is licensed under the 3-Clause BSD License. The external libraries are licensed under their respective licenses, and any use of third party code included in this software or third party libraries linked the software is subject to the third party licenses pertaining to such third party code.

# Downloading and Using

* First please ensure you are looking at the latest repository. The latest repository is found at: [[https://github.com/iuli4n/AR-CYBS-UnityArduinoMultiplayerXR](https://github.com/iuli4n/AR-CYBS-UnityArduinoMultiplayerXR)]

* Hardware requirements: This project will run on a computer without any other devices, but it's meant to do multiplayer AR/VR with Arduino connections. You don't actually need an Arduino or Hololenses; but it's intended to be run on Windows PC (in Unity Editor, or built for Standalone or UWP) with a connected Arduino, and on multiple Hololens 2 (UWP) devices. (Optional: It has been used on iOS Unity; and on Android mobile and on iOS mobile, in multiplayer mode together with a Windows PC and Hololens users; it can probably be ported on other devices compatible with MRTK)

* Installation: Follow [the documentation](/Documentation/1.1.%20AR%20CYB%20Software%20Information%20and%20Installation.md) for instructions on downloading and using.
* Installation: Follow [the documentation](/Documentation/1.1_AR_CYB_Software_Information_and_Installation.md) for instructions on downloading and using.

#

Expand Down

0 comments on commit 18d5338

Please sign in to comment.