Merge branch 'master' of https://github.com/UltraCombos/Project_2018_Frozen

8 years ago · ef4471e3c4
parent 64b41329fe 9a6b0b6b32
commit ef4471e3c4
8 changed files with 35 additions and 0 deletions
--- a/.gitmodules
+++ b/.gitmodules
@ -1,3 +1,27 @@
 [submodule "Unity_2018_Frozen/Assets/UnityUtils"]
 	path = Unity_2018_Frozen/Assets/UnityUtils
 	url = https://github.com/UltraCombos/UnityUtils.git
+[submodule "of_v0.9.8/uc_libs/lib_libfreenect2"]
+	path = of_v0.9.8/uc_libs/lib_libfreenect2
+	url = https://github.com/UltraCombos/lib_libfreenect2
+	branch = master
+[submodule "of_v0.9.8/uc_libs/lib_spout"]
+	path = of_v0.9.8/uc_libs/lib_spout
+	url = https://github.com/UltraCombos/lib_spout
+	branch = master
+[submodule "of_v0.9.8/apps/myApps/Kinect2Motion"]
+	path = of_v0.9.8/apps/myApps/Kinect2Motion
+	url = https://github.com/UltraCombos/Kinect2Motion
+	branch = master
+[submodule "of_v0.9.8/apps/myApps/ucEmptyExample"]
+	path = of_v0.9.8/apps/myApps/ucEmptyExample
+	url = https://github.com/UltraCombos/ucEmptyExample
+	branch = master
+[submodule "of_v0.9.8/addons/ofxOpticalFlow"]
+	path = of_v0.9.8/addons/ofxOpticalFlow
+	url = https://github.com/UltraCombos/ofxOpticalFlow
+	branch = master
+[submodule "of_v0.9.8/addons/ofxUCUtil"]
+	path = of_v0.9.8/addons/ofxUCUtil
+	url = https://github.com/UltraCombos/ofxUCUtil
+	branch = master
--- a/of_v0.9.8/.gitignore
+++ b/of_v0.9.8/.gitignore
@ -0,0 +1,5 @@
+ofxGui
+ofxNetwork
+ofxXmlSettings
+export
+libs
--- a/of_v0.9.8/addons/ofxOpticalFlow
+++ b/of_v0.9.8/addons/ofxOpticalFlow
@ -0,0 +1 @@
+Subproject commit 17ed5c0e4f49d04b83cb1968a208023bf3a56024
--- a/of_v0.9.8/addons/ofxUCUtil
+++ b/of_v0.9.8/addons/ofxUCUtil
@ -0,0 +1 @@
+Subproject commit cff16638078967566362aadefe925d977b0c0754
--- a/of_v0.9.8/apps/myApps/Kinect2Motion
+++ b/of_v0.9.8/apps/myApps/Kinect2Motion
@ -0,0 +1 @@
+Subproject commit ce18a28cbe76d2ceff2856d1a9f875e158539ff2
--- a/of_v0.9.8/apps/myApps/ucEmptyExample
+++ b/of_v0.9.8/apps/myApps/ucEmptyExample
@ -0,0 +1 @@
+Subproject commit cec1736d3114157f043d4eb485dedb657cd97340
--- a/of_v0.9.8/uc_libs/lib_libfreenect2
+++ b/of_v0.9.8/uc_libs/lib_libfreenect2
@ -0,0 +1 @@
+Subproject commit 92fc577c35a08661d6b2b1628e8f21b3d581b6a4
--- a/of_v0.9.8/uc_libs/lib_spout
+++ b/of_v0.9.8/uc_libs/lib_spout
@ -0,0 +1 @@
+Subproject commit 94987acb7de69b159a677d8b73437b1b53f3b983
				`@ -0,0 +1 @@`
				`Subproject commit 17ed5c0e4f49d04b83cb1968a208023bf3a56024`
				`@ -0,0 +1 @@`
				`Subproject commit cff16638078967566362aadefe925d977b0c0754`
				`@ -0,0 +1 @@`
				`Subproject commit ce18a28cbe76d2ceff2856d1a9f875e158539ff2`
				`@ -0,0 +1 @@`
				`Subproject commit cec1736d3114157f043d4eb485dedb657cd97340`
				`@ -0,0 +1 @@`
				`Subproject commit 92fc577c35a08661d6b2b1628e8f21b3d581b6a4`
				`@ -0,0 +1 @@`
				`Subproject commit 94987acb7de69b159a677d8b73437b1b53f3b983`