Merge remote-tracking branch 'origin/master' into gh-pages

This commit is contained in:
synth-ruiner 2015-03-18 14:15:08 +00:00
commit 4a8487be13
5 changed files with 847 additions and 847 deletions

1
.gitignore vendored Normal file
View File

@ -0,0 +1 @@
images/Thumbs.db

View File

@ -6,13 +6,13 @@ Rows with exploded mines cannot be cleared. See how far you can get!
Left-click or tap to clear a tile. Right-click or hold to flag a mine. Click or tap a number to clear any non-flagged adjacent tiles.
## stuff to add
save game using html5 local storage so player can come back later
possibly add way to remove clicked mines (powerup/clump clicked mines together to destroy/get clicked mine to top/left of screen, etc.)
animations for mine explosions
Need to test on mobile devices etc.
add a nicer graphic for mines (& flags?)
add graphics for mines & flags
## bugs
the player can cheat under certain conditions; if there is only one tile left on a row, the player can flag it and if it is a mine, the row will clear. if not, the player can unflag it and click it. not sure how big a deal this is really.

BIN
images/flag.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.1 KiB

BIN
images/graphics.psd Normal file

Binary file not shown.

View File

@ -224,6 +224,7 @@
li.flagged {
background-color: #b5fe52;
background-image: url("images/flag.png");
}
li.flagged:hover {
@ -232,7 +233,7 @@
li.mine.revealed {
background-color: #d23000;
color: #000;
background-image: url("images/skull.png");
}
li.mines1 {
@ -688,10 +689,6 @@
if ($(this).isMine()) {
$(this).addClass("revealed");
$(this).html("☠"); //skull & crossbones
//game over, or lose a life, or whatever
//...
} else if (!automated && parseInt($(this).text()) === $(this).getAdjacentTiles().filter('.flagged, .revealed.mine').length) {
//already clicked; use middle click reveal functionality
@ -755,6 +752,8 @@
if (mouseHeld) {
mouseHeld = false;
//rightClick has already been called in a callback, so nothing to do here
} else {
switch (event.which) {
case 3: