Skip to content

Commit

Permalink
new kitty! redesign
Browse files Browse the repository at this point in the history
  • Loading branch information
courtyenn committed Jan 19, 2016
1 parent f26fe76 commit 772538a
Show file tree
Hide file tree
Showing 17 changed files with 1,021 additions and 1,006 deletions.
Binary file added ..gitignore.un~
Binary file not shown.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
lib
bower_components
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
kitty_jump
==========

HTML5 canvas game using jQuery and module pattern for enclosure.
kitty_jump
==========

HTML5 canvas game using jQuery and module pattern for enclosure.
Binary file modified public/images/kitty_bg.jpg
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 public/images/kitty_carpet.jpg
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 public/images/kitty_cat.jpg
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 public/images/kitty_cat.png
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 public/images/kitty_start.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
144 changes: 72 additions & 72 deletions public/index.html
Original file line number Diff line number Diff line change
@@ -1,72 +1,72 @@
<!doctype html>
<head>
<meta charset="utf-8">

<title>Kitty Game</title>

<link rel="stylesheet" href="styles.css"/>
</head>
<body>
<div id="wrapper">
<!--<canvas id="menu"></canvas>-->

<div id="start">
<h1 class="txt-center">Kitty Jump!</h1>
<div class="">
<div class="">
<h3>This is you:</h3>
<img src="images/kitty.png" />
<p class="float-rt">
You have 9 lives: <img src="images/life.png" />x9
</p>
</div>
<div class="">
<div class="">
<h3>Eat kibbles:</h3>
<img src="images/kibble_O_lg.png"/><img src="images/kibble_X_lg.png"/>
<p class="float-rt">
AVOID hitting kibbles... You will lose points!
</p>
</div>
<div class="">
<h3>Do <span class="bold">NOT</span> eat candy:</h3>

<img class="wd-100" src="images/candy.png"/>
</div>
</div>
<div class="">
Press P to pause
</div>
</div>
<input id="" type="submit" class="butt butt-good start-game center-blk" value="Play Game!"/>
</div>

<div id="game-over">
<h1 class="txt-center">GAME OVER</h1>
<a class="butt butt-good lt-butt start-game" href="#">Play again?</a><a id="main-menu" class="butt butt-exit rt-butt" href="#">Main Menu</a>
</div>


<div id="pause">
<h1 class="txt-center">PAUSED</h1>
<h3 class="txt-center">Press 'O' To Continue</h3></div>

<audio loop="true"></audio>
<canvas id="game"></canvas>
</div>

<div id="mute">
<button>MUTE</button>
</div>

<script language="javascript" src="js/jquery.min.js" type="text/javascript"></script>
<script language="javascript" src="js/jquery.hotkeys.js" type="text/javascript"></script>
<script language="javascript" src="js/key_status.js" type="text/javascript"></script>
<script language="javascript" src="js/util.js" type="text/javascript"></script>
<script language="javascript" src="js/sprite.js" type="text/javascript"></script>
<!-- <script language="javascript" src="js/sound.js" ></script> -->
<script language="javascript" type="text/javascript" src="main.js"></script>
</body>


</html>
<!doctype html>
<head>
<meta charset="utf-8">

<title>Kitty Game</title>

<link rel="stylesheet" href="styles.css"/>
</head>
<body>
<div id="wrapper">
<!--<canvas id="menu"></canvas>-->

<div id="start">
<h1 class="txt-center">Kitty Jump!</h1>
<div class="">
<div class="">
<h3>This is you:</h3>
<img src="images/kitty.png" />
<p class="float-rt">
You have 9 lives: <img src="images/life.png" />x9
</p>
</div>
<div class="">
<div class="">
<h3>Eat kibbles:</h3>
<img src="images/kibble_O_lg.png"/><img src="images/kibble_X_lg.png"/>
<p class="float-rt">
AVOID hitting kibbles... You will lose points!
</p>
</div>
<div class="">
<h3>Do <span class="bold">NOT</span> eat candy:</h3>

<img class="wd-100" src="images/candy.png"/>
</div>
</div>
<div class="">
Press P to pause
</div>
</div>
<input id="" type="submit" class="butt butt-good start-game center-blk" value="Play Game!"/>
</div>

<div id="game-over">
<h1 class="txt-center">GAME OVER</h1>
<a class="butt butt-good lt-butt start-game" href="#">Play again?</a><a id="main-menu" class="butt butt-exit rt-butt" href="#">Main Menu</a>
</div>


<div id="pause">
<h1 class="txt-center">PAUSED</h1>
<h3 class="txt-center">Press 'O' To Continue</h3></div>

<audio loop="true"></audio>
<canvas id="game"></canvas>
</div>

<div id="mute">
<button>MUTE</button>
</div>

<script language="javascript" src="js/jquery.min.js" type="text/javascript"></script>
<script language="javascript" src="js/jquery.hotkeys.js" type="text/javascript"></script>
<script language="javascript" src="js/key_status.js" type="text/javascript"></script>
<script language="javascript" src="js/util.js" type="text/javascript"></script>
<script language="javascript" src="js/sprite.js" type="text/javascript"></script>
<!-- <script language="javascript" src="js/sound.js" ></script> -->
<script language="javascript" type="text/javascript" src="main.js"></script>
</body>


</html>
198 changes: 99 additions & 99 deletions public/js/jquery.hotkeys.js
Original file line number Diff line number Diff line change
@@ -1,99 +1,99 @@
/*
* jQuery Hotkeys Plugin
* Copyright 2010, John Resig
* Dual licensed under the MIT or GPL Version 2 licenses.
*
* Based upon the plugin by Tzury Bar Yochay:
* http://github.com/tzuryby/hotkeys
*
* Original idea by:
* Binny V A, http://www.openjs.com/scripts/events/keyboard_shortcuts/
*/

(function(jQuery){

jQuery.hotkeys = {
version: "0.8",

specialKeys: {
8: "backspace", 9: "tab", 13: "return", 16: "shift", 17: "ctrl", 18: "alt", 19: "pause",
20: "capslock", 27: "esc", 32: "space", 33: "pageup", 34: "pagedown", 35: "end", 36: "home",
37: "left", 38: "up", 39: "right", 40: "down", 45: "insert", 46: "del",
96: "0", 97: "1", 98: "2", 99: "3", 100: "4", 101: "5", 102: "6", 103: "7",
104: "8", 105: "9", 106: "*", 107: "+", 109: "-", 110: ".", 111 : "/",
112: "f1", 113: "f2", 114: "f3", 115: "f4", 116: "f5", 117: "f6", 118: "f7", 119: "f8",
120: "f9", 121: "f10", 122: "f11", 123: "f12", 144: "numlock", 145: "scroll", 191: "/", 224: "meta"
},

shiftNums: {
"`": "~", "1": "!", "2": "@", "3": "#", "4": "$", "5": "%", "6": "^", "7": "&",
"8": "*", "9": "(", "0": ")", "-": "_", "=": "+", ";": ": ", "'": "\"", ",": "<",
".": ">", "/": "?", "\\": "|"
}
};

function keyHandler( handleObj ) {
// Only care when a possible input has been specified
if ( typeof handleObj.data !== "string" ) {
return;
}

var origHandler = handleObj.handler,
keys = handleObj.data.toLowerCase().split(" ");

handleObj.handler = function( event ) {
// Don't fire in text-accepting inputs that we didn't directly bind to
if ( this !== event.target && (/textarea|select/i.test( event.target.nodeName ) ||
event.target.type === "text") ) {
return;
}

// Keypress represents characters, not special keys
var special = event.type !== "keypress" && jQuery.hotkeys.specialKeys[ event.which ],
character = String.fromCharCode( event.which ).toLowerCase(),
key, modif = "", possible = {};

// check combinations (alt|ctrl|shift+anything)
if ( event.altKey && special !== "alt" ) {
modif += "alt+";
}

if ( event.ctrlKey && special !== "ctrl" ) {
modif += "ctrl+";
}

// TODO: Need to make sure this works consistently across platforms
if ( event.metaKey && !event.ctrlKey && special !== "meta" ) {
modif += "meta+";
}

if ( event.shiftKey && special !== "shift" ) {
modif += "shift+";
}

if ( special ) {
possible[ modif + special ] = true;

} else {
possible[ modif + character ] = true;
possible[ modif + jQuery.hotkeys.shiftNums[ character ] ] = true;

// "$" can be triggered as "Shift+4" or "Shift+$" or just "$"
if ( modif === "shift+" ) {
possible[ jQuery.hotkeys.shiftNums[ character ] ] = true;
}
}

for ( var i = 0, l = keys.length; i < l; i++ ) {
if ( possible[ keys[i] ] ) {
return origHandler.apply( this, arguments );
}
}
};
}

jQuery.each([ "keydown", "keyup", "keypress" ], function() {
jQuery.event.special[ this ] = { add: keyHandler };
});

})( jQuery );
/*
* jQuery Hotkeys Plugin
* Copyright 2010, John Resig
* Dual licensed under the MIT or GPL Version 2 licenses.
*
* Based upon the plugin by Tzury Bar Yochay:
* http://github.com/tzuryby/hotkeys
*
* Original idea by:
* Binny V A, http://www.openjs.com/scripts/events/keyboard_shortcuts/
*/

(function(jQuery){

jQuery.hotkeys = {
version: "0.8",

specialKeys: {
8: "backspace", 9: "tab", 13: "return", 16: "shift", 17: "ctrl", 18: "alt", 19: "pause",
20: "capslock", 27: "esc", 32: "space", 33: "pageup", 34: "pagedown", 35: "end", 36: "home",
37: "left", 38: "up", 39: "right", 40: "down", 45: "insert", 46: "del",
96: "0", 97: "1", 98: "2", 99: "3", 100: "4", 101: "5", 102: "6", 103: "7",
104: "8", 105: "9", 106: "*", 107: "+", 109: "-", 110: ".", 111 : "/",
112: "f1", 113: "f2", 114: "f3", 115: "f4", 116: "f5", 117: "f6", 118: "f7", 119: "f8",
120: "f9", 121: "f10", 122: "f11", 123: "f12", 144: "numlock", 145: "scroll", 191: "/", 224: "meta"
},

shiftNums: {
"`": "~", "1": "!", "2": "@", "3": "#", "4": "$", "5": "%", "6": "^", "7": "&",
"8": "*", "9": "(", "0": ")", "-": "_", "=": "+", ";": ": ", "'": "\"", ",": "<",
".": ">", "/": "?", "\\": "|"
}
};

function keyHandler( handleObj ) {
// Only care when a possible input has been specified
if ( typeof handleObj.data !== "string" ) {
return;
}

var origHandler = handleObj.handler,
keys = handleObj.data.toLowerCase().split(" ");

handleObj.handler = function( event ) {
// Don't fire in text-accepting inputs that we didn't directly bind to
if ( this !== event.target && (/textarea|select/i.test( event.target.nodeName ) ||
event.target.type === "text") ) {
return;
}

// Keypress represents characters, not special keys
var special = event.type !== "keypress" && jQuery.hotkeys.specialKeys[ event.which ],
character = String.fromCharCode( event.which ).toLowerCase(),
key, modif = "", possible = {};

// check combinations (alt|ctrl|shift+anything)
if ( event.altKey && special !== "alt" ) {
modif += "alt+";
}

if ( event.ctrlKey && special !== "ctrl" ) {
modif += "ctrl+";
}

// TODO: Need to make sure this works consistently across platforms
if ( event.metaKey && !event.ctrlKey && special !== "meta" ) {
modif += "meta+";
}

if ( event.shiftKey && special !== "shift" ) {
modif += "shift+";
}

if ( special ) {
possible[ modif + special ] = true;

} else {
possible[ modif + character ] = true;
possible[ modif + jQuery.hotkeys.shiftNums[ character ] ] = true;

// "$" can be triggered as "Shift+4" or "Shift+$" or just "$"
if ( modif === "shift+" ) {
possible[ jQuery.hotkeys.shiftNums[ character ] ] = true;
}
}

for ( var i = 0, l = keys.length; i < l; i++ ) {
if ( possible[ keys[i] ] ) {
return origHandler.apply( this, arguments );
}
}
};
}

jQuery.each([ "keydown", "keyup", "keypress" ], function() {
jQuery.event.special[ this ] = { add: keyHandler };
});

})( jQuery );
8 changes: 4 additions & 4 deletions public/js/jquery.min.js

Large diffs are not rendered by default.

32 changes: 16 additions & 16 deletions public/js/key_status.js
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
$(function() {
window.keydown = {};

function keyName(event) {
return jQuery.hotkeys.specialKeys[event.which] ||
String.fromCharCode(event.which).toLowerCase();
}

$(document).bind("keydown", function(event) {
keydown[keyName(event)] = true;
});

$(document).bind("keyup", function(event) {
keydown[keyName(event)] = false;
});
});
$(function() {
window.keydown = {};

function keyName(event) {
return jQuery.hotkeys.specialKeys[event.which] ||
String.fromCharCode(event.which).toLowerCase();
}

$(document).bind("keydown", function(event) {
keydown[keyName(event)] = true;
});

$(document).bind("keyup", function(event) {
keydown[keyName(event)] = false;
});
});
Loading

0 comments on commit 772538a

Please sign in to comment.