diff --git a/.gitignore b/.gitignore index f702560..1427730 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ SolarFusion/GameData/obj/ SolarFusion/DataPipeline/obj/ SolarFusion/DataPipeline/bin/ SolarFusion/GameData/bin/x86/Debug/GameData.dll +SolarFusion/GameData/bin/ diff --git a/SolarFusion/SolarFusion/SolarFusion/Core/Game.cs b/SolarFusion/SolarFusion/SolarFusion/Core/Game.cs index 96df301..1a7e82d 100644 --- a/SolarFusion/SolarFusion/SolarFusion/Core/Game.cs +++ b/SolarFusion/SolarFusion/SolarFusion/Core/Game.cs @@ -54,8 +54,8 @@ public Game() this._obj_config.WIN32_CreateNewFile(); #elif XBOX this._obj_config.X360_CreateNewFile(); - this._obj_config.Settings.VIDEO_RES_WIDTH = 1280; - this._obj_config.Settings.VIDEO_RES_HEIGHT = 720; + this._obj_config.Settings.VIDEO_RES_WIDTH = this._obj_graphics.GraphicsDevice.DisplayMode.Width; // Use Full Possible Resolution + this._obj_config.Settings.VIDEO_RES_HEIGHT = this._obj_graphics.GraphicsDevice.DisplayMode.Height; this._obj_config.Settings.VIDEO_FULLSCREEN = true; this._obj_config.Settings.VIDEO_ANTIALIASING = true; this._obj_config.Settings.VIDEO_VSYNC = true; diff --git a/SolarFusion/SolarFusion/SolarFusion/Core/Screen/DefaultScreens/ScreenPause.cs b/SolarFusion/SolarFusion/SolarFusion/Core/Screen/DefaultScreens/ScreenPause.cs index e58fa70..bbc8bcf 100644 --- a/SolarFusion/SolarFusion/SolarFusion/Core/Screen/DefaultScreens/ScreenPause.cs +++ b/SolarFusion/SolarFusion/SolarFusion/Core/Screen/DefaultScreens/ScreenPause.cs @@ -64,7 +64,7 @@ public override void render() /// void EventTriggerGoToMain(object sender, EventPlayer e) { - const string tmessage = "Are you sure you want to exit the simulation?"; + const string tmessage = "Are you sure you want to exit the game?"; ScreenMsgBox tmsgboxconfirmquit = new ScreenMsgBox(SysConfig.ASSET_CONFIG_MSGBOX_BG, tmessage); tmsgboxconfirmquit.onAccepted += EventTriggerConfirmGoToMain; ScreenManager.addScreen(tmsgboxconfirmquit, ControllingPlayer); diff --git a/SolarFusion/SolarFusion/SolarFusion/Core/Screen/System/AppScreen.cs b/SolarFusion/SolarFusion/SolarFusion/Core/Screen/System/AppScreen.cs index 4c8f96d..0273cf1 100644 --- a/SolarFusion/SolarFusion/SolarFusion/Core/Screen/System/AppScreen.cs +++ b/SolarFusion/SolarFusion/SolarFusion/Core/Screen/System/AppScreen.cs @@ -66,6 +66,9 @@ public override void update() /// public override void render() { + //Clear Screen Black + this.ScreenManager.GraphicsDevice.Clear(Color.Black); + //Render the screen this.appRender(); //Draw our overlay screen fade. this.renderScreenFade();