crazier merge

CLOUDS-Interactive-Documentary · May 6, 2014 · 1cc86b3 · 1cc86b3
2 parents 7a80193 + ce0af51
commit 1cc86b3
Show file tree

Hide file tree

Showing 4,516 changed files with 297,159 additions and 50,847 deletions.
diff --git a/.gitignore b/.gitignore
@@ -354,3 +354,13 @@ CloudsData/visualsystems/3DModelLoader/models*
 /CloudsData/visualsystems_ignored_old
 
 screencapture_*
+
+/CloudsVisualSystemPlaylist/bin/data/index_save.txt
+
+/CloudsVisualSystemEditor/bin/data/_VisualSystemsSkipped.txt
+
+/CloudsData/sound/renders/
+
+/CloudsVisualSystemEditor/bin/data/Selects/
+
+/CloudsData/sound/_soundDiscard/
diff --git a/CLOUDS/CLOUDS.xcodeproj/project.pbxproj b/CLOUDS/CLOUDS.xcodeproj/project.pbxproj
diff --git a/CLOUDS/CLOUDS_SCREENING.plist b/CLOUDS/CLOUDS_SCREENING.plist
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleExecutable</key>
+	<string>${EXECUTABLE_NAME}</string>
+	<key>CFBundleIdentifier</key>
+	<string>com.yourcompany.openFrameworks</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>1.0</string>
+</dict>
+</plist>
diff --git a/CLOUDS/src/main.cpp b/CLOUDS/src/main.cpp
@@ -3,6 +3,10 @@
 //--------------------------------------------------------------
 int main(){
 	// set width, height, mode (OF_WINDOW or OF_FULLSCREEN)
+<<<<<<< HEAD
 	ofSetupOpenGL(1024, 768, OF_WINDOW);
+=======
+	ofSetupOpenGL(&window, 1280, 720, OF_WINDOW);
+>>>>>>> master
 	ofRunApp(new testApp()); // start the app
 }
diff --git a/CLOUDS/src/testApp.cpp b/CLOUDS/src/testApp.cpp
@@ -7,9 +7,15 @@ void testApp::setup(){
 	ofSetVerticalSync(true);
 	ofSetFrameRate(60);
 	ofBackground(0);
+<<<<<<< HEAD
 	//ofToggleFullscreen();
 
+=======
+//	ofToggleFullscreen();
+
+>>>>>>> master
 	player.setup();
+
 }
 
 //--------------------------------------------------------------

diff --git a/CloudsData/HUD/01_MAIN_Outer.svg b/CloudsData/HUD/01_MAIN_Outer.svg
diff --git a/CloudsData/HUD/01_MAIN_inner.svg b/CloudsData/HUD/01_MAIN_inner.svg
diff --git a/CloudsData/HUD/01_MAIN_innermost.svg b/CloudsData/HUD/01_MAIN_innermost.svg
diff --git a/CloudsData/HUD/CLOUDS_UI_v34_SVG-09.svg b/CloudsData/HUD/CLOUDS_UI_v34_SVG-09.svg
diff --git a/CloudsData/HUD/CLOUDS_UI_v42_xfr-01.svg b/CloudsData/HUD/CLOUDS_UI_v42_xfr-01.svg