Anonymous avatar Anonymous committed d0fbcba Merge

Merge

Comments (0)

Files changed (4)

Add a comment to this file

Assets/Prefabs/TextPrefab.prefab

Binary file modified.

Add a comment to this file

Assets/Scenes/menu.unity

Binary file modified.

Assets/Scripts/EnemyManagerScript.cs

 		enemyPos.angle += Mathf.PI;
 		Debug.Log("spawning");
 
-		var Enemy = GameObject.Instantiate(EnemyType, PolarCoord.polarToCartesian(enemyPos), Quaternion.AngleAxis(enemyPos.angle * Mathf.Rad2Deg, Vector3.back)) as GameObject;
+		var Enemy = GameObject.Instantiate(EnemyType, PolarCoord.polarToCartesian(enemyPos), Quaternion.AngleAxis(enemyPos.angle * Mathf.Rad2Deg -90, Vector3.back)) as GameObject;
 		Enemy.GetComponent<EnemyScript>().World = World;
 
 		eligibleForSpawn = false;

Assets/Scripts/ShipLoggerScript.cs

 	// Use this for initialization
 	void Start () {
 		textClone = Instantiate(text) as GUIText;
-		textClone.gameObject.active = false;
-		textClone.fontSize = 12;
+		textClone.gameObject.active = false;
 	}
 	
 	// Update is called once per frame
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.