sydney/Coleman-Code
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	COM380/Project5/GambleKit/CustomGameLogic/Pages/MainPage.cpp
This commit is contained in:
Amrit Panesar committed 2015-05-20 18:16:29 -07:00
2 parents b34d39a97f 1fa1ffad2a
commit 430eb3c314
69 files changed
+10950 -2
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

COM380/Project5/GambleKit/CustomGameLogic/MainWindow.cpp
+2 -2
View File
@@ -73,9 +73,9 @@ void MainWindow::Resize(int width, int height)
void MainWindow::KeyDown(int keyCode)
{
if (keyCode == VK_SPACE)
if (keyCode == VK_F12)
{
this->game->mainPage;
this->game->mainPage->credits += 100;
}
if (keyCode == VK_ESCAPE)