Changeset 1980 for 2010/23


Ignore:
Timestamp:
2011-06-14 12:01:48 (8 years ago)
Author:
hniemi
Message:
 
Location:
2010/23/hniemi/JyTris/JyTris
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • 2010/23/hniemi/JyTris/JyTris/JyTris.csproj

    r1540 r1980  
    1 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5"> 
     1<?xml version="1.0" encoding="utf-8"?> 
     2<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0"> 
    23  <PropertyGroup> 
    34    <ProjectGuid>{3854E62B-7704-4674-860B-A6E9495B100D}</ProjectGuid> 
     
    910    <RootNamespace>JyTris</RootNamespace> 
    1011    <AssemblyName>JyTris</AssemblyName> 
    11     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion> 
    12     <XnaFrameworkVersion>v3.1</XnaFrameworkVersion> 
     12    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion> 
     13    <XnaFrameworkVersion>v4.0</XnaFrameworkVersion> 
    1314    <XnaPlatform>Windows</XnaPlatform> 
    1415    <XnaCrossPlatformGroupID>93a4f38d-0f69-4870-a01f-26b2e46e59a8</XnaCrossPlatformGroupID> 
     
    1617    <Thumbnail>GameThumbnail.png</Thumbnail> 
    1718    <IsWebBootstrapper>false</IsWebBootstrapper> 
     19    <XnaUpgrade> 
     20    </XnaUpgrade> 
     21    <XnaOutputType>Game</XnaOutputType> 
     22    <XnaProfile>HiDef</XnaProfile> 
     23    <TargetFrameworkProfile>Client</TargetFrameworkProfile> 
     24    <FileUpgradeFlags> 
     25    </FileUpgradeFlags> 
     26    <OldToolsVersion>3.5</OldToolsVersion> 
     27    <UpgradeBackupLocation /> 
    1828    <PublishUrl>publish\</PublishUrl> 
    1929    <Install>true</Install> 
     
    4353    <PlatformTarget>x86</PlatformTarget> 
    4454    <XnaCompressContent>false</XnaCompressContent> 
     55    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> 
    4556  </PropertyGroup> 
    4657  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' "> 
     
    5465    <UseVSHostingProcess>false</UseVSHostingProcess> 
    5566    <PlatformTarget>x86</PlatformTarget> 
    56     <XnaCompressContent>true</XnaCompressContent> 
     67    <XnaCompressContent>True</XnaCompressContent> 
     68    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> 
    5769  </PropertyGroup> 
    5870  <ItemGroup> 
    59     <Reference Include="Jypeli2, Version=1.0.0.0, Culture=neutral, processorArchitecture=x86"> 
    60       <SpecificVersion>False</SpecificVersion> 
    61       <HintPath>..\..\lib\Jypeli2.dll</HintPath> 
     71    <Reference Include="Jypeli4"> 
     72      <HintPath>..\..\..\..\Program Files\Jypeli\lib\x86\Jypeli4.dll</HintPath> 
    6273    </Reference> 
    63     <Reference Include="Microsoft.Xna.Framework, Version=3.1.0.0, Culture=neutral, PublicKeyToken=6d5c3888ef60e27d" /> 
    64     <Reference Include="Microsoft.Xna.Framework.Game, Version=3.1.0.0, Culture=neutral, PublicKeyToken=6d5c3888ef60e27d" /> 
     74    <Reference Include="Microsoft.Xna.Framework, Version=4.0.0.0, Culture=neutral, PublicKeyToken=842cf8be1de50553"> 
     75      <Private>False</Private> 
     76    </Reference> 
     77    <Reference Include="Microsoft.Xna.Framework.Avatar, Version=4.0.0.0, Culture=neutral, PublicKeyToken=842cf8be1de50553, processorArchitecture=MSIL"> 
     78      <Private>False</Private> 
     79    </Reference> 
     80    <Reference Include="Microsoft.Xna.Framework.Game, Version=4.0.0.0, Culture=neutral, PublicKeyToken=842cf8be1de50553"> 
     81      <Private>False</Private> 
     82    </Reference> 
     83    <Reference Include="Microsoft.Xna.Framework.GamerServices, Version=4.0.0.0, Culture=neutral, PublicKeyToken=842cf8be1de50553, processorArchitecture=MSIL"> 
     84      <Private>False</Private> 
     85    </Reference> 
     86    <Reference Include="Microsoft.Xna.Framework.Graphics, Version=4.0.0.0, Culture=neutral, PublicKeyToken=842cf8be1de50553, processorArchitecture=x86"> 
     87      <Private>False</Private> 
     88    </Reference> 
     89    <Reference Include="Microsoft.Xna.Framework.Input.Touch, Version=4.0.0.0, Culture=neutral, PublicKeyToken=842cf8be1de50553, processorArchitecture=MSIL"> 
     90      <Private>False</Private> 
     91    </Reference> 
     92    <Reference Include="Microsoft.Xna.Framework.Net, Version=4.0.0.0, Culture=neutral, PublicKeyToken=842cf8be1de50553, processorArchitecture=MSIL"> 
     93      <Private>False</Private> 
     94    </Reference> 
     95    <Reference Include="Microsoft.Xna.Framework.Storage, Version=4.0.0.0, Culture=neutral, PublicKeyToken=842cf8be1de50553, processorArchitecture=MSIL"> 
     96      <Private>False</Private> 
     97    </Reference> 
     98    <Reference Include="Microsoft.Xna.Framework.Video, Version=4.0.0.0, Culture=neutral, PublicKeyToken=842cf8be1de50553, processorArchitecture=MSIL"> 
     99      <Private>False</Private> 
     100    </Reference> 
     101    <Reference Include="Microsoft.Xna.Framework.Xact, Version=4.0.0.0, Culture=neutral, PublicKeyToken=842cf8be1de50553, processorArchitecture=x86"> 
     102      <Private>False</Private> 
     103    </Reference> 
    65104    <Reference Include="mscorlib"> 
    66105      <Private>False</Private> 
     
    74113    </Reference> 
    75114    <Reference Include="System.Core"> 
    76       <RequiredTargetFramework>3.5</RequiredTargetFramework> 
    77115      <Private>False</Private> 
    78116    </Reference> 
    79117    <Reference Include="System.Xml.Linq"> 
    80       <RequiredTargetFramework>3.5</RequiredTargetFramework> 
    81118      <Private>False</Private> 
    82119    </Reference> 
     
    99136  </ItemGroup> 
    100137  <ItemGroup> 
     138    <BootstrapperPackage Include="Microsoft.Net.Client.3.5"> 
     139      <Visible>False</Visible> 
     140      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName> 
     141      <Install>false</Install> 
     142    </BootstrapperPackage> 
    101143    <BootstrapperPackage Include="Microsoft.Net.Framework.2.0"> 
    102144      <Visible>False</Visible> 
     
    129171      <Install>true</Install> 
    130172    </BootstrapperPackage> 
     173    <BootstrapperPackage Include="Microsoft.Xna.Framework.4.0"> 
     174      <Visible>False</Visible> 
     175      <ProductName>Microsoft XNA Framework Redistributable 4.0</ProductName> 
     176      <Install>true</Install> 
     177    </BootstrapperPackage> 
    131178  </ItemGroup> 
    132179  <ItemGroup> 
    133     <Compile Include="topten.dat"> 
    134       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> 
    135     </Compile> 
     180    <ProjectReference Include="Content\JyTrisContent.contentproj"> 
     181      <Project>{F4DC0895-798C-4BEF-93D3-7D35766B520D}</Project> 
     182      <Name>JyTrisContent %28Content%29</Name> 
     183      <XnaReferenceType>Content</XnaReferenceType> 
     184    </ProjectReference> 
    136185  </ItemGroup> 
    137186  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> 
  • 2010/23/hniemi/JyTris/JyTris/JyTris.sln

    r1478 r1980  
    11 
    2 Microsoft Visual Studio Solution File, Format Version 10.00 
    3 # Visual Studio 2008 
     2Microsoft Visual Studio Solution File, Format Version 11.00 
     3# Visual Studio 2010 
    44Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JyTris", "JyTris.csproj", "{3854E62B-7704-4674-860B-A6E9495B100D}" 
     5EndProject 
     6Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JyTrisContent", "Content\JyTrisContent.contentproj", "{F4DC0895-798C-4BEF-93D3-7D35766B520D}" 
    57EndProject 
    68Global 
  • 2010/23/hniemi/JyTris/JyTris/Peli.cs

    r1544 r1980  
    1919    { 
    2020        #region Muuttujat 
    21         private string versio = "0.4"; 
     21        private string versio = "0.5"; 
    2222 
    2323        const int leveys = 10; 
     
    5757        /// Tekee pelin alkuvalmistelut 
    5858        /// </summary> 
    59         protected override void Begin() 
     59        public override void Begin() 
    6060        { 
    6161            LuoPelikentta(); 
     
    161161                for (int j = 0; j < ennustuskentta[i].Length; j++) 
    162162                { 
    163                     ennustuskentta[i][j] = new GameObject(palikkojenSivu, palikkojenSivu, Shapes.Rectangle); 
    164                     ennustuskentta[i][j].Color = Color.TransparentWhite; 
     163                    ennustuskentta[i][j] = new GameObject(palikkojenSivu, palikkojenSivu, Shape.Rectangle); 
     164                    ennustuskentta[i][j].Color = Color.Transparent; 
    165165                    ennustuskentta[i][j].X = Level.Right + 90 + (palikkojenSivu / 2) + j * (palikkojenSivu); 
    166166                    ennustuskentta[i][j].Y = Level.Top -200 - (palikkojenSivu / 2) - i * (palikkojenSivu); 
     
    180180                for (int j = 0; j < ennustuskentta[i].Length; j++) 
    181181                { 
    182                     ennustuskentta[i][j].Color = Color.TransparentWhite; 
     182                    ennustuskentta[i][j].Color = Color.Transparent; 
    183183                } 
    184184            } 
     
    218218                for (int j = 0; j < pelikentta[i].Length; j++) 
    219219                { 
    220                     pelikentta[i][j] = new GameObject(palikkojenSivu, palikkojenSivu, Shapes.Rectangle); 
    221                     pelikentta[i][j].Color = Color.TransparentWhite; 
     220                    pelikentta[i][j] = new GameObject(palikkojenSivu, palikkojenSivu, Shape.Rectangle); 
     221                    pelikentta[i][j].Color = Color.Transparent; 
    222222                    pelikentta[i][j].X = Level.Left + (palikkojenSivu / 2) + j * (palikkojenSivu); 
    223223                    pelikentta[i][j].Y = Level.Top - (palikkojenSivu / 2) - i * (palikkojenSivu); 
     
    267267        void Liikuta(Vector suunta) 
    268268        { 
    269             PaivitaPalikka(aktiivinenPalikka, Color.TransparentWhite); 
     269            PaivitaPalikka(aktiivinenPalikka, Color.Transparent); 
    270270 
    271271            if (VoikoSiirtaa(suunta, aktiivinenPalikka)) 
     
    282282        void Kaanna() 
    283283        { 
    284             PaivitaPalikka(aktiivinenPalikka, Color.TransparentWhite); 
     284            PaivitaPalikka(aktiivinenPalikka, Color.Transparent); 
    285285 
    286286            //Tämä kohta tarkistaa, voiko palikkaa kääntää 
     
    307307        void Laske(Timer timer) 
    308308        { 
    309             PaivitaPalikka(aktiivinenPalikka, Color.TransparentWhite); 
     309            PaivitaPalikka(aktiivinenPalikka, Color.Transparent); 
    310310 
    311311            tiputusajastin.Reset(); 
     
    371371        /// Tarkistaa, onko annetut paikka tyhjä 
    372372        ///  
    373         /// Paikka on tyhjä, jos sen väri on Color.TransparentWhite 
     373        /// Paikka on tyhjä, jos sen väri on Color.Transparent 
    374374        /// </summary> 
    375375        /// <param name="paikka">X ja Y oltava kokonaislukuja</param> 
     
    380380            if (paikka.Y > korkeus-1 || paikka.Y < 0) return false; 
    381381 
    382             if (pelikentta[(int)paikka.Y][(int)paikka.X].Color == Color.TransparentWhite) return true; 
     382            if (pelikentta[(int)paikka.Y][(int)paikka.X].Color == Color.Transparent) return true; 
    383383            return false; 
    384384        } 
     
    449449        void KaynnistaPeli() 
    450450        { 
    451             status.IsVisible = false; 
     451            status.Color = Color.Transparent; 
     452            status.TextColor = Color.Transparent; 
    452453            pisteet.Value = 0; 
    453454            taso.Value = 1; 
     
    488489                AsetaTaukoNappaimet(); 
    489490                status.Text = "Peli pysaytetty"; 
    490                 status.IsVisible = true; 
     491                status.TextColor = Color.Beige; 
    491492                return; 
    492493            } 
    493             status.IsVisible = false; 
     494            status.TextColor = Color.Transparent; 
    494495            tiputusajastin.Start(); 
    495496            ClearControls(); 
     
    512513                for (int j = 0; j < pelikentta[i].Length; j++) 
    513514                { 
    514                     if (pelikentta[i][j].Color == Color.TransparentWhite) tyhjia = true; 
     515                    if (pelikentta[i][j].Color == Color.Transparent) tyhjia = true; 
    515516                } 
    516517 
     
    542543                for (int j = 0; j < pelikentta[i].Length; j++) 
    543544                { 
    544                     pelikentta[i][j].Color = Color.TransparentWhite; 
     545                    pelikentta[i][j].Color = Color.Transparent; 
    545546                } 
    546547            } 
     
    566567            for (int i = 0; i < pelikentta[0].Length; i++) 
    567568            { 
    568                 pelikentta[0][i].Color = Color.TransparentWhite; 
     569                pelikentta[0][i].Color = Color.Transparent; 
    569570            } 
    570571        } 
     
    581582            status.Text = "Hävisit pelin!"; 
    582583            //status.Image = LoadImage("peliloppu"); 
    583             status.IsVisible = true; 
     584            status.TextColor = Color.Beige; 
    584585            //topLista.Show(pisteet.Value); 
    585586            //purkkabool = true; 
  • 2010/23/hniemi/JyTris/JyTris/TetrisPalikka.cs

    r1515 r1980  
    44using System.Text; 
    55using Jypeli; 
    6 using Jypeli.ScreenObjects; 
    76using Jypeli.Assets; 
    87 
Note: See TracChangeset for help on using the changeset viewer.