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

Jeu #38

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

Jeu #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9cd5457
2048 transformé
Pacmansnuff Mar 27, 2016
76c23db
taille
Pacmansnuff Mar 27, 2016
ccad3f7
changer en potager
Pacmansnuff Mar 28, 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
14 changes: 5 additions & 9 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>Play 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,7 +19,7 @@

<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:description" content="Play 2048. "/>
<meta property="og:image" content="http://gabrielecirulli.github.io/2048/meta/og_image.png"/>
</head>
<body>
Expand All @@ -39,16 +39,14 @@ <h1 class="title">Make 2048</h1>

</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>
</div>



<div class="game-container">
<div class="game-message">
<p></p>
<div class="lower">
<a href="http://www.udacity.com/course/ud248"class="learn learn-low">Take the Class!</a>

<a class="retry-button">Play Again</a>
<div class="score-sharing"></div>
</div>
Expand Down Expand Up @@ -87,9 +85,7 @@ <h1 class="title">Make 2048</h1>
</div>


<p class="game-explanation">
<strong class="important">Make your own version:</strong> If you'd like to make your own version of this game, check out Udacity's newest course for beginners <a href="https://www.udacity.com/course/ud248" target="_blank">Make your own 2048</a>. No programming experience is required and in less than half an hour you'll dig into the source code, make some changes, and have your own version of the game to share.
</p>

<hr>
<p class="game-explanation">
<strong class="important">How to play:</strong> Use your <strong>arrow keys</strong> to move the tiles. When two tiles with the same value touch, they <strong>merge into one!</strong>
Expand Down
24 changes: 12 additions & 12 deletions js/html_actuator.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,18 +52,18 @@ HTMLActuator.prototype.clearContainer = function (container) {

HTMLActuator.prototype.addTile = function (tile) {
var valueMap = {
2 : '<Udacity>',
4 : '<Intro CS>',
8 : "skills=['code']",
16 : "skills.add('CSS')",
32 : '</Intro CS>',
64 : '<Job search>',
128 : 'getJob(skills)',
256 : '</Job search>',
512 : 'if Udacious:',
1024 : 'skills.increase()',
2048 : 'myJob.advance()',
4096 : 'myCareer=myJob'
2 : "Basilic",
4 : "Ciboulette",
8 : "Coriandre",
16 : "Courgette",
32 : "Laitue",
64 : "Persil",
128 : "Tomate",
256 : "Salade Batavia",
512 : "Fraise",
1024 : "Piment",
2048 : "Snuff",
4096 : "Weed"
}
var self = this;

Expand Down