Merge branch 'master' of git@github.com:Neo-Desktop/Coleman-Code.git

This commit is contained in:
Amrit Panesar committed 2015-08-11 17:59:18 -07:00
commit 57801b0b3b
4 files changed
+2 -2

No files matched your search

@@ -10,7 +10,7 @@ MainPage::MainPage(CustomGame *game)
this->bet = 10; this->bet = 10;
this->lines = 5; this->lines = 5;
this->winning = 0; this->winning = 0;
this->credits = 100; this->credits = 50;
// Add the background // Add the background
this->AddEntity(new GkGameAnimation(game->AcquireAnimatedTexture(L"Background.png"))); this->AddEntity(new GkGameAnimation(game->AcquireAnimatedTexture(L"Background.png")));
+1 -1
View File
@@ -27,7 +27,7 @@
<UseDebugLibraries>false</UseDebugLibraries> <UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization> <WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet> <CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v120</PlatformToolset> <PlatformToolset>v110</PlatformToolset>
</PropertyGroup> </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings"> <ImportGroup Label="ExtensionSettings">
Binary file not shown.
Binary file not shown.