Skip to content

Commit

Permalink
some improvements
Browse files Browse the repository at this point in the history
  • Loading branch information
@cstuncsik
cstuncsik committed Jun 5, 2015
1 parent 9ede4ea commit eb1cb27
Show file tree
Hide file tree
Showing 22 changed files with 2,206 additions and 2,107 deletions.
16 changes: 16 additions & 0 deletions .editorconfig
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
root = true

[*]
indent_style = space
indent_size = 4
end_of_line = crlf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true

[{package.json}]
indent_style = space
indent_size = 2

[*.md]
trim_trailing_whitespace = false
93 changes: 93 additions & 0 deletions .jshintrc
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
{
// JSHint Default Configuration File (as on JSHint website)
// See http://jshint.com/docs/ for more details

"maxerr" : 50, // {int} Maximum error before stopping

// Enforcing
"bitwise" : false, // true: Prohibit bitwise operators (&, |, ^, etc.)
"camelcase" : false, // true: Identifiers must be in camelCase
"curly" : true, // true: Require {} for every new block or scope
"eqeqeq" : true, // true: Require triple equals (===) for comparison
"forin" : true, // true: Require filtering for..in loops with obj.hasOwnProperty()
"freeze" : true, // true: prohibits overwriting prototypes of native objects such as Array, Date etc.
"immed" : true, // true: Require immediate invocations to be wrapped in parens e.g. `(function () { } ());`
"indent" : 4, // {int} Number of spaces to use for indentation
"latedef" : true, // true: Require variables/functions to be defined before being used
"newcap" : true, // true: Require capitalization of all constructor functions e.g. `new F()`
"noarg" : true, // true: Prohibit use of `arguments.caller` and `arguments.callee`
"noempty" : true, // true: Prohibit use of empty blocks
"nonbsp" : true, // true: Prohibit "non-breaking whitespace" characters.
"nonew" : false, // true: Prohibit use of constructors for side-effects (without assignment)
"plusplus" : false, // true: Prohibit use of `++` & `--`
"quotmark" : false, // Quotation mark consistency:
// false : do nothing (default)
// true : ensure whatever is used is consistent
// "single" : require single quotes
// "double" : require double quotes
"undef" : true, // true: Require all non-global variables to be declared (prevents global leaks)
"unused" : true, // true: Require all defined variables be used
"strict" : false, // true: Requires all functions run in ES5 Strict Mode
"maxparams" : false, // {int} Max number of formal params allowed per function
"maxdepth" : false, // {int} Max depth of nested blocks (within functions)
"maxstatements" : false, // {int} Max number statements per function
"maxcomplexity" : false, // {int} Max cyclomatic complexity per function
"maxlen" : false, // {int} Max number of characters per line

// Relaxing
"asi" : false, // true: Tolerate Automatic Semicolon Insertion (no semicolons)
"boss" : false, // true: Tolerate assignments where comparisons would be expected
"debug" : false, // true: Allow debugger statements e.g. browser breakpoints.
"eqnull" : false, // true: Tolerate use of `== null`
"es5" : true, // true: Allow ES5 syntax (ex: getters and setters)
"esnext" : true, // true: Allow ES.next (ES6) syntax (ex: `const`)
"elision" : true,
"moz" : false, // true: Allow Mozilla specific syntax (extends and overrides esnext features)
// (ex: `for each`, multiple try/catch, function expression…)
"evil" : false, // true: Tolerate use of `eval` and `new Function()`
"expr" : false, // true: Tolerate `ExpressionStatement` as Programs
"funcscope" : false, // true: Tolerate defining variables inside control statements
"globalstrict" : false, // true: Allow global "use strict" (also enables 'strict')
"iterator" : false, // true: Tolerate using the `__iterator__` property
"lastsemic" : false, // true: Tolerate omitting a semicolon for the last statement of a 1-line block
"laxbreak" : false, // true: Tolerate possibly unsafe line breakings
"laxcomma" : false, // true: Tolerate comma-first style coding
"loopfunc" : false, // true: Tolerate functions being defined in loops
"multistr" : false, // true: Tolerate multi-line strings
"noyield" : false, // true: Tolerate generator functions with no yield statement in them.
"notypeof" : false, // true: Tolerate invalid typeof operator values
"proto" : false, // true: Tolerate using the `__proto__` property
"scripturl" : false, // true: Tolerate script-targeted URLs
"shadow" : false, // true: Allows re-define variables later in code e.g. `var x=1; x=2;`
"sub" : false, // true: Tolerate using `[]` notation when it can still be expressed in dot notation
"supernew" : false, // true: Tolerate `new function () { ... };` and `new Object;`
"validthis" : false, // true: Tolerate using this in a non-constructor function

// Environments
"browser" : true, // Web Browser (window, document, etc)
"browserify" : false, // Browserify (node.js code in the browser)
"couch" : false, // CouchDB
"devel" : true, // Development/debugging (alert, confirm, etc)
"dojo" : false, // Dojo Toolkit
"jasmine" : false, // Jasmine
"jquery" : false, // jQuery
"mocha" : false, // Mocha
"mootools" : false, // MooTools
"node" : true, // Node.js
"nonstandard" : false, // Widely adopted globals (escape, unescape, etc)
"prototypejs" : false, // Prototype and Scriptaculous
"qunit" : false, // QUnit
"rhino" : false, // Rhino
"shelljs" : false, // ShellJS
"worker" : false, // Web Workers
"wsh" : false, // Windows Scripting Host
"yui" : false, // Yahoo User Interface

// Custom Globals
// additional predefined global variables
"globals" : {
"game": true,
"jsfxr": true,
"Stats": true
}
}
121 changes: 68 additions & 53 deletions app/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,61 +10,76 @@
</head>

<body>
<canvas id="b"></canvas>
<div id="b1"></div>
<div id="b2"></div>
<div id="b3"></div>
<div id="f"></div>
<div id="cnt">
<div id="r">
<div id="hud">
LEVEL: <b id="lv"></b>
SCORE: <b id="sc"></b>
</div>
<canvas id="c"></canvas>
<div id="msg"></div>
<div id="hlp">
<h2>Controls</h2>
<p>Swap/Move elements: Click highlighted column to select an element and click to drop to another column </p>
<p>Pause: <strong>P</strong>, Mute: <strong>M</strong>,<br /> Stop bg anim: <strong>B</strong><br /> (because of performance issues on some devices)</p>
</div>
<div id="crd">
<h2>Credits</h2>
<p>Created by: <strong>Zoltan Pasztor</strong> &amp; <strong>Csaba Tuncsik</strong></p>
<p>Audio Processing: [JSFXR](<a href="https://github.com/mneubrand/jsfxr" target="_blank">https://github.com/mneubrand/jsfxr</a>) by [@markusneubrand](<a href="https://twitter.com/markusneubrand" target="_blank">https://twitter.com/markusneubrand</a>)</p>
<p>Game sound inspired by: [@jackrugile](<a href="https://twitter.com/jackrugile" target="_blank">https://twitter.com/jackrugile</a>) (<a href="http://codepen.io/jackrugile/blog/arcade-audio-for-js13k-games" target="_blank">http://codepen.io/jackrugile/blog/arcade-audio-for-js13k-games</a>)</p>
<p>Game random number utility inspired by: # JS13KGames Boilerplate (<a href="https://github.com/ooflorent/js13k-boilerplate/blob/master/src/rng.js" target="_blank">https://github.com/ooflorent/js13k-boilerplate/blob/master/src/rng.js</a>)</p>
</div>
<div id="mnu">
<h1>★<span>FE<span>WA</span></span>★</h1>
<ul>
<li id="re">RESUME</li>
<li id="ng">NEW GAME</li>
<li id="hl">HELP</li>
<li id="cr">CREDITS</li>
</ul>
</div>
<canvas id="b"></canvas>
<div id="b1"></div>
<div id="b2"></div>
<div id="b3"></div>
<div id="f"></div>
<div id="cnt">
<div id="r">
<div id="hud">
LEVEL: <b id="lv"></b>
SCORE: <b id="sc"></b>
</div>
<canvas id="c"></canvas>
<div id="msg"></div>
<div id="hlp">
<h2>Controls</h2>

<p>Swap/Move elements: Click highlighted column to select an element and click to drop to another
column </p>

<p>Pause: <strong>P</strong>, Mute: <strong>M</strong>,<br/> Stop bg anim: <strong>B</strong><br/> (because
of performance issues on some devices)</p>
</div>
<div id="crd">
<h2>Credits</h2>

<p>Created by: <strong>Zoltan Pasztor</strong> &amp; <strong>Csaba Tuncsik</strong></p>

<p>Audio Processing: [JSFXR](<a href="https://github.com/mneubrand/jsfxr" target="_blank">https://github.com/mneubrand/jsfxr</a>)
by [@markusneubrand](<a href="https://twitter.com/markusneubrand" target="_blank">https://twitter.com/markusneubrand</a>)
</p>

<p>Game sound inspired by: [@jackrugile](<a href="https://twitter.com/jackrugile" target="_blank">https://twitter.com/jackrugile</a>)
(<a href="http://codepen.io/jackrugile/blog/arcade-audio-for-js13k-games" target="_blank">http://codepen.io/jackrugile/blog/arcade-audio-for-js13k-games</a>)
</p>

<p>Game random number utility inspired by: # JS13KGames Boilerplate (<a
href="https://github.com/ooflorent/js13k-boilerplate/blob/master/src/rng.js" target="_blank">https://github.com/ooflorent/js13k-boilerplate/blob/master/src/rng.js</a>)
</p>
</div>
<div id="mnu">
<h1>★<span>FE<span>WA</span></span>★</h1>
<ul>
<li id="re">RESUME</li>
<li id="ng">NEW GAME</li>
<li id="hl">HELP</li>
<li id="cr">CREDITS</li>
</ul>
</div>
</div>
<!-- build:remove -->
<script src="scripts/stats.js"></script>
<!-- endbuild -->
<!-- build:js j.js -->
<script src="scripts/raf.js"></script>
<script src="scripts/utils.js"></script>
<script src="scripts/config.js"></script>
<script src="scripts/sprites.js"></script>
<script src="scripts/jsfxr.js"></script>
<script src="scripts/audio.js"></script>
<script src="scripts/entity.js"></script>
<script src="scripts/particle.js"></script>
<script src="scripts/explosion.js"></script>
<script src="scripts/bullet.js"></script>
<script src="scripts/tower.js"></script>
<script src="scripts/brick.js"></script>
<script src="scripts/stars.js"></script>
<script src="scripts/core.js"></script>
<!-- endbuild -->
</div>
<!-- build:remove(tmp/) -->
<script src="scripts/stats.js"></script>
<!-- endbuild -->
<!-- build:js(tmp/) j.js -->
<script src="scripts/game.js"></script>
<script src="scripts/raf.js"></script>
<script src="scripts/utils.js"></script>
<script src="scripts/config.js"></script>
<script src="scripts/sprites.js"></script>
<script src="scripts/jsfxr.js"></script>
<script src="scripts/audio.js"></script>
<script src="scripts/entity.js"></script>
<script src="scripts/particle.js"></script>
<script src="scripts/explosion.js"></script>
<script src="scripts/bullet.js"></script>
<script src="scripts/tower.js"></script>
<script src="scripts/brick.js"></script>
<script src="scripts/stars.js"></script>
<script src="scripts/core.js"></script>
<!-- endbuild -->
</body>

</html>
Loading

0 comments on commit eb1cb27

Please sign in to comment.