Browse files

Resolved conflicts, re-enabled enemies and increased resolution.

  • Loading branch information...
1 parent 5c6f9a2 commit ffe094440a1c4c2411d16dca51f712982835077f @Dzarg Dzarg committed May 23, 2010
Showing with 6 additions and 4 deletions.
  1. +3 −0 SpaceRun/SpaceRun/Content/Content.contentproj
  2. +2 −3 SpaceRun/SpaceRun/Game1.cs
  3. +1 −1 SpaceRun/SpaceRun/Level1.cs
View
3 SpaceRun/SpaceRun/Content/Content.contentproj
@@ -289,6 +289,9 @@
</Compile>
<Compile Include="media\textures\video-tessa-talk-3.png">
<Name>video-tessa-talk-3</Name>
+ <Importer>TextureImporter</Importer>
+ <Processor>TextureProcessor</Processor>
+ </Compile>
<Compile Include="media\models\beta_ship\beta_ship.fbx">
<Name>beta_ship</Name>
<Importer>FbxImporter</Importer>
View
5 SpaceRun/SpaceRun/Game1.cs
@@ -30,6 +30,8 @@ public Game1()
{
graphics = new GraphicsDeviceManager(this);
Content.RootDirectory = "Content";
+ graphics.PreferredBackBufferWidth = 1024;
+ graphics.PreferredBackBufferHeight = 768;
}
/// <summary>
@@ -134,16 +136,13 @@ protected override void Draw(GameTime gameTime)
{
((PlayerShip)EntityManager.get().playerShips[0]).DrawDebug(spriteBatch, debugFont);
}
-<<<<<<< HEAD
-=======
//HACK: network debug
if (network.session != null)
{
network.DrawDebug(spriteBatch, debugFont);
}
->>>>>>> 05d13088316a6d5fa674a68441f32f3b50af2e18
spriteBatch.End();
hud.Render(graphics);
View
2 SpaceRun/SpaceRun/Level1.cs
@@ -30,7 +30,7 @@ public override void populateLevel()
}
for (int i = 0; i < 20; i++)
{
- //createEnemyFighter(new Vector3(rand.Next(50) - 25, rand.Next(50) - 25, rand.Next(500) - 500));
+ createEnemyFighter(new Vector3(rand.Next(50) - 25, rand.Next(50) - 25, rand.Next(500) - 500));
}
createPlanet(new Vector3(0, 0, -1000));

0 comments on commit ffe0944

Please sign in to comment.