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

my own 2048 #33

Open
wants to merge 2 commits into
base: gh-pages
Choose a base branch
from
Open

my own 2048 #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2359d96
my own 2048
karinko Feb 19, 2016
07296f0
Vorschaubild geändert
karinko Feb 19, 2016
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
3 changes: 3 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
# Make 2048

karinkos try after taking the Udacity course ;)

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).
Expand Down
14 changes: 7 additions & 7 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<html lang="en" manifest="cache.appcache">
<head>
<meta charset="utf-8">
<title>Make and Play Udacity 2048</title>
<title>Mäuse 2048</title>

<link href="style/main.css" rel="stylesheet" type="text/css">
<link href='http://fonts.googleapis.com/css?family=Source+Code+Pro:400,600,700' rel='stylesheet' type='text/css'>
Expand All @@ -19,13 +19,13 @@

<meta property="og:title" content="2048 game"/>
<meta property="og:site_name" content="2048 game"/>
<meta property="og:description" content="Play Udacity 2048. Then, make your own 2048 game in Udacity's 2 hour mini course for programming beginners!"/>
<meta property="og:image" content="http://gabrielecirulli.github.io/2048/meta/og_image.png"/>
<meta property="og:description" content="2048 mit meinen Rennmäusen"/>
<meta property="og:image" content=url('../tile-sets/karinko/128.jpg')/>
</head>
<body>
<div class="container">
<div class="heading">
<h1 class="title">Make 2048</h1>
<h1 class="title">karinkos 2048</h1>
<div class="scores-container">
<div class="score-container">0</div>
<div class="best-container">0</div>
Expand All @@ -34,13 +34,13 @@ <h1 class="title">Make 2048</h1>

<div class="above-game">
<p class="game-intro">
<a class="restart-button">New Game</a>
Use the arrow keys to slide tiles. Combine similar tiles to create new ones.</p>
<a class="restart-button">New Try</a>
</p>

</div>

<div class="pre-game">
<p class="learn">Learn to make your own version of 2048 in 30 minutes in Udacity's mini online class for beginners.</p><a class="learn" href="https://www.udacity.com/course/ud248">Take the Class!</a>
<p class="learn">Die Mäuse sind los ;)</p>
</div>


Expand Down
17 changes: 17 additions & 0 deletions karinkos-2048/.gitattributes
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# Auto detect text files and perform LF normalization
* text=auto

# Custom for Visual Studio
*.cs diff=csharp

# Standard to msysgit
*.doc diff=astextplain
*.DOC diff=astextplain
*.docx diff=astextplain
*.DOCX diff=astextplain
*.dot diff=astextplain
*.DOT diff=astextplain
*.pdf diff=astextplain
*.PDF diff=astextplain
*.rtf diff=astextplain
*.RTF diff=astextplain
47 changes: 47 additions & 0 deletions karinkos-2048/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
# Windows image file caches
Thumbs.db
ehthumbs.db

# Folder config file
Desktop.ini

# Recycle Bin used on file shares
$RECYCLE.BIN/

# Windows Installer files
*.cab
*.msi
*.msm
*.msp

# Windows shortcuts
*.lnk

# =========================
# Operating System Files
# =========================

# OSX
# =========================

.DS_Store
.AppleDouble
.LSOverride

# Thumbnails
._*

# Files that might appear in the root of a volume
.DocumentRevisions-V100
.fseventsd
.Spotlight-V100
.TemporaryItems
.Trashes
.VolumeIcon.icns

# Directories potentially created on remote AFP share
.AppleDB
.AppleDesktop
Network Trash Folder
Temporary Items
.apdisk
47 changes: 24 additions & 23 deletions style/main.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
html, body {
margin: 0;
padding: 0;
background: #9cc2d2;
color: #354b59;
background: #c66300;
color: #ffe9d2;
font-family: "Clear Sans", "Helvetica Neue", Arial, sans-serif;
font-family: "Whitney SSm A","Whitney SSm B","Helvetica Neue",Helvetica,Arial,sans-serif;
font-size: 18px; }
font-size: 14px; }

body {
margin: 80px 0; }
Expand Down Expand Up @@ -60,7 +60,7 @@ input {
clear: both; }

h1.title {
font-size: 55px;
font-size: 40px;
font-weight: medium;
margin: 0;
display: block;
Expand Down Expand Up @@ -97,14 +97,14 @@ h1.title {
.score-container, .best-container {
position: relative;
display: inline-block;
background: #0c92bf;
background: #ffe9d2;
padding: 15px 25px;
font-size: 25px;
height: 25px;
line-height: 47px;
font-weight: bold;
border-radius: 3px;
color: white;
color: #391d00;
margin-top: 8px;
text-align: center; }
.score-container:after, .best-container:after {
Expand All @@ -116,7 +116,7 @@ h1.title {
font-size: 13px;
line-height: 13px;
text-align: center;
color: #eee4da; }
color: #391d00; }
.score-container .score-addition, .best-container .score-addition {
position: absolute;
right: 30px;
Expand Down Expand Up @@ -147,6 +147,7 @@ p {
a {
font-weight: medium;
text-decoration: underline;
color: #391d00;
cursor: pointer; }

strong.important {
Expand Down Expand Up @@ -210,7 +211,7 @@ hr {
-ms-user-select: none;
-ms-touch-action: none;
touch-action: none;
background: #1e6477;
background: #391d00;
border-radius: 6px;
width: 500px;
height: 500px;
Expand All @@ -225,7 +226,7 @@ hr {
right: 0;
bottom: 0;
left: 0;
background: rgba(150, 150, 150, 0.83);
background: rgba(255, 233, 210, 0.83);
z-index: 100;
padding-top: 40px;
text-align: center;
Expand Down Expand Up @@ -254,7 +255,7 @@ hr {
margin-right: 5px; }
.game-message a {
display: inline-block;
background: #8f7a66;
background: #ffe9d2;
border-radius: 3px;
padding: 0 20px;
text-decoration: none;
Expand Down Expand Up @@ -405,45 +406,45 @@ hr {
font-size: 16px;
color: #354b59;}
.tile.tile-2 .tile-inner {
background: url('../tile-sets/udacity/2.png');
background: url('../tile-sets/karinko/2.jpg');
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/karinko/4.jpg');
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/karinko/8.jpg');
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/karinko/16.jpg');
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/karinko/32.jpg');
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/karinko/64.jpg');
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/karinko/128.jpg');
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 +453,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/karinko/256.jpg');
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 +462,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/karinko/512.jpg');
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 +471,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/karinko/1024.jpg');
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 +480,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/karinko/2048.jpg');
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 @@ -605,7 +606,7 @@ hr {

.game-intro {
margin-top: 5px;
float: left;
float: right;
line-height: 30px;
margin-bottom: 0; }

Expand Down Expand Up @@ -982,7 +983,7 @@ a.learn:hover, a.keep-playing-button:hover, a.learn-low:hover {
}
.restart-button, a.retry-button {
display: inline-block;
background: #1e6477;
background: #391d00;
border-radius: 3px;
padding: 0 20px;
text-decoration: none;
Expand Down
Binary file added tile-sets/karinko/1024.jpg
View file
Open in desktop
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/karinko/128.jpg
View file
Open in desktop
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/karinko/16.jpg
View file
Open in desktop
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/karinko/2.jpg
View file
Open in desktop
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/karinko/2048.jpg
View file
Open in desktop
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/karinko/256.jpg
View file
Open in desktop
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/karinko/32.jpg
View file
Open in desktop
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/karinko/4.jpg
View file
Open in desktop
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/karinko/512.jpg
View file
Open in desktop
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/karinko/64.jpg
View file
Open in desktop
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/karinko/8.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.