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.

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

Vereine! #42

Open
wants to merge 3 commits into
base: gh-pages
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 1 addition & 12 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,2 @@
# Make 2048
A Udacity version of Gabriele Cirulli's [original 2048](http://gabrielecirulli.github.io/2048/).

The original version is a small clone of [1024](https://play.google.com/store/apps/details?id=com.veewo.a1024), based on [Saming's 2048](http://saming.fr/p/2048/) (also a clone).

### Notes for the Udacity version
We're using this version as the recommended fork to avoid potential learning issues as the original source changes (and the Udacity videos don't update). You can [fork the original repo as well](https://github.com/gabrielecirulli/2048)

## License
2048 is licensed under the [MIT license.](https://github.com/gabrielecirulli/2048/blob/master/LICENSE.txt)

## Donations
Gabriele made this in his spare time, and it's hosted on GitHub (which means I don't have any hosting costs), but if you enjoyed the game and feel like buying him coffee, you can donate at his BTC address: `1Ec6onfsQmoP9kkL3zkpB6c5sA4PVcXU2i`.
A 2048 clone.
30 changes: 15 additions & 15 deletions style/main.css
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ hr {
margin-right: 5px; }
.game-message a {
display: inline-block;
background: #8f7a66;
background: #8f7a64;
border-radius: 3px;
padding: 0 20px;
text-decoration: none;
Expand Down Expand Up @@ -402,48 +402,48 @@ hr {
font-weight: bold;
z-index: 10;
font-family: 'Source Code Pro', Courier;
font-size: 16px;
font-size: 16px;
color: #354b59;}
.tile.tile-2 .tile-inner {
background: url('../tile-sets/udacity/2.png');
background: url('../tile-sets/vereine/2.png');
background-size: 100%;
color: rgba(0,0,0,0);
box-shadow: 0 0 30px 10px rgba(243, 215, 116, 0), inset 0 0 0 1px rgba(255, 255, 255, 0); }
.tile.tile-4 .tile-inner {
background: url('../tile-sets/udacity/4.png');
background: url('../tile-sets/vereine/4.png');
background-size: 100%;
color: rgba(0,0,0,0);
box-shadow: 0 0 30px 10px rgba(243, 215, 116, 0), inset 0 0 0 1px rgba(255, 255, 255, 0); }
.tile.tile-8 .tile-inner {
background: url('../tile-sets/udacity/8.png');
background: url('../tile-sets/vereine/8.png');
background-size: 100%;
color: rgba(0,0,0,0);
font-weight: medium;
font-size: 11px;
}
.tile.tile-16 .tile-inner {
background: url('../tile-sets/udacity/16.png');
background: url('../tile-sets/vereine/16.png');
background-size: 100%;
color: rgba(0,0,0,0);
font-weight: medium;
font-size: 10px;
}
.tile.tile-32 .tile-inner {
background: url('../tile-sets/udacity/32.png');
background: url('../tile-sets/vereine/32.png');
background-size: 100%;
color: rgba(0,0,0,0);
font-size: 14px;
}
.tile.tile-64 .tile-inner {
background: url('../tile-sets/udacity/64.png');
background: url('../tile-sets/vereine/64.png');
background-size: 100%;
color: rgba(0,0,0,0);
font-size: 14px;

}
.tile.tile-128 .tile-inner {
font-weight: medium;
background: url('../tile-sets/udacity/128.png');
background: url('../tile-sets/vereine/128.png');
background-size: 100%;
color: rgba(0,0,0,0);
box-shadow: 0 0 30px 10px rgba(243, 215, 116, 0.2381), inset 0 0 0 1px rgba(255, 255, 255, 0.14286);
Expand All @@ -452,7 +452,7 @@ hr {
.tile.tile-128 .tile-inner {
font-size: 12px; } }
.tile.tile-256 .tile-inner {
background: url('../tile-sets/udacity/256.png');
background: url('../tile-sets/vereine/256.png');
background-size: 100%;
color: rgba(0,0,0,0);
box-shadow: 0 0 30px 10px rgba(243, 215, 116, 0.31746), inset 0 0 0 1px rgba(255, 255, 255, 0.19048);
Expand All @@ -461,7 +461,7 @@ hr {
.tile.tile-256 .tile-inner {
font-size: 16px; } }
.tile.tile-512 .tile-inner {
background: url('../tile-sets/udacity/512.png');
background: url('../tile-sets/vereine/512.png');
background-size: 100%;
color: rgba(0,0,0,0);
box-shadow: 0 0 30px 10px rgba(243, 215, 116, 0.39683), inset 0 0 0 1px rgba(255, 255, 255, 0.2381);
Expand All @@ -470,7 +470,7 @@ hr {
.tile.tile-512 .tile-inner {
font-size: 13px; } }
.tile.tile-1024 .tile-inner {
background: url('../tile-sets/udacity/1024.png');
background: url('../tile-sets/vereine/1024.png');
background-size: 100%;
color: rgba(0,0,0,0);
box-shadow: 0 0 30px 10px rgba(243, 215, 116, 0.47619), inset 0 0 0 1px rgba(255, 255, 255, 0.28571);
Expand All @@ -479,7 +479,7 @@ hr {
.tile.tile-1024 .tile-inner {
font-size: 10px; } }
.tile.tile-2048 .tile-inner {
background: url('../tile-sets/udacity/2048.png');
background: url('../tile-sets/vereine/2048.png');
background-size: 100%;
color: rgba(0,0,0,0);
box-shadow: 0 0 30px 10px rgba(243, 215, 116, 0.55556), inset 0 0 0 1px rgba(255, 255, 255, 0.33333);
Expand Down Expand Up @@ -991,7 +991,7 @@ a.learn:hover, a.keep-playing-button:hover, a.learn-low:hover {
cursor: pointer;
display: block;
text-align: center;
float: right;
float: right;
margin-top: 7px;
}

Expand All @@ -1013,4 +1013,4 @@ a.learn-low {
a.retry-button {
margin-left: 10px;
float: center;
}
}
Binary file added tile-sets/vereine/1024.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added tile-sets/vereine/128.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added tile-sets/vereine/16.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added tile-sets/vereine/2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added tile-sets/vereine/2048.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added tile-sets/vereine/256.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added tile-sets/vereine/32.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added tile-sets/vereine/4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added tile-sets/vereine/512.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added tile-sets/vereine/64.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added tile-sets/vereine/8.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.