Skip to content

Commit

Permalink
Collisions refactored,
Browse files Browse the repository at this point in the history
Code layout changed
  • Loading branch information
Jafnee committed Apr 21, 2014
1 parent 18c98be commit be8d44c
Show file tree
Hide file tree
Showing 18 changed files with 1,570 additions and 1,540 deletions.
109 changes: 57 additions & 52 deletions about.html
Original file line number Diff line number Diff line change
@@ -1,55 +1,60 @@
<!DOCTYPE html>
<html>
<head>
<title>Generic Space Shooter</title>
<meta charset="UTF-8">
<link rel="shortcut icon" href="./images/logo/favicon.ico" />
<link rel="stylesheet" href="css/main.css" />
</head>
<body>
<header id="top">
<div id="logo">
</div>
<nav id="buttons">
<ul>
<li><a href="index.html" title="Main Page">Game</a></li>
<li><a href="about.html" title="About Page">About</a></li>
</ul>
</nav>
</header>
<article id="about">
<header id="credits">
<h1>Credits</h1>
<p>Public domain images, sounds and libraries used in this game.</p>
</header>
<section class="credits">
<h2>Images</h2>
<ul>
<li>Spaceships, power ups and lasers by <a href="http://www.kenney.nl">Kenney</a>.</li>
<ol>
<li>Player spaceship was edited by myself to incorporate a simple sprite animation.</li>
</ol>
<li>Game logo created with <a href="http://textcraft.net/">textcraft</a>.</li>
<li>Buttons created with <a href="http://dabuttonfactory.com/">dabuttonfactory</a>.</li>
</ul>
</section>
<section class="credits">
<h2>Sounds</h2>
<ul>
<li>Menu click sound and pause sound created with <a href="http://www.superflashbros.net/as3sfxr/">as3sfxr</a>.</li>
<li>Shooting sounds and other play sounds by <a href="http://www.kenney.nl">Kenney</a>.</li>
<li>Background music from <a href="http://www.nosoapradio.us/">nosoapradio</a>.</li>
</ul>
</section>
<section class="credits">
<h2>Other/Libraries</h2>
<ul>
<li>File loader, <a href="http://requirejs.org/">requireJS</a>.</li>
<li>Keybaord controls, <a href="http://craig.is/killing/mice">mousetrap</a>.</li>
<li>Sounds, <a href="http://goldfirestudios.com/blog/104/howler.js-Modern-Web-Audio-Javascript-Library">howler.js</a>.</li>
<li>Font, <a href="http://www.dafont.com/zephyrean-brk.font">Brian Kent</a>.</li>
</ul>
</section>
</article>
</body>

<head>
<title>Generic Space Shooter</title>
<meta charset="UTF-8">
<link rel="shortcut icon" href="./images/logo/favicon.ico" />
<link rel="stylesheet" href="css/main.css" />
</head>

<body class="info">
<header id="top">
<div id="logo">
</div>
<nav id="buttons">
<ul>
<li><a href="index.html" title="Main Page">Game</a>
</li>
<li><a href="about.html" title="About Page">About</a>
</li>
</ul>
</nav>
</header>
<article id="about">
<header id="credits">
<h1>Credits</h1>
<p>Public domain images, sounds and libraries used in this game.</p>
</header>
<section class="credits">
<h2>Images</h2>
<ul>
<li>Spaceships, power ups and lasers by <a href="http://www.kenney.nl">Kenney</a>.</li>
<ol>
<li>Player spaceship was edited by myself to incorporate a simple sprite animation.</li>
</ol>
<li>Game logo created with <a href="http://textcraft.net/">textcraft</a>.</li>
<li>Buttons created with <a href="http://dabuttonfactory.com/">dabuttonfactory</a>.</li>
</ul>
</section>
<section class="credits">
<h2>Sounds</h2>
<ul>
<li>Menu click sound and pause sound created with <a href="http://www.superflashbros.net/as3sfxr/">as3sfxr</a>.</li>
<li>Shooting sounds and other play sounds by <a href="http://www.kenney.nl">Kenney</a>.</li>
<li>Background music from <a href="http://www.nosoapradio.us/">nosoapradio</a>.</li>
</ul>
</section>
<section class="credits">
<h2>Other/Libraries</h2>
<ul>
<li>File loader, <a href="http://requirejs.org/">requireJS</a>.</li>
<li>Keybaord controls, <a href="http://craig.is/killing/mice">mousetrap</a>.</li>
<li>Sounds, <a href="http://goldfirestudios.com/blog/104/howler.js-Modern-Web-Audio-Javascript-Library">howler.js</a>.</li>
<li>Font, <a href="http://www.dafont.com/zephyrean-brk.font">Brian Kent</a>.</li>
</ul>
</section>
</article>
</body>

</html>
2 changes: 1 addition & 1 deletion css/main.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@charset 'UTF-8';
body {
body.info {
background-image: url("../images/menu/backdrop/stars.png");
}

Expand Down
Binary file added images/misc/explosion/explosion.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
53 changes: 29 additions & 24 deletions index.html
Original file line number Diff line number Diff line change
@@ -1,27 +1,32 @@
<!DOCTYPE html>
<html>
<head>
<title>Generic Space Shooter</title>
<meta charset="UTF-8">
<link rel="shortcut icon" href="./images/logo/favicon.ico" />
<link rel="stylesheet" href="css/main.css" />
<script src="js/require.js" data-main="js/main"></script>
</head>
<body>
<header id="top">
<div id="logo">
</div>
<nav id="buttons">
<ul>
<li><a href="index.html" title="Main Page">Game</a></li>
<li><a href="about.html" title="About Page">About</a></li>
</ul>
</nav>
</header>
<section id="gameSection">
<canvas id="gameCanvas" width="1000" height="500">
</canvas>
<h1>Your browser does not support Canvas. Please upgrade your browser.</h1>
</section>
</body>

<head>
<title>Generic Space Shooter</title>
<meta charset="UTF-8">
<link rel="shortcut icon" href="./images/logo/favicon.ico" />
<link rel="stylesheet" href="css/main.css" />
<script src="js/require.js" data-main="js/main"></script>
</head>

<body>
<header id="top">
<div id="logo">
</div>
<nav id="buttons">
<ul>
<li><a href="index.html" title="Main Page">Game</a>
</li>
<li><a href="about.html" title="About Page">About</a>
</li>
</ul>
</nav>
</header>
<section id="gameSection">
<canvas id="gameCanvas" width="1000" height="500">
</canvas>
<h1>Your browser does not support Canvas. Please upgrade your browser.</h1>
</section>
</body>

</html>
Loading

0 comments on commit be8d44c

Please sign in to comment.