Merge pull request #1 from poljere/development

Minor build fixes, including wording, team configuration, gitignore and more
beautypi · Sep 22, 2015 · fd79559 · fd79559
2 parents 6666b11 + 4c2b86c
commit fd79559
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 22 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,4 +4,4 @@
 Pods/*
 shadertoy.xcworkspace
 shadertoy.xcworkspace/*
-
+build/
diff --git a/shadertoy.xcodeproj/project.pbxproj b/shadertoy.xcodeproj/project.pbxproj
@@ -214,7 +214,6 @@
 				TargetAttributes = {
 					4BF748C31B84852A00E2F772 = {
 						CreatedOnToolsVersion = 6.4;
-						DevelopmentTeam = 98UZZR2W46;
 					};
 				};
 			};

diff --git a/shadertoy/AboutViewController.m b/shadertoy/AboutViewController.m
@@ -28,12 +28,12 @@ - (void)viewDidLoad {
     self.navigationItem.leftBarButtonItem = item;
 
     [self.aboutText setText:
-     @"Shadertoy App can be used to view the shaders of http://www.shadertoy.com on your iPhone.\n\n"
+     @"The official Shadertoy App can be used to browse Shadertoy.com on your iOS device.\n\n"
      @"Developed by Reinder Nijhoff.\n" ];
 
     NSString * version = [[NSBundle mainBundle] objectForInfoDictionaryKey: @"CFBundleShortVersionString"];
     [self.aboutText2 setText:
-     [NSString stringWithFormat:@"\nThis is version %@ of the Shadertoy App. Not all input types of the shaders (keyboard, webcam, sound, video) are fully implemented yet.\n\n"
+     [NSString stringWithFormat:@"\nVersion %@ : Not all shader input types are implemented yet (keyboard, webcam, sound, video).\n\n"
       @"Please let me know if you have any suggestions, comments or questions about this app:\n"
       , version]];
 }

diff --git a/shadertoy/Base.lproj/LaunchScreen.xib b/shadertoy/Base.lproj/LaunchScreen.xib
@@ -17,33 +17,15 @@
                         <constraint firstAttribute="height" constant="40" id="POl-Y6-dFX"/>
                     </constraints>
                 </imageView>
-                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="App" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ouQ-J9-wV5">
-                    <rect key="frame" x="224" y="168" width="32" height="21"/>
-                    <constraints>
-                        <constraint firstAttribute="height" constant="21" id="6EY-6X-TiR"/>
-                        <constraint firstAttribute="width" constant="32" id="kUX-pZ-u0b"/>
-                    </constraints>
-                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                    <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
-                    <nil key="highlightedColor"/>
-                </label>
             </subviews>
             <color key="backgroundColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
             <constraints>
-                <constraint firstItem="ouQ-J9-wV5" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="67" id="Fj6-aE-bvu"/>
-                <constraint firstAttribute="centerX" secondItem="ouQ-J9-wV5" secondAttribute="centerX" id="GVG-1E-jk2"/>
                 <constraint firstItem="uxp-gF-kPj" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="8" id="RlC-in-K6h"/>
                 <constraint firstAttribute="trailing" secondItem="uxp-gF-kPj" secondAttribute="trailing" constant="8" id="TBV-gd-Q5M"/>
                 <constraint firstItem="uxp-gF-kPj" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" constant="120" id="aqR-cw-USQ"/>
-                <constraint firstItem="ouQ-J9-wV5" firstAttribute="top" secondItem="uxp-gF-kPj" secondAttribute="bottom" constant="8" id="cTS-DF-vm4"/>
             </constraints>
             <nil key="simulatedStatusBarMetrics"/>
             <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
-            <variation key="default">
-                <mask key="constraints">
-                    <exclude reference="Fj6-aE-bvu"/>
-                </mask>
-            </variation>
             <point key="canvasLocation" x="548" y="455"/>
         </view>
     </objects>
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,4 +4,4 @@ @@
     Pods/*
     shadertoy.xcworkspace
     shadertoy.xcworkspace/*
+    build/