Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Various updates #13

Merged
merged 31 commits into from
Feb 13, 2017
Merged

Various updates #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
173fd4a
Unchecked SignManifests option so I can build again (without the priv…
DavidRieman Apr 16, 2015
0a120f6
Support for all languages! (letters and numbers). Shapes and colors s…
katu07 Jan 13, 2016
33812e5
Added a zip with the executable so non-technical users can download a…
katu07 Jan 13, 2016
40e55bf
Added a zip with the executable so non-technical users can download a…
katu07 Jan 13, 2016
575759c
About 1600 words and names in the default words list now.
DavidRieman Feb 20, 2016
0e239c6
Removed test.txt
DavidRieman Feb 20, 2016
e346209
Merge branch 'master' of https://github.com/katu07/babysmash into upg…
DavidRieman Feb 20, 2016
80d28db
Merge branch 'master' of https://github.com/katu07/babysmash into upg…
DavidRieman Feb 20, 2016
db280dc
Restored auto-formatting consistency, and removed some unused usings.
DavidRieman Feb 21, 2016
9925f29
Restored auto-formatting consistency, and removed some unused usings.
DavidRieman Feb 21, 2016
cf199d0
Removed unused labels.
DavidRieman Feb 21, 2016
b6d5937
Removed unused labels.
DavidRieman Feb 21, 2016
0d353ab
Consistent shape ctor formatting, and removed superfluous tiny #regio…
DavidRieman Feb 21, 2016
b5ae86d
Consistent shape ctor formatting, and removed superfluous tiny #regio…
DavidRieman Feb 21, 2016
10cdd70
Added a handful more words.
DavidRieman Feb 21, 2016
3f584e0
Added a handful more words.
DavidRieman Feb 21, 2016
4d59742
Addressed the Window.CommandBindings TODO.
DavidRieman Feb 21, 2016
db69925
Addressed the Window.CommandBindings TODO.
DavidRieman Feb 21, 2016
dda83cd
Updated zip, and a few more words.
DavidRieman Feb 21, 2016
c3ea425
Updated zip, and a few more words.
DavidRieman Feb 21, 2016
b058a45
Removed x64 targeting since "Any CPU" fulfills that need.
DavidRieman Feb 21, 2016
7e765ca
Removed x64 targeting since "Any CPU" fulfills that need.
DavidRieman Feb 21, 2016
1f41de1
Removed poor HintPath and redundant Generator/SubType properties.
DavidRieman Feb 21, 2016
c4a56af
Removed poor HintPath and redundant Generator/SubType properties.
DavidRieman Feb 21, 2016
2771a2f
Remove BabySmashInternational.zip; recommend using github binaries etc.
DavidRieman Jan 28, 2017
a599869
Remove BabySmashInternational.zip; recommend using github binaries etc.
DavidRieman Jan 28, 2017
bb18ec6
Pulled .NET version back to 3.5 for compatibility per PR feedback.
DavidRieman Jan 28, 2017
564265c
Pulled .NET version back to 3.5 for compatibility per PR feedback.
DavidRieman Jan 28, 2017
1ddd84f
Returned SignManifests to true, per PR feedback.
DavidRieman Jan 28, 2017
b3dca92
Returned SignManifests to true, per PR feedback.
DavidRieman Jan 28, 2017
0e6c8e6
Merge branch 'master' of https://github.com/DavidRieman/babysmash
DavidRieman Feb 1, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion Audio.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,5 +71,4 @@ private static byte[] GetWavResource(string wav)
}
}
}

}
54 changes: 18 additions & 36 deletions BabySmash.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
Expand Down Expand Up @@ -56,6 +56,7 @@
<WarningLevel>4</WarningLevel>
<PlatformTarget>x86</PlatformTarget>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
Expand All @@ -65,9 +66,16 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Compile Include="Extensions\ObjectExtensions.cs" />
<Compile Include="Shapes\BabySmashShape.cs" />
<Compile Include="WordFinder.cs" />
<Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>packages\Newtonsoft.Json.9.0.1\lib\net35\Newtonsoft.Json.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="PresentationFramework.Luna">
<RequiredTargetFramework>3.0</RequiredTargetFramework>
</Reference>
Expand All @@ -77,9 +85,7 @@
</Reference>
<Reference Include="System.Deployment" />
<Reference Include="System.Drawing" />
<Reference Include="System.Speech">
<RequiredTargetFramework>3.0</RequiredTargetFramework>
</Reference>
<Reference Include="System.Speech" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml.Linq">
<RequiredTargetFramework>3.5</RequiredTargetFramework>
Expand All @@ -104,24 +110,16 @@
<Page Include="Shapes\allShapes.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Shapes\CoolCircle.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Shapes\CoolHeart.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Shapes\CoolHexagon.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
Expand All @@ -130,28 +128,20 @@
<SubType>Designer</SubType>
</Page>
<Page Include="Shapes\CoolSquare.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Shapes\CoolStar.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Shapes\CoolTrapezoid.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Shapes\FunCursor1.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Compile Include="Shapes\CoolCircle.xaml.cs">
<DependentUpon>CoolCircle.xaml</DependentUpon>
Expand Down Expand Up @@ -182,44 +172,30 @@
<ApplicationDefinition Include="App.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</ApplicationDefinition>
<Page Include="Shapes\CoolTriangle.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Shapes\CoolLetter.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="MainWindow.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Options.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Shapes\CoolRectangle.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Shapes\FunCursor2.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Compile Include="App.xaml.cs">
<DependentUpon>App.xaml</DependentUpon>
Expand Down Expand Up @@ -277,12 +253,19 @@
</EmbeddedResource>
<None Include="app.config" />
<None Include="BabySmash_TemporaryKey.pfx" />
<None Include="packages.config" />
<None Include="private.pfx" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
</None>
<AppDesigner Include="Properties\" />
<None Include="Resources\Strings\ru-RU.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="Resources\Strings\en-EN.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
</ItemGroup>
<ItemGroup>
<BootstrapperPackage Include="Microsoft.Net.Client.3.5">
Expand Down Expand Up @@ -360,9 +343,8 @@
<Target Name="AfterBuild">
</Target>
-->

<!-- THIS IS WHERE I ACTUALLY RELEASE IT TO PRODUCTION -->
<!--<Target Name="BeforePublish">
<Exec Command="&quot;C:\Program Files (x86)\Microsoft SDKs\Windows\v7.1A\Bin\signtool.exe&quot; sign /f &quot;$(ProjectDir)\private.pfx&quot; /p PASSWORD /v &quot;$(ProjectDir)obj\$(ConfigurationName)\$(TargetFileName)&quot;" />
</Target>-->
</Project>
</Project>
2 changes: 1 addition & 1 deletion BabySmash.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.22609.0
VisualStudioVersion = 14.0.24720.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BabySmash", "BabySmash.csproj", "{FB378E07-FDE4-4FC7-9210-68F80B561164}"
EndProject
Expand Down
Loading