-
Notifications
You must be signed in to change notification settings - Fork 12
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
cf7b212
commit 4005384
Showing
954 changed files
with
694,397 additions
and
200,212 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| .sass-cache/ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| { | ||
| "esnext": true, | ||
| "indent": 2, | ||
| "maxlen": 80, | ||
| "freeze": true, | ||
| "camelcase": true, | ||
| "unused": true, | ||
| "eqnull": true, | ||
| "proto": true, | ||
| "supernew": true, | ||
| "noyield": true, | ||
| "evil": true, | ||
| "node": true, | ||
| "boss": true, | ||
| "expr": true, | ||
| "loopfunc": true, | ||
| "white": true, | ||
| "maxdepth": 4 | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| # Contributing | ||
| Changes and improvements are more than welcome! Feel free to fork and open a pull request. | ||
|
|
||
| Please follow the house rules to have a bigger chance of your contribution being merged. | ||
|
|
||
| ## House rules | ||
|
|
||
| ### How to make changes | ||
| - To make changes, create a new branch based on `master` (do not create one from `gh-pages` unless strictly necessary) and make them there, then create a Pull Request to master. | ||
| `gh-pages` is different from master in that it contains sharing features, analytics and other things that have no direct bearing with the game. `master` is the "pure" version of the game. | ||
| - If you want to modify the CSS, please edit the SCSS files present in `style/`: `main.scss` and others. Don't edit the `main.css`, because it's supposed to be generated. | ||
| In order to compile your SCSS modifications, you need to use the `sass` gem (install it by running `gem install sass` once Ruby is installed). | ||
| To run SASS, simply use the following command: | ||
| `sass --unix-newlines --watch style/main.scss` | ||
| SASS will automatically recompile your css when changed. | ||
| - `Rakefile` contains some tasks that help during development. Feel free to add useful tasks if needed. | ||
| - Please use 2-space indentation when editing the JavaScript. A `.jshintrc` file is present, which will help your code to follow the guidelines if you install and run `jshint`. | ||
| - Please test your modification thoroughly before submitting your Pull Request. | ||
|
|
||
| ### Changes that might not be accepted | ||
| We have to be conservative with the core game. This means that some modifications won't be merged, or will have to be evaluated carefully before being merged: | ||
|
|
||
| - Undo/redo features | ||
| - Save/reload features | ||
| - Changes to how the tiles look or their contents | ||
| - Changes to the layout | ||
| - Changes to the grid size | ||
|
|
||
| ### Changes that are welcome | ||
| - Bug fixes | ||
| - Compatibility improvements | ||
| - "Under the hood" enhancements | ||
| - Small changes that don't have an impact on the core gameplay |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| The MIT License (MIT) | ||
|
|
||
| Copyright (c) 2014 Gabriele Cirulli | ||
|
|
||
| Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| of this software and associated documentation files (the "Software"), to deal | ||
| in the Software without restriction, including without limitation the rights | ||
| to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| copies of the Software, and to permit persons to whom the Software is | ||
| furnished to do so, subject to the following conditions: | ||
|
|
||
| The above copyright notice and this permission notice shall be included in | ||
| all copies or substantial portions of the Software. | ||
|
|
||
| THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
| THE SOFTWARE. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| # 2048 | ||
| 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). 2048 was indirectly inspired by [Threes](https://asherv.com/threes/). | ||
|
|
||
| Made just for fun. [Play it here!](http://gabrielecirulli.github.io/2048/) | ||
|
|
||
| The official app can also be found on the [Play Store](https://play.google.com/store/apps/details?id=com.gabrielecirulli.app2048) and [App Store!](https://itunes.apple.com/us/app/2048-by-gabriele-cirulli/id868076805) | ||
|
|
||
| ### Contributions | ||
|
|
||
| [Anna Harren](https://github.com/iirelu/) and [sigod](https://github.com/sigod) are maintainers for this repository. | ||
|
|
||
| Other notable contributors: | ||
|
|
||
| - [TimPetricola](https://github.com/TimPetricola) added best score storage | ||
| - [chrisprice](https://github.com/chrisprice) added custom code for swipe handling on mobile | ||
| - [marcingajda](https://github.com/marcingajda) made swipes work on Windows Phone | ||
| - [mgarciaisaia](https://github.com/mgarciaisaia) added support for Android 2.3 | ||
|
|
||
| Many thanks to [rayhaanj](https://github.com/rayhaanj), [Mechazawa](https://github.com/Mechazawa), [grant](https://github.com/grant), [remram44](https://github.com/remram44) and [ghoullier](https://github.com/ghoullier) for the many other good contributions. | ||
|
|
||
| ### Screenshot | ||
|
|
||
| <p align="center"> | ||
| <img src="https://cloud.githubusercontent.com/assets/1175750/8614312/280e5dc2-26f1-11e5-9f1f-5891c3ca8b26.png" alt="Screenshot"/> | ||
| </p> | ||
|
|
||
| That screenshot is fake, by the way. I never reached 2048 :smile: | ||
|
|
||
| ## Contributing | ||
| Changes and improvements are more than welcome! Feel free to fork and open a pull request. Please make your changes in a specific branch and request to pull into `master`! If you can, please make sure the game fully works before sending the PR, as that will help speed up the process. | ||
|
|
||
| You can find the same information in the [contributing guide.](https://github.com/gabrielecirulli/2048/blob/master/CONTRIBUTING.md) | ||
|
|
||
| ## License | ||
| 2048 is licensed under the [MIT license.](https://github.com/gabrielecirulli/2048/blob/master/LICENSE.txt) | ||
|
|
||
| ## Donations | ||
| I made this in my 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 me coffee, you can donate at my BTC address: `1Ec6onfsQmoP9kkL3zkpB6c5sA4PVcXU2i`. Thank you very much! |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| require "date" | ||
|
|
||
| namespace :appcache do | ||
| desc "update the date in the appcache file (in the gh-pages branch)" | ||
| task :update do | ||
| appcache = File.read("cache.appcache") | ||
| updated = "# Updated: #{DateTime.now}" | ||
|
|
||
| File.write("cache.appcache", appcache.sub(/^# Updated:.*$/, updated)) | ||
| end | ||
| end |
Binary file not shown.
Oops, something went wrong.