Changeset 166

Show
Ignore:
Timestamp:
06/05/2012 03:44:09 PM (23 months ago)
Author:
kvigue
Message:
 
Location:
Code
Files:
1 removed
18 modified

Legend:

Unmodified
Added
Removed
  • Code/Serializables/Serializables.csproj

    r136 r166  
    3131    <WarningLevel>4</WarningLevel> 
    3232  </PropertyGroup> 
     33  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'"> 
     34    <DebugSymbols>true</DebugSymbols> 
     35    <OutputPath>bin\x64\Debug\</OutputPath> 
     36    <DefineConstants>DEBUG;TRACE</DefineConstants> 
     37    <DebugType>full</DebugType> 
     38    <PlatformTarget>x64</PlatformTarget> 
     39    <CodeAnalysisLogFile>bin\Debug\Serializables.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile> 
     40    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression> 
     41    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile> 
     42    <ErrorReport>prompt</ErrorReport> 
     43    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet> 
     44    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories> 
     45    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories> 
     46    <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules> 
     47    <CodeAnalysisFailOnMissingRules>false</CodeAnalysisFailOnMissingRules> 
     48  </PropertyGroup> 
     49  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'"> 
     50    <OutputPath>bin\x64\Release\</OutputPath> 
     51    <DefineConstants>TRACE</DefineConstants> 
     52    <Optimize>true</Optimize> 
     53    <DebugType>pdbonly</DebugType> 
     54    <PlatformTarget>x64</PlatformTarget> 
     55    <CodeAnalysisLogFile>bin\Release\Serializables.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile> 
     56    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression> 
     57    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile> 
     58    <ErrorReport>prompt</ErrorReport> 
     59    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet> 
     60    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories> 
     61    <CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets> 
     62    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories> 
     63    <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules> 
     64  </PropertyGroup> 
    3365  <ItemGroup> 
    3466    <Reference Include="System" /> 
  • Code/oMaE.sln

    r104 r166  
    1616        Debug|Any CPU = Debug|Any CPU 
    1717        Debug|Mixed Platforms = Debug|Mixed Platforms 
     18        Debug|x64 = Debug|x64 
    1819        Debug|x86 = Debug|x86 
    1920        Release|Any CPU = Release|Any CPU 
    2021        Release|Mixed Platforms = Release|Mixed Platforms 
     22        Release|x64 = Release|x64 
    2123        Release|x86 = Release|x86 
    2224    EndGlobalSection 
     
    2527        {E3F37062-0205-4ABE-996A-A13D38A355BA}.Debug|Mixed Platforms.ActiveCfg = Debug|x86 
    2628        {E3F37062-0205-4ABE-996A-A13D38A355BA}.Debug|Mixed Platforms.Build.0 = Debug|x86 
     29        {E3F37062-0205-4ABE-996A-A13D38A355BA}.Debug|x64.ActiveCfg = Debug|x86 
    2730        {E3F37062-0205-4ABE-996A-A13D38A355BA}.Debug|x86.ActiveCfg = Debug|x86 
    2831        {E3F37062-0205-4ABE-996A-A13D38A355BA}.Debug|x86.Build.0 = Debug|x86 
     
    3033        {E3F37062-0205-4ABE-996A-A13D38A355BA}.Release|Mixed Platforms.ActiveCfg = Release|x86 
    3134        {E3F37062-0205-4ABE-996A-A13D38A355BA}.Release|Mixed Platforms.Build.0 = Release|x86 
     35        {E3F37062-0205-4ABE-996A-A13D38A355BA}.Release|x64.ActiveCfg = Release|x86 
    3236        {E3F37062-0205-4ABE-996A-A13D38A355BA}.Release|x86.ActiveCfg = Release|x86 
    3337        {E3F37062-0205-4ABE-996A-A13D38A355BA}.Release|x86.Build.0 = Release|x86 
    3438        {79A3A46A-CBBE-49BA-A349-A95947B5343E}.Debug|Any CPU.ActiveCfg = Debug|x86 
    3539        {79A3A46A-CBBE-49BA-A349-A95947B5343E}.Debug|Mixed Platforms.ActiveCfg = Debug|x86 
     40        {79A3A46A-CBBE-49BA-A349-A95947B5343E}.Debug|x64.ActiveCfg = Debug|x86 
    3641        {79A3A46A-CBBE-49BA-A349-A95947B5343E}.Debug|x86.ActiveCfg = Debug|x86 
    3742        {79A3A46A-CBBE-49BA-A349-A95947B5343E}.Release|Any CPU.ActiveCfg = Release|x86 
    3843        {79A3A46A-CBBE-49BA-A349-A95947B5343E}.Release|Mixed Platforms.ActiveCfg = Release|x86 
     44        {79A3A46A-CBBE-49BA-A349-A95947B5343E}.Release|x64.ActiveCfg = Release|x86 
     45        {79A3A46A-CBBE-49BA-A349-A95947B5343E}.Release|x64.Build.0 = Release|x86 
    3946        {79A3A46A-CBBE-49BA-A349-A95947B5343E}.Release|x86.ActiveCfg = Release|x86 
    4047        {6C9B03DB-355F-44FA-89B6-2A8F430488BD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 
     
    4249        {6C9B03DB-355F-44FA-89B6-2A8F430488BD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU 
    4350        {6C9B03DB-355F-44FA-89B6-2A8F430488BD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU 
     51        {6C9B03DB-355F-44FA-89B6-2A8F430488BD}.Debug|x64.ActiveCfg = Debug|x64 
     52        {6C9B03DB-355F-44FA-89B6-2A8F430488BD}.Debug|x64.Build.0 = Debug|x64 
    4453        {6C9B03DB-355F-44FA-89B6-2A8F430488BD}.Debug|x86.ActiveCfg = Debug|Any CPU 
    4554        {6C9B03DB-355F-44FA-89B6-2A8F430488BD}.Debug|x86.Build.0 = Debug|Any CPU 
     
    4857        {6C9B03DB-355F-44FA-89B6-2A8F430488BD}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU 
    4958        {6C9B03DB-355F-44FA-89B6-2A8F430488BD}.Release|Mixed Platforms.Build.0 = Release|Any CPU 
     59        {6C9B03DB-355F-44FA-89B6-2A8F430488BD}.Release|x64.ActiveCfg = Release|x64 
     60        {6C9B03DB-355F-44FA-89B6-2A8F430488BD}.Release|x64.Build.0 = Release|x64 
    5061        {6C9B03DB-355F-44FA-89B6-2A8F430488BD}.Release|x86.ActiveCfg = Release|Any CPU 
    5162        {6C9B03DB-355F-44FA-89B6-2A8F430488BD}.Release|x86.Build.0 = Release|Any CPU 
  • Code/oMaE/oMaE/MiniGames/Wave1D.cs

    r108 r166  
    3030        public override void Initialize() 
    3131        { 
    32             numPts = 200; 
    33             hBox = 50; 
     32            numPts = 50; 
     33            hBox = 112; 
    3434            width = 700.0f; 
    3535            csq = 0.01f; 
     
    8484        private void boxUpdate() 
    8585        { 
    86             if (hBox == 50 && waveFunction[numPts - 1].Y < 50.0f) 
     86            if (hBox == 112 && waveFunction[numPts - 1].Y < 125.0f) 
    8787                vBox = 1; // We've hit the box! 
    8888 
  • Code/oMaE/oMaE/MinigameFactory.cs

    r158 r166  
    7676            if(save.Options.Contains("Life")) 
    7777                all.Add(new Life()); 
    78             if (save.Options.Contains("FSM")) 
    79                 foreach (FSMGame fsm in FSMGames) 
    80                     all.Add(new FSM(fsm)); 
     78            //if (save.Options.Contains("FSM")) 
     79            //    foreach (FSMGame fsm in FSMGames) 
     80            //        all.Add(new FSM(fsm)); 
    8181 
    8282            // fills with FSM games... 
    83             while(all.Count < count) 
    84                 foreach (FSMGame fsm in FSMGames) 
    85                     all.Add(new FSM(fsm)); 
     83            //while(all.Count < count) 
     84            //    foreach (FSMGame fsm in FSMGames) 
     85            //        all.Add(new FSM(fsm)); 
    8686 
    8787            if (save.Sequence == null) 
     
    119119        { 
    120120            BaseChangerGames = Content.Load<BaseChangerGame[]>("AppData/BaseChanger"); 
    121             FSMGames = Content.Load<FSMGame[]>("AppData/FSM"); 
     121            //FSMGames = Content.Load<FSMGame[]>("AppData/FSM"); 
    122122            BalanceGames = Content.Load<BalanceGame[]>("AppData/Balance"); 
    123123            MatchGames = Content.Load<MatchGame[]>("AppData/Match"); 
  • Code/oMaE/oMaEContent/AppData/DefaultGames.xml

    r160 r166  
    44  <Asset Type="System.String[]"> 
    55    <Item>Balance</Item> 
    6     <Item><![CDATA[Base Changer]]></Item> 
     6    <Item>Waves</Item> 
     7    <Item>Match</Item> 
     8    <Item>Energy</Item> 
    79  </Asset> 
    810</XnaContent> 
  • Code/oMaE/oMaEContent/oMaEContent.contentproj

    r157 r166  
    510510      <Importer>XmlImporter</Importer> 
    511511      <Processor>PassThroughProcessor</Processor> 
     512      <SubType>Designer</SubType> 
    512513    </Compile> 
    513514  </ItemGroup>