Permalink
Browse files

Merge branch 'master' of github.com:stugoo/unicorn-super-blaster

  • Loading branch information...
2 parents 38cbeda + 533c294 commit 831ff10408ddd22983233b7efb117fa1c309d2aa @adamcbrewer adamcbrewer committed Nov 10, 2012
Showing with 55 additions and 11 deletions.
  1. +15 −0 TODO.txt
  2. +0 −10 index.html
  3. +40 −1 js/game.js
View
@@ -0,0 +1,15 @@
+TO DO ----
+
+- get sprites
+- generate baddies
+- badguy movement
+- badguy shooting
+- good guy + badguy collision
+
+
+nice to have
+- power ups
+- health
+- scroring?
+- shooting
+- achievemnt
View
@@ -9,9 +9,6 @@
<script src="js/vendor/underscore-1.4.2.js"></script>
<script src="js/vendor/jquery-1.8.2.js"></script>
<script src="js/game.js"></script>
- <script src="js/mo.js"></script>
- <script src="js/stu.js"></script>
- <script src="js/adam.js"></script>
</head>
<body>
<div id="container">
@@ -22,14 +19,7 @@
</div>
<script>
- // kick off the game when the web page is ready
- $(document).ready(function() {
- var game = new Game();
- game.initCrafty();
- // start loading things
- Crafty.scene('loading');
- });
</script>
</body>
</html>
View
@@ -178,7 +178,7 @@
},
// increment the score - note how we call this.text() to change the text!
increment: function() {
- this.score = this.score + 1;
+ this.score = this.score + 1000;
this.text(this._textGen);
}
})
@@ -260,4 +260,43 @@
};
+
+ /*STU
+ ====================================*/
+
+
+
+
+
+
+ /*ADAM
+ ====================================*/
+
+
+
+
+
+
+
+ /*MO
+ ====================================*/
+
+
+
+
+
+
+
+
+
+
+ // kick off the game when the web page is ready
+ $(document).ready(function() {
+ var game = new Game();
+ game.initCrafty();
+
+ // start loading things
+ Crafty.scene('loading');
+ });
+
})();

0 comments on commit 831ff10

Please sign in to comment.