Skip to content

Stats update #6

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

Open
mhmohapatra wants to merge 7 commits into
base: stats-update
Choose a base branch
from
Open

Stats update #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d391728
Changed URL to mhmohapatra
mhmohapatra Oct 25, 2016
dbde260
Merge pull request #1 from mhmohapatra/readme-update
mhmohapatra Oct 25, 2016
8c07ead
Revert "change index.html to inde.html"
mhmohapatra Oct 25, 2016
d830b92
Merge branch 'gh-pages' of https://github.com/mhmohapatra/github-game…
mhmohapatra Oct 25, 2016
c32f9e1
Updated Speed to 0.9 at line 78.
mhmohapatra Oct 26, 2016
d3190fb
Merge branch 'gh-pages' into stats-update
mhmohapatra Oct 26, 2016
837f9f6
Changed SPeed to 0.3.
mhmohapatra Oct 26, 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
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

A project based learning activity for people who are getting started with Git and GitHub.

You can play the game at: http://githubschool.github.io/github-games/
You can play the game at: http://mhmohapatra.github.io/github-games/

>> _*SUPPORTED BROWSERS*: Chrome, Firefox, Safari, Opera and IE9+_

Expand Down
6 changes: 5 additions & 1 deletion inde.html → index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,11 @@
#menu p { margin: 0.5em 0; text-align: center; }
#menu p a { text-decoration: none; color: black; }
#upcoming { display: block; margin: 0 auto; background-color: #E0E0E0; }
<<<<<<< HEAD
#score { color: yellow; font-weight: bold; vertical-align: middle; }
=======
#score { color: green; font-weight: bold; vertical-align: middle; }
>>>>>>> gh-pages
#rows { color: blue; font-weight: bold; vertical-align: middle; }
#stats { position: absolute; bottom: 0em; right: 1em; }
@media screen and (min-width: 0px) and (min-height: 0px) { #tetris { font-size: 0.75em; width: 250px; } #menu { width: 100px; height: 200px; } #upcoming { width: 50px; height: 50px; } #canvas { width: 100px; height: 200px; } } /* 10px chunks */
Expand Down Expand Up @@ -75,7 +79,7 @@
ctx = canvas.getContext('2d'),
ucanvas = get('upcoming'),
uctx = ucanvas.getContext('2d'),
speed = { start: 0.6, decrement: 0.005, min: 0.1 }, // how long before piece drops by 1 row (seconds)
speed = { start: 0.3, decrement: 0.005, min: 0.1 }, // how long before piece drops by 1 row (seconds)
nx = 10, // width of tetris court (in blocks)
ny = 20, // height of tetris court (in blocks)
nu = 5; // width/height of upcoming preview (in blocks)
Expand Down