General Update JACK 12.FEB.2072

Added more config functionality.  Fixed some bugs.  Tested build and
fixed build bugs.

.gitignore

@@ -2,6 +2,7 @@
 [Tt]emp/
 [Oo]bj/
 [Bb]uild/
+[Tt]estBuilds/
 
 # Autogenerated VS/MD solution and project files
 *.csproj

Assets/Scripts/ConfigurationMenuVideoApply.cs

@@ -8,5 +8,9 @@ public class ConfigurationMenuVideoApply : MonoBehaviour {
 
 	public void OnApplyClick () {
 		Screen.SetResolution(Screen.resolutions[resolutionPicker.value].width,Screen.resolutions[resolutionPicker.value].height,true);
+		Screen.fullScreen = Const.a.GraphicsFullscreen;
+		Const.a.GraphicsResWidth = Screen.resolutions[resolutionPicker.value].width;
+		Const.a.GraphicsResHeight = Screen.resolutions[resolutionPicker.value].height;
+		Const.a.WriteConfig();
 	}
 }

Assets/Scripts/Const.cs

@@ -86,6 +86,9 @@ public enum PoolType{DartImpacts,SparqImpacts,CameraExplosions,ProjEnemShot2,Sec
 	void Awake() {
 		Application.targetFrameRate = 60;
 		a = this;
+		//for (int i=0;i<Display.displays.Length;i++) {
+		//	Display.displays[i].Activate();
+		//}
 	}
 	// =========================================================================
 	void Start() {
@@ -131,6 +134,8 @@ private void LoadConfig() {
 		InputQuickItemPickup = AssignConfigBool("Input","QuickItemPickup");
 		InputQuickReloadWeapons = AssignConfigBool("Input","QuickReloadWeapons");
 		SetVolume();
+		Screen.SetResolution(GraphicsResWidth,GraphicsResHeight,true);
+		Screen.fullScreen = Const.a.GraphicsFullscreen;
 	}
 
 	public void WriteConfig() {

Assets/Scripts/MouseCursor.cs

@@ -21,14 +21,16 @@ void OnGUI () {
             offsetY = offsetX;
         }
 
-		//Debug.Log("MouseCursor:: Input.mousePosition.x: " + Input.mousePosition.x.ToString() + ", Input.mousePosition.y: " + Input.mousePosition.y.ToString());
-        if (playerCamera.GetComponent<MouseLookScript>().inventoryMode) {
+		/*//Debug.Log("MouseCursor:: Input.mousePosition.x: " + Input.mousePosition.x.ToString() + ", Input.mousePosition.y: " + Input.mousePosition.y.ToString());
+		if (playerCamera.GetComponent<MouseLookScript>().inventoryMode || PauseScript.a.paused) {
             // Inventory Mode Cursor
             GUI.DrawTexture(new Rect(Input.mousePosition.x - offsetX, Screen.height - Input.mousePosition.y - offsetY, cursorSize, cursorSize), cursorImage);
         } else {
             // Shoot Mode Cursor
             GUI.DrawTexture(new Rect((Screen.width/2) - offsetX, (Screen.height/2) - cursorSize, cursorSize, cursorSize), cursorImage);
-        }
+        }*/
+
+		GUI.DrawTexture(new Rect(Input.mousePosition.x - offsetX, Screen.height - Input.mousePosition.y - offsetY, cursorSize, cursorSize), cursorImage);
 	}
 
 	void Update () {

Assets/Scripts/MouseLookScript.cs

@@ -146,6 +146,8 @@ void Update () {
 				xRotation -= (Input.GetAxis("Mouse Y") * lookSensitivity);
 				xRotation = Mathf.Clamp(xRotation, -90, 90);  // Limit up and down angle. TIP:: Need to disable clamp for Cyberspace!
 				transform.rotation = Quaternion.Euler(xRotation, yRotation, 0);
+			} else {
+				Const.sprint("ERROR: Paused is true and inventoryMode is false");
 			}
 		} else {
 			if (Input.GetButton("Yaw")) {
@@ -741,7 +743,7 @@ void  SearchObject ( int index  ){
 		int[] resultContents = {-1,-1,-1,-1};  // create blanked container for search results
 		int[] resultCustomIndex = {-1,-1,-1,-1};  // create blanked container for search results custom indices
 		for (int i=currentSearchItem.GetComponent<SearchableItem>().numSlots - 1;i>=0;i--) {
-			Const.sprint("Search index = " + i.ToString() + ", and SearchableItem.customIndex.Length = " + currentSearchItem.GetComponent<SearchableItem>().customIndex.Length.ToString());
+			//Const.sprint("Search index = " + i.ToString() + ", and SearchableItem.customIndex.Length = " + currentSearchItem.GetComponent<SearchableItem>().customIndex.Length.ToString());
 			resultContents[i] = currentSearchItem.GetComponent<SearchableItem>().contents[i];
 			resultCustomIndex[i] = currentSearchItem.GetComponent<SearchableItem>().customIndex[i];
 			if (resultContents[i] > -1) {

Assets/Scripts/PauseScript.cs

@@ -13,7 +13,6 @@ public class PauseScript : MonoBehaviour {
 	private Texture2D previousCursorImage;
 	public GameObject saltTheFries;
 	public GameObject[] enableUIOnPause;
-	public GameObject quitButton;
 	public GameObject mainMenu;
 
 	void Awake() {a = this; }
@@ -42,35 +41,37 @@ public void PauseToggle() {
 	}
 
 	void PauseEnable() {
+		previousInvMode = mouselookScript.inventoryMode;
+		if (mouselookScript.inventoryMode == false) {
+			mouselookScript.ToggleInventoryMode();
+		}
 		paused = true;
 		pauseText.enabled = true;
-		previousInvMode = mouselookScript.inventoryMode;
 		previousCursorImage = mouseCursor.cursorImage;
 		mouseCursor.cursorImage = mouselookScript.cursorDefaultTexture;
-		mouselookScript.inventoryMode = true;
-		for (int i=0;i>disableUIOnPause.Length;i++) {
+		for (int i=0;i<disableUIOnPause.Length;i++) {
 			disableUIOnPause[i].SetActive(false);
 		}
 
-		for (int j=0;j>enableUIOnPause.Length;j++) {
+		for (int j=0;j<enableUIOnPause.Length;j++) {
 			enableUIOnPause[j].SetActive(true);
 		}
-		quitButton.SetActive(true);
 	}
 
 	void PauseDisable() {
 		paused = false;
 		pauseText.enabled = false;
-		mouselookScript.inventoryMode = previousInvMode;
+		if (previousInvMode != mouselookScript.inventoryMode) {
+			mouselookScript.ToggleInventoryMode();
+		}
 		mouseCursor.cursorImage = previousCursorImage;
-		for (int i=0;i>disableUIOnPause.Length;i++) {
+		for (int i=0;i<disableUIOnPause.Length;i++) {
 			disableUIOnPause[i].SetActive(true);
 		}
 
-		for (int j=0;j>enableUIOnPause.Length;j++) {
+		for (int j=0;j<enableUIOnPause.Length;j++) {
 			enableUIOnPause[j].SetActive(false);
 		}
-		quitButton.SetActive(false);
 	}
 
 	public void PauseQuit () {

Assets/StreamingAssets/Config.ini

@@ -1,7 +1,7 @@
 // Citadel Configuration File
 [Graphics]
-ResolutionWidth = 1024
-ResolutionHeight = 768
+ResolutionWidth = 1680
+ResolutionHeight = 1050
 Fullscreen = 1
 SSAO = 1
 Bloom = 1