Merge branch 'release/1.1'

DanielMcAssey · Mar 25, 2014 · bf77e32 · bf77e32
2 parents d5e6b08 + ce99ffd
commit bf77e32
Show file tree

Hide file tree

Showing 10 changed files with 42 additions and 33 deletions.
diff --git a/SolarFusion/SolarFusion/SolarFusion/Core/Input/InputHelper.cs b/SolarFusion/SolarFusion/SolarFusion/Core/Input/InputHelper.cs
@@ -56,18 +56,16 @@ static public void endUpdate()
         public void AddKeyboardInput(Keys keyPressed, bool isReleased)
         {
             if (mKeyboard.ContainsKey(keyPressed))
-            {
                 return;
-            }
+
             mKeyboard.Add(keyPressed, isReleased);
         }
 
         public void AddGamepadInput(Buttons buttonPressed, bool isReleased)
         {
             if (mGamepad.ContainsKey(buttonPressed))
-            {
                 return;
-            }
+
             mGamepad.Add(buttonPressed, isReleased);
         }
 
@@ -78,16 +76,12 @@ public bool IsPressed(PlayerIndex? playerIndex)
                 if (mKeyboard[aKey] == true)
                 {
                     if (CurrentKeyboardState.IsKeyDown(aKey) == true && PreviousKeyboardState.IsKeyDown(aKey) == false)
-                    {
                         return true;
-                    }
                 }
                 else
                 {
                     if (CurrentKeyboardState.IsKeyDown(aKey))
-                    {
                         return true;
-                    }
                 }
             }
 
@@ -96,16 +90,12 @@ public bool IsPressed(PlayerIndex? playerIndex)
                 if (mGamepad[aButton] == true)
                 {
                     if (CurrentGamePadState[playerIndex].IsButtonDown(aButton) == true && PreviousGamePadState[playerIndex].IsButtonDown(aButton) == false)
-                    {
                         return true;
-                    }
                 }
                 else
                 {
                     if (CurrentGamePadState[playerIndex].IsButtonDown(aButton))
-                    {
                         return true;
-                    }
                 }
             }
 

diff --git a/SolarFusion/SolarFusion/SolarFusion/Core/Input/InputManager.cs b/SolarFusion/SolarFusion/SolarFusion/Core/Input/InputManager.cs
@@ -30,8 +30,9 @@ public InputManager()
             this.AddGamePadInput("NAV_SELECT", SysConfig.INPUT_GAMEPAD_SELECT, true);
             this.AddGamePadInput("NAV_CANCEL", SysConfig.INPUT_GAMEPAD_CANCEL, true);
 
-            this.AddGamePadInput("GLOBAL_START", SysConfig.INPUT_GAMEPAD_START, false);
-            this.AddGamePadInput("GAME_PAUSE", SysConfig.INPUT_GAMEPAD_START, false);
+            this.AddGamePadInput("GLOBAL_START", SysConfig.INPUT_GAMEPAD_START, true);
+            this.AddGamePadInput("GLOBAL_DEBUG", SysConfig.INPUT_GAMEPAD_DEBUG, true);
+            this.AddGamePadInput("GAME_PAUSE", SysConfig.INPUT_GAMEPAD_START, true);
 
             this.AddGamePadInput("PLAY_MOVE_LEFT", SysConfig.INPUT_GAMEPAD_LEFT_DPAD, false);
             this.AddGamePadInput("PLAY_MOVE_LEFT", SysConfig.INPUT_GAMEPAD_LEFT_STICK, false);
@@ -49,8 +50,9 @@ public InputManager()
             this.AddKeyboardInput("NAV_SELECT", SysConfig.INPUT_KEYBOARD_SELECT, true);
             this.AddKeyboardInput("NAV_CANCEL", SysConfig.INPUT_KEYBOARD_CANCEL, true);
 
-            this.AddKeyboardInput("GLOBAL_START", SysConfig.INPUT_KEYBOARD_START, false);
-            this.AddKeyboardInput("GAME_PAUSE", SysConfig.INPUT_KEYBOARD_CANCEL, false);
+            this.AddKeyboardInput("GLOBAL_START", SysConfig.INPUT_KEYBOARD_START, true);
+            this.AddKeyboardInput("GLOBAL_DEBUG", SysConfig.INPUT_KEYBOARD_DEBUG, true);
+            this.AddKeyboardInput("GAME_PAUSE", SysConfig.INPUT_KEYBOARD_CANCEL, true);
 
             this.AddKeyboardInput("PLAY_MOVE_LEFT", SysConfig.INPUT_KEYBOARD_LEFT, false);
             this.AddKeyboardInput("PLAY_MOVE_RIGHT", SysConfig.INPUT_KEYBOARD_RIGHT, false);

diff --git a/SolarFusion/SolarFusion/SolarFusion/Core/Level/LevelManager.cs b/SolarFusion/SolarFusion/SolarFusion/Core/Level/LevelManager.cs
@@ -63,6 +63,12 @@ public LevelTilemap CurrentGameMap
         {
             get { return this._obj_map; }
         }
+
+        public bool Debug
+        {
+            get { return this.mDebugEnabled; }
+            set { this.mDebugEnabled = value; }
+        }
         #endregion
         // !Properties
 

diff --git a/SolarFusion/SolarFusion/SolarFusion/Core/Screen/GUIScreens/ScreenCredits.cs b/SolarFusion/SolarFusion/SolarFusion/Core/Screen/GUIScreens/ScreenCredits.cs
@@ -82,11 +82,16 @@ public override void update()
 
         public override void render()
         {
+            // Draw the selected entry in yellow, otherwise white.
+            Color tmenuimgclr = Color.White;
+
+            // Modify the alpha to fade text out during transitions.
+            tmenuimgclr *= this.CurrentTransitionAlpha;
+
             base.render();
             this.ScreenManager.SpriteBatch.Begin();
-
             for (int i = 0; i < this.mCreditList.Count; i++)
-                this.ScreenManager.SpriteBatch.DrawString(this.ScreenManager.DefaultGUIFont, this.mCreditList[i].FullString, this.mCreditList[i].TextPosition, Color.White, 0f, this.mCreditList[i].TextOrigin, this.mTextScale, SpriteEffects.None, 0f);
+                this.ScreenManager.SpriteBatch.DrawString(this.ScreenManager.DefaultGUIFont, this.mCreditList[i].FullString, this.mCreditList[i].TextPosition, tmenuimgclr, 0f, this.mCreditList[i].TextOrigin, this.mTextScale, SpriteEffects.None, 0f);
 
             this.ScreenManager.SpriteBatch.End();
         }

diff --git a/SolarFusion/SolarFusion/SolarFusion/Core/Screen/GameScreens/ScreenGame.cs b/SolarFusion/SolarFusion/SolarFusion/Core/Screen/GameScreens/ScreenGame.cs
@@ -68,6 +68,9 @@ public override void update() //Update per frame
             if (this.GlobalInput.IsPressed("PLAY_WEAPON_FIRE", this.ControllingPlayer)) //If player presses the jump button (Spacebar/A)
                 this._obj_activeplayer.fire();
 
+            if (this.GlobalInput.IsPressed("GLOBAL_DEBUG", this.ControllingPlayer)) //If player presses the jump button (Spacebar/A)
+                this._obj_levelmanager.Debug = !this._obj_levelmanager.Debug;
+
             base.update();
         }
 

diff --git a/SolarFusion/SolarFusion/SolarFusion/Core/SysConfig.cs b/SolarFusion/SolarFusion/SolarFusion/Core/SysConfig.cs
@@ -64,6 +64,7 @@ public class SysConfig
 
         public const Buttons INPUT_GAMEPAD_JUMP = Buttons.A;
         public const Buttons INPUT_GAMEPAD_FIRE = Buttons.RightShoulder;
+        public const Buttons INPUT_GAMEPAD_DEBUG = Buttons.RightStick;
 
         //Default Keyboard Controls
         public const Keys INPUT_KEYBOARD_UP = Keys.Up;
@@ -77,5 +78,6 @@ public class SysConfig
 
         public const Keys INPUT_KEYBOARD_JUMP = Keys.Space;
         public const Keys INPUT_KEYBOARD_FIRE = Keys.X;
+        public const Keys INPUT_KEYBOARD_DEBUG = Keys.F2;
     }
 }
diff --git a/SolarFusion/SolarFusion/SolarFusionContent/Core/Data/Players/asterix.xml b/SolarFusion/SolarFusion/SolarFusionContent/Core/Data/Players/asterix.xml
@@ -7,27 +7,27 @@
     <playerScale>1</playerScale>
     <maxFrameCount>10</maxFrameCount>
     <playerAnimations>
-      <Item>right</Item>
       <Item>left</Item>
+      <Item>right</Item>
       <Item>idle</Item>
     </playerAnimations>
     <playerAnimationFrameCount>
       <Item>10</Item>
       <Item>10</Item>
-      <Item>3</Item>
+      <Item>8</Item>
     </playerAnimationFrameCount>
     <playerAnimationsFPS>
       <Item>
-        <Key>right</Key>
-        <Value>15</Value>
+        <Key>left</Key>
+        <Value>5</Value>
       </Item>
       <Item>
-        <Key>left</Key>
-        <Value>15</Value>
+        <Key>right</Key>
+        <Value>5</Value>
       </Item>
       <Item>
         <Key>idle</Key>
-        <Value>1</Value>
+        <Value>3</Value>
       </Item>
     </playerAnimationsFPS>
     <moveSpeed>1.8</moveSpeed>

diff --git a/SolarFusion/SolarFusion/SolarFusionContent/Core/Data/players.xml b/SolarFusion/SolarFusion/SolarFusionContent/Core/Data/players.xml
@@ -2,6 +2,6 @@
 <XnaContent>
   <Asset Type="System.String[]">
     <Item>dr_jumpista</Item>
-    <!-- <Item>asterix</Item> -->
+    <Item>asterix</Item>
   </Asset>
 </XnaContent>
diff --git a/SolarFusion/SolarFusion/SolarFusionContent/SolarFusionContent.contentproj b/SolarFusion/SolarFusion/SolarFusionContent/SolarFusionContent.contentproj
@@ -1094,13 +1094,6 @@
       <Processor>TextureProcessor</Processor>
     </Compile>
   </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Sprites\Characters\asterix\spritesheet.png">
-      <Name>spritesheet</Name>
-      <Importer>TextureImporter</Importer>
-      <Processor>TextureProcessor</Processor>
-    </Compile>
-  </ItemGroup>
   <ItemGroup>
     <Compile Include="Sprites\Objects\Animated\warp\spritesheet.png">
       <Name>spritesheet</Name>
@@ -1157,6 +1150,14 @@
       <Processor>TextureProcessor</Processor>
     </Compile>
   </ItemGroup>
+  <ItemGroup />
+  <ItemGroup>
+    <Compile Include="Sprites\Characters\asterix\spritesheet.png">
+      <Name>spritesheet</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\XNA Game Studio\$(XnaFrameworkVersion)\Microsoft.Xna.GameStudio.ContentPipeline.targets" />
   <!--  To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

diff --git a/...usion/SolarFusion/SolarFusionContent/Sprites/Characters/asterix/spritesheet.png b/...usion/SolarFusion/SolarFusionContent/Sprites/Characters/asterix/spritesheet.png