Commits

Anonymous committed 1f222fa Merge

Merge

Comments (0)

Files changed (7)

Assembly-CSharp-vs.csproj

      <Compile Include="Assets\Scripts\HeroScript.cs" />
      <Compile Include="Assets\Scripts\LifeManagerScript.cs" />
      <Compile Include="Assets\Scripts\MainMenuScript.cs" />
+     <Compile Include="Assets\Scripts\MainMenuScript1.cs" />
      <Compile Include="Assets\Scripts\MinimapCameraControlScript.cs" />
      <Compile Include="Assets\Scripts\MinimapIconScript.cs" />
      <Compile Include="Assets\Scripts\ParticleEffectScript.cs" />

Assembly-CSharp.csproj

      <Compile Include="Assets\Scripts\HeroScript.cs" />
      <Compile Include="Assets\Scripts\LifeManagerScript.cs" />
      <Compile Include="Assets\Scripts\MainMenuScript.cs" />
+     <Compile Include="Assets\Scripts\MainMenuScript1.cs" />
      <Compile Include="Assets\Scripts\MinimapCameraControlScript.cs" />
      <Compile Include="Assets\Scripts\MinimapIconScript.cs" />
      <Compile Include="Assets\Scripts\ParticleEffectScript.cs" />

Assets/Prefabs/ShipLoggerPrefab.prefab

Binary file modified.

Assets/Prefabs/TextPrefab.prefab

Binary file modified.

Assets/Scripts/ShipLoggerScript.cs

 
 	public GUIText text;
 	public float DisplayTime;
+	public int LineLength;
 
 	private float timeRemaining;
 	private GUIText textClone;
+	
 
 
 	// Use this for initialization
 		
         
 
-		for (int i = 80; i < str.Length; i += 80)
+		for (int i = LineLength; i < str.Length; i += LineLength)
 		{
 			Debug.Log(i);
 

ludum dare-csharp.sln

 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-																	GlobalSection(MonoDevelopProperties) = preSolution
+																				GlobalSection(MonoDevelopProperties) = preSolution
 		StartupItem = Assembly-CSharp.csproj
 		Policies = $0
 		$0.TextStylePolicy = $1
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-																GlobalSection(MonoDevelopProperties) = preSolution
+																			GlobalSection(MonoDevelopProperties) = preSolution
 		StartupItem = Assembly-CSharp.csproj
 		Policies = $0
 		$0.TextStylePolicy = $1