Merge branch 'develop'

balandinodidonato · Dec 6, 2017 · 4e79741 · 4e79741
2 parents 79c4d24 + c3d6f9f
commit 4e79741
Show file tree

Hide file tree

Showing 1,048 changed files with 16,906 additions and 3,067 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,6 +2,9 @@
 MyoMapper/application.macosx
 MyoMapper/application.windows32
 MyoMapper/application.windows64
+Myo Mapper/Builds/VisualStudio2017/.vs
+Myo Mapper/Builds/*/x64
+
 <<<<<<< HEAD
 <<<<<<< HEAD
 MyoMapper/MyoMapper.windows64.zip

diff --git a/.idea/MyoMapper.iml b/.idea/MyoMapper.iml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/Myo Mapper/Builds/MacOSX/Brandon_thin_it.otf b/Myo Mapper/Builds/MacOSX/Brandon_thin_it.otf
diff --git a/Myo Mapper/Builds/MacOSX/Info.plist b/Myo Mapper/Builds/MacOSX/Info.plist
diff --git a/...r/Builds/MacOSX/Myo Mapper (App)/Images-2.xcassets/AppIcon.appiconset/128-1.png b/...r/Builds/MacOSX/Myo Mapper (App)/Images-2.xcassets/AppIcon.appiconset/128-1.png
diff --git a/...per/Builds/MacOSX/Myo Mapper (App)/Images-2.xcassets/AppIcon.appiconset/128.png b/...per/Builds/MacOSX/Myo Mapper (App)/Images-2.xcassets/AppIcon.appiconset/128.png
diff --git a/...er/Builds/MacOSX/Myo Mapper (App)/Images-2.xcassets/AppIcon.appiconset/16-1.png b/...er/Builds/MacOSX/Myo Mapper (App)/Images-2.xcassets/AppIcon.appiconset/16-1.png
diff --git a/...pper/Builds/MacOSX/Myo Mapper (App)/Images-2.xcassets/AppIcon.appiconset/16.png b/...pper/Builds/MacOSX/Myo Mapper (App)/Images-2.xcassets/AppIcon.appiconset/16.png
diff --git a/...r/Builds/MacOSX/Myo Mapper (App)/Images-2.xcassets/AppIcon.appiconset/256-1.png b/...r/Builds/MacOSX/Myo Mapper (App)/Images-2.xcassets/AppIcon.appiconset/256-1.png
diff --git a/...per/Builds/MacOSX/Myo Mapper (App)/Images-2.xcassets/AppIcon.appiconset/256.png b/...per/Builds/MacOSX/Myo Mapper (App)/Images-2.xcassets/AppIcon.appiconset/256.png
diff --git a/...er/Builds/MacOSX/Myo Mapper (App)/Images-2.xcassets/AppIcon.appiconset/32-1.png b/...er/Builds/MacOSX/Myo Mapper (App)/Images-2.xcassets/AppIcon.appiconset/32-1.png
diff --git a/...pper/Builds/MacOSX/Myo Mapper (App)/Images-2.xcassets/AppIcon.appiconset/32.png b/...pper/Builds/MacOSX/Myo Mapper (App)/Images-2.xcassets/AppIcon.appiconset/32.png
diff --git a/...r/Builds/MacOSX/Myo Mapper (App)/Images-2.xcassets/AppIcon.appiconset/512-1.png b/...r/Builds/MacOSX/Myo Mapper (App)/Images-2.xcassets/AppIcon.appiconset/512-1.png
diff --git a/...per/Builds/MacOSX/Myo Mapper (App)/Images-2.xcassets/AppIcon.appiconset/512.png b/...per/Builds/MacOSX/Myo Mapper (App)/Images-2.xcassets/AppIcon.appiconset/512.png
diff --git a/Myo Mapper/Builds/MacOSX/Myo Mapper (App)/Images-2.xcassets/AppIcon.appiconset/Contents.json b/Myo Mapper/Builds/MacOSX/Myo Mapper (App)/Images-2.xcassets/AppIcon.appiconset/Contents.json
diff --git a/Myo Mapper/Builds/MacOSX/Myo Mapper (App)/Images-3.xcassets/AppIcon.appiconset/Contents.json b/Myo Mapper/Builds/MacOSX/Myo Mapper (App)/Images-3.xcassets/AppIcon.appiconset/Contents.json
diff --git a/...per/Builds/MacOSX/Myo Mapper (App)/Images.xcassets/AppIcon.appiconset/128-1.png b/...per/Builds/MacOSX/Myo Mapper (App)/Images.xcassets/AppIcon.appiconset/128-1.png
diff --git a/...apper/Builds/MacOSX/Myo Mapper (App)/Images.xcassets/AppIcon.appiconset/128.png b/...apper/Builds/MacOSX/Myo Mapper (App)/Images.xcassets/AppIcon.appiconset/128.png
diff --git a/...pper/Builds/MacOSX/Myo Mapper (App)/Images.xcassets/AppIcon.appiconset/16-1.png b/...pper/Builds/MacOSX/Myo Mapper (App)/Images.xcassets/AppIcon.appiconset/16-1.png
diff --git a/...Mapper/Builds/MacOSX/Myo Mapper (App)/Images.xcassets/AppIcon.appiconset/16.png b/...Mapper/Builds/MacOSX/Myo Mapper (App)/Images.xcassets/AppIcon.appiconset/16.png
diff --git a/...per/Builds/MacOSX/Myo Mapper (App)/Images.xcassets/AppIcon.appiconset/256-1.png b/...per/Builds/MacOSX/Myo Mapper (App)/Images.xcassets/AppIcon.appiconset/256-1.png
diff --git a/...apper/Builds/MacOSX/Myo Mapper (App)/Images.xcassets/AppIcon.appiconset/256.png b/...apper/Builds/MacOSX/Myo Mapper (App)/Images.xcassets/AppIcon.appiconset/256.png
diff --git a/...pper/Builds/MacOSX/Myo Mapper (App)/Images.xcassets/AppIcon.appiconset/32-1.png b/...pper/Builds/MacOSX/Myo Mapper (App)/Images.xcassets/AppIcon.appiconset/32-1.png
diff --git a/...Mapper/Builds/MacOSX/Myo Mapper (App)/Images.xcassets/AppIcon.appiconset/32.png b/...Mapper/Builds/MacOSX/Myo Mapper (App)/Images.xcassets/AppIcon.appiconset/32.png
diff --git a/Myo Mapper/Builds/MacOSX/Myo Mapper (App)/Images.xcassets/AppIcon.appiconset/Contents.json b/Myo Mapper/Builds/MacOSX/Myo Mapper (App)/Images.xcassets/AppIcon.appiconset/Contents.json
diff --git a/...er/Builds/MacOSX/Myo Mapper (App)/Images.xcassets/AppIcon.appiconset/icon-2.png b/...er/Builds/MacOSX/Myo Mapper (App)/Images.xcassets/AppIcon.appiconset/icon-2.png
diff --git a/...er/Builds/MacOSX/Myo Mapper (App)/Images.xcassets/AppIcon.appiconset/icon-3.png b/...er/Builds/MacOSX/Myo Mapper (App)/Images.xcassets/AppIcon.appiconset/icon-3.png