Skip to content
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.

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

Adding a link to the video in MD.file #9

Open
wants to merge 41 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
96dc677
Merge pull request #30 from Nikolay-Odessa/master
Nikolay-Odessa Apr 24, 2017
e18d253
Unity assets LabEquipment
SergeyAfonin May 1, 2017
e4892b3
Update Workin progress 3D modeling.md
SergeyAfonin May 1, 2017
b053a69
Update Workin progress 3D modeling.md
SergeyAfonin May 1, 2017
da17069
Merge pull request #31 from SergeyAfonin/master
SergeyAfonin May 1, 2017
f01511d
Merge pull request #32 from Nikolay-Odessa/master
Nikolay-Odessa May 3, 2017
d20dea1
Update Workin progress 3D modeling.md
SergeyAfonin May 3, 2017
4ff970e
Update Workin progress 3D modeling.md
SergeyAfonin May 3, 2017
5549049
Update Workin progress 3D modeling.md
SergeyAfonin May 3, 2017
1f96a0f
Update Workin progress 3D modeling.md
SergeyAfonin May 3, 2017
f38292f
Merge pull request #7 from EMICVL/master
SergeyAfonin May 8, 2017
274f113
Making Unity prefab Laboratory GlassWare
SergeyAfonin May 8, 2017
078e213
Update Workin progress 3D modeling.md
SergeyAfonin May 8, 2017
536ce18
Merge pull request #33 from SergeyAfonin/master
SergeyAfonin May 8, 2017
570a343
Merge pull request #34 from Nikolay-Odessa/master
Nikolay-Odessa May 10, 2017
4a3b023
Merge pull request #35 from Nikolay-Odessa/master
Nikolay-Odessa May 17, 2017
77714d1
Merge pull request #36 from Nikolay-Odessa/master
Nikolay-Odessa May 24, 2017
b293ad2
LaboratoryPlasticWare
SergeyAfonin May 24, 2017
aa3231f
Update Workin progress 3D modeling.md
SergeyAfonin May 24, 2017
1300cd0
Merge pull request #37 from SergeyAfonin/master
SergeyAfonin May 24, 2017
2846ed5
Merge pull request #38 from Nikolay-Odessa/master
Nikolay-Odessa May 31, 2017
e0b82b3
Merge pull request #39 from Nikolay-Odessa/master
Nikolay-Odessa Jun 4, 2017
df21fd9
Merge pull request #40 from Nikolay-Odessa/master
Nikolay-Odessa Jun 11, 2017
192ff24
Merge pull request #41 from Nikolay-Odessa/master
Nikolay-Odessa Jun 18, 2017
2e9df83
Merge pull request #42 from Nikolay-Odessa/master
Nikolay-Odessa Jun 29, 2017
949dca7
Merge pull request #43 from Nikolay-Odessa/master
Nikolay-Odessa Jul 4, 2017
ff36c67
Merge pull request #44 from Nikolay-Odessa/master
Nikolay-Odessa Jul 11, 2017
95ffa47
Merge pull request #45 from Nikolay-Odessa/master
Nikolay-Odessa Jul 12, 2017
1f3b714
Merge pull request #46 from Nikolay-Odessa/master
Nikolay-Odessa Jul 19, 2017
949d9a2
Merge pull request #47 from Nikolay-Odessa/master
Nikolay-Odessa Jul 30, 2017
f5880c7
Merge pull request #48 from Nikolay-Odessa/master
Nikolay-Odessa Aug 10, 2017
1569af6
Merge pull request #49 from Nikolay-Odessa/master
Nikolay-Odessa Aug 17, 2017
3273c00
Merge pull request #50 from Nikolay-Odessa/master
Nikolay-Odessa Aug 21, 2017
ae86791
Merge pull request #51 from Nikolay-Odessa/master
Nikolay-Odessa Sep 3, 2017
fd5343e
Update README.md
Nikolay-Odessa Nov 26, 2017
cbcc936
Update README.md
Nikolay-Odessa Nov 29, 2017
907af1c
Update README.md
Nikolay-Odessa Jul 26, 2018
60859ae
Update README.md
Nikolay-Odessa Jul 26, 2018
e74b808
Update README.md
Nikolay-Odessa Jul 26, 2018
6002e8b
Update README.md
Nikolay-Odessa Jul 30, 2018
46a2735
Merge pull request #52 from Nikolay-Odessa/master
Nikolay-Odessa Jul 30, 2018
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
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
5 changes: 5 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ _________________________
- [Demo 3D simulation](https://youtu.be/c8QSCXBFZF0)
- [Overview of the virtual laboratory with simulations](https://www.youtube.com/watch?v=Len1WX-vDy8&t=704s)


______________________________

# The composition of the repository:
Expand All @@ -18,3 +19,7 @@ ______________________________
- PCR_script.PDF – Full PCR protocol instruction/script/text from DNA isolation through PCR to results detection.
- PCR_script_description_final_v1.PDF – Full PCR script (table) with time shots, pictures and comments.

_______________________________

# Virtual laboratory video:
- [Overview of the virtual laboratory with simulations](https://www.youtube.com/watch?v=Len1WX-vDy8&t=704s)
58 changes: 58 additions & 0 deletions Workin progress 3D modeling.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,3 +44,61 @@
![Image alt](https://github.com/SergeyAfonin/ONU_Team_25.01.17/blob/master/3D_Model_Building%20bloks/LaboratoryEquipment/TermoCycler/THermalCyclerSystem_01.jpg)
![Image alt](https://github.com/SergeyAfonin/ONU_Team_25.01.17/blob/master/3D_Model_Building%20bloks/LaboratoryEquipment/TermoCycler/THermalCyclerSystem_02.jpg)
![Image alt](https://github.com/SergeyAfonin/ONU_Team_25.01.17/blob/master/3D_Model_Building%20bloks/LaboratoryEquipment/TermoCycler/THermalCyclerSystem_03.jpg)

21.04.2017 - 1.05.2017

Make model:
- MicroWave
![Image alt](https://github.com/SergeyAfonin/ONU_Team_25.01.17/blob/master/3D_Model_Building%20bloks/LaboratoryEquipment/MicroWave/MicroWave_01.jpg)
![Image alt](https://github.com/SergeyAfonin/ONU_Team_25.01.17/blob/master/3D_Model_Building%20bloks/LaboratoryEquipment/MicroWave/MicroWave_02.jpg)
![Image alt](https://github.com/SergeyAfonin/ONU_Team_25.01.17/blob/master/3D_Model_Building%20bloks/LaboratoryEquipment/MicroWave/MicroWave_03.jpg)
![Image alt](https://github.com/SergeyAfonin/ONU_Team_25.01.17/blob/master/3D_Model_Building%20bloks/LaboratoryEquipment/MicroWave/MicroWave_04.jpg)
![Image alt](https://github.com/SergeyAfonin/ONU_Team_25.01.17/blob/master/3D_Model_Building%20bloks/LaboratoryEquipment/MicroWave/MicroWave_05.jpg)
https://github.com/SergeyAfonin/ONU_Team_25.01.17/blob/master/3D_Model_Building%20bloks/LaboratoryEquipment/MicroWave/MicroWave_UnityAsset.mp4

Make Unity assets:

- LaboratoryBalance.unitypackage
https://github.com/EMICVL/ONU_Team_25.01.17/blob/55490491b3999204e07d00f0f0ee0da663258e3c/3D_Model_Building%20bloks/LaboratoryEquipment/Balance/LaboratoryBalance.unitypackage
- ElectrophoresisPack.unitypackage
https://github.com/EMICVL/ONU_Team_25.01.17/blob/4ff970e3f818cc49592c696b90c9e2adb33abdf6/3D_Model_Building%20bloks/LaboratoryEquipment/Electrophores/ElectrophoresisPack.unitypackage
- MicroWave.unitypackage
https://github.com/EMICVL/ONU_Team_25.01.17/blob/4ff970e3f818cc49592c696b90c9e2adb33abdf6/3D_Model_Building%20bloks/LaboratoryEquipment/MicroWave/MicroWave.unitypackage
- ThermoCyclerModel.unitypackage
https://github.com/SergeyAfonin/ONU_Team_25.01.17/blob/master/3D_Model_Building%20bloks/LaboratoryEquipment/TermoCycler/ThermoCyclerModel.unitypackage
- TransIlluminatorPackage.unitypackage
https://github.com/EMICVL/ONU_Team_25.01.17/blob/4ff970e3f818cc49592c696b90c9e2adb33abdf6/3D_Model_Building%20bloks/LaboratoryEquipment/TransIlluminator/TransIlluminatorPackage.unitypackage

Make video:

- LaboratoryBalance_UnityAsset.mp4
https://github.com/SergeyAfonin/ONU_Team_25.01.17/blob/master/3D_Model_Building%20bloks/LaboratoryEquipment/Balance/LaboratoryBalance_UnityAsset.mp4
- ElectrophoresisPack_UnityAsset.mp4
https://github.com/SergeyAfonin/ONU_Team_25.01.17/blob/master/3D_Model_Building%20bloks/LaboratoryEquipment/Electrophores/ElectrophoresisPack_UnityAsset.mp4
- MicroWave_UnityAsset.mp4
https://github.com/SergeyAfonin/ONU_Team_25.01.17/blob/master/3D_Model_Building%20bloks/LaboratoryEquipment/MicroWave/MicroWave_UnityAsset.mp4
- TermalCycler_UnityAsset.mp4
https://github.com/SergeyAfonin/ONU_Team_25.01.17/blob/master/3D_Model_Building%20bloks/LaboratoryEquipment/TermoCycler/TermalCycler_UnityAsset.mp4
- TranceIlluminator_UnityAsset.mp4
https://github.com/SergeyAfonin/ONU_Team_25.01.17/blob/master/3D_Model_Building%20bloks/LaboratoryEquipment/TransIlluminator/TranceIlluminator_UnityAsset.mp4

2.05.2017 - 8.05.2017

Make Unity Prefabs Laboratory GlassWare:

- Laboratory GlassWare_UnityAsset.mp4
https://github.com/SergeyAfonin/ONU_Team_25.01.17/blob/master/3D_Model_Building%20bloks/LaboratoryEquipment/LaboratoryGlassWare/LaboratoryGlassWare.mp4
- Laboratory GlassWare_UnityAsset.unitypackage
https://github.com/SergeyAfonin/ONU_Team_25.01.17/blob/master/3D_Model_Building%20bloks/LaboratoryEquipment/LaboratoryGlassWare/LaboratoryGlassWare.unitypackage

8.05.2017 - 24.05.2017

Make Unity Prefabs Laboratory PlasticWare:
- Laboratory PlasticWare.mp4
https:/https://github.com/SergeyAfonin/ONU_Team_25.01.17/blob/master/3D_Model_Building%20bloks/LaboratoryEquipment/LaboratoryPlasticWare/LaboratoryPlasticWare.mp4

- Laboratory PlasticWare.unitypackage
https://github.com/SergeyAfonin/ONU_Team_25.01.17/blob/master/3D_Model_Building%20bloks/LaboratoryEquipment/LaboratoryPlasticWare/LaboratoryPlasticWare.unitypackage