From df035382c41b4d0cda86a1aa30b53f15bef05b53 Mon Sep 17 00:00:00 2001
From: Doug McInnes <doug@dougmcinnes.com>
Date: Tue, 25 May 2010 22:18:23 -0700
Subject: [PATCH 1/6] I can't spell 'screen' apparently :)

---
 game.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/game.js b/game.js
index 553849b..8b87936 100644
--- a/game.js
+++ b/game.js
@@ -917,7 +917,7 @@ Game = {
       this.state = 'waiting';
     },
     waiting: function () {
-      Text.renderText(ipad ? 'Touch Sreen to Start' : 'Press Space to Start', 36, Game.canvasWidth/2 - 270, Game.canvasHeight/2);
+      Text.renderText(ipad ? 'Touch Screen to Start' : 'Press Space to Start', 36, Game.canvasWidth/2 - 270, Game.canvasHeight/2);
       if (KEY_STATUS.space || window.gameStart) {
         KEY_STATUS.space = false; // hack so we don't shoot right away
         window.gameStart = false;

From 25ede836903881848fea811df5b687b59d962da3 Mon Sep 17 00:00:00 2001
From: Doug McInnes <doug@dougmcinnes.com>
Date: Wed, 26 May 2010 23:52:00 -0700
Subject: [PATCH 2/6] a couple missing ends with the ipad version

---
 game.js    | 3 +--
 index.html | 1 -
 ipad.js    | 4 ++--
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/game.js b/game.js
index 8b87936..5daadb0 100644
--- a/game.js
+++ b/game.js
@@ -408,7 +408,6 @@ Ship = function () {
     }
     if (KEY_STATUS.space) {
       if (this.delayBeforeBullet <= 0) {
-        this.delayBeforeBullet = 10;
         for (var i = 0; i < this.bullets.length; i++) {
           if (!this.bullets[i].visible) {
             SFX.laser();
@@ -917,7 +916,7 @@ Game = {
       this.state = 'waiting';
     },
     waiting: function () {
-      Text.renderText(ipad ? 'Touch Screen to Start' : 'Press Space to Start', 36, Game.canvasWidth/2 - 270, Game.canvasHeight/2);
+      Text.renderText(window.ipad ? 'Touch Screen to Start' : 'Press Space to Start', 36, Game.canvasWidth/2 - 270, Game.canvasHeight/2);
       if (KEY_STATUS.space || window.gameStart) {
         KEY_STATUS.space = false; // hack so we don't shoot right away
         window.gameStart = false;
diff --git a/index.html b/index.html
index 3d6e6f4..8aa618d 100644
--- a/index.html
+++ b/index.html
@@ -6,7 +6,6 @@
     <script src="game.js"></script>
     <style>
       #canvas { border:1px solid black; top:0px; left:0px; }
-      #game-container { position:relative; top:0px; left:0px; }
       .button { position:absolute; border:1px solid black; }
       #left-controls { position:absolute; left:1px; bottom:0px; display:none; }
       #right-controls { position:absolute; right:1px; bottom:0px; display:none; }
diff --git a/ipad.js b/ipad.js
index 2e34c39..03e0269 100644
--- a/ipad.js
+++ b/ipad.js
@@ -4,8 +4,8 @@ if (ipad) {
   $(function () {
     $('#left-controls, #right-controls').show();
     $('body > *').hide();
-    $('body').css('margin', '0px').css('background', 'black');
-    $('#game-container').width(1024).css('top', 26).show();
+    $('body').css('margin', '0px').css('background', 'black').prepend($('#game-container').remove());
+    $('#game-container').width(1024).css('margin-top', 26).show();
     $('#canvas').attr('width', 1020).attr('height', 660).css('background', 'white').css('margin', '0 1');
 
     $('head').prepend($('<meta/>').attr('name', 'viewport').attr('content', 'width=device-width; height=device-height; initial-scale=1.0; maximum-scale=1.0; user-scalable=0;'));

From 4035769377cce96a88d5c1167079e12f30492391 Mon Sep 17 00:00:00 2001
From: Doug McInnes <doug@dougmcinnes.com>
Date: Wed, 9 Jun 2010 21:04:32 -0700
Subject: [PATCH 3/6] frame interval was set wrong after game was paused

---
 game.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/game.js b/game.js
index 5daadb0..7595a9d 100644
--- a/game.js
+++ b/game.js
@@ -1167,7 +1167,8 @@ $(function () {
     }
   };
 
-  var mainLoopId = setInterval(mainLoop, 25);
+  var frameInterval = 25;
+  var mainLoopId = setInterval(mainLoop, frameInterval);
 
   $(window).keydown(function (e) {
     switch (KEY_CODES[e.keyCode]) {
@@ -1181,7 +1182,7 @@ $(function () {
           Text.renderText('PAUSED', 72, Game.canvasWidth/2 - 160, 120);
         } else {
           lastFrame = Date.now();
-          mainLoopId = setInterval(mainLoop, 10);
+          mainLoopId = setInterval(mainLoop, frameInterval);
         }
         break;
       case 'm': // mute

From 3e42136a76cf78c6c421cd720427bf6337c2d623 Mon Sep 17 00:00:00 2001
From: Doug McInnes <doug@dougmcinnes.com>
Date: Tue, 15 Mar 2011 22:34:49 -0700
Subject: [PATCH 4/6] now using requestAnimationFrame

see this for more info:
http://paulirish.com/2011/requestanimationframe-for-smart-animating/
---
 game.js | 37 +++++++++++++++++++++++++++++--------
 1 file changed, 29 insertions(+), 8 deletions(-)

diff --git a/game.js b/game.js
index 7595a9d..18044d5 100644
--- a/game.js
+++ b/game.js
@@ -1095,6 +1095,8 @@ $(function () {
   extraDude.children = [];
 
   var i, j = 0;
+
+  var paused = false;
   var showFramerate = false;
   var avgFramerate = 0;
   var frameCount = 0;
@@ -1105,6 +1107,22 @@ $(function () {
   var elapsed;
   var delta;
 
+  var canvasNode = canvas[0];
+
+  // shim layer with setTimeout fallback
+  // from here:
+  // http://paulirish.com/2011/requestanimationframe-for-smart-animating/
+  window.requestAnimFrame = (function () {
+    return  window.requestAnimationFrame       ||
+            window.webkitRequestAnimationFrame ||
+            window.mozRequestAnimationFrame    ||
+            window.oRequestAnimationFrame      ||
+            window.msRequestAnimationFrame     ||
+            function (/* function */ callback, /* DOMElement */ element) {
+              window.setTimeout(callback, 1000 / 60);
+            };
+  })();
+
   var mainLoop = function () {
     context.clearRect(0, 0, Game.canvasWidth, Game.canvasHeight);
 
@@ -1165,10 +1183,15 @@ $(function () {
       avgFramerate = frameCount;
       frameCount = 0;
     }
+
+    if (paused) {
+      Text.renderText('PAUSED', 72, Game.canvasWidth/2 - 160, 120);
+    } else {
+      requestAnimFrame(mainLoop, canvasNode);
+    }
   };
 
-  var frameInterval = 25;
-  var mainLoopId = setInterval(mainLoop, frameInterval);
+  mainLoop();
 
   $(window).keydown(function (e) {
     switch (KEY_CODES[e.keyCode]) {
@@ -1176,13 +1199,11 @@ $(function () {
         showFramerate = !showFramerate;
         break;
       case 'p': // pause
-        if (mainLoopId) {
-          clearInterval(mainLoopId);
-          mainLoopId = null;
-          Text.renderText('PAUSED', 72, Game.canvasWidth/2 - 160, 120);
-        } else {
+        paused = !paused;
+        if (!paused) {
+          // start up again
           lastFrame = Date.now();
-          mainLoopId = setInterval(mainLoop, frameInterval);
+          mainLoop();
         }
         break;
       case 'm': // mute

From 3884eab839af1e82c44267484cf2945a766081f3 Mon Sep 17 00:00:00 2001
From: cbuckey <caroline@udacity.com>
Date: Fri, 29 Apr 2011 12:33:05 -0700
Subject: [PATCH 5/6] Add color

---
 game.js | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/game.js b/game.js
index 18044d5..49bf5ea 100644
--- a/game.js
+++ b/game.js
@@ -94,6 +94,8 @@ Sprite = function () {
 
   this.children = {};
 
+  this.color    = 'black';
+  this.solid    = false;
   this.visible  = false;
   this.reap     = false;
   this.bridgesH = true;
@@ -233,6 +235,9 @@ Sprite = function () {
       this.children[child].draw();
     }
 
+    this.context.strokeStyle = this.color;
+    this.context.fillStyle = this.color;
+
     this.context.beginPath();
 
     this.context.moveTo(this.points[0], this.points[1]);
@@ -244,6 +249,9 @@ Sprite = function () {
 
     this.context.closePath();
     this.context.stroke();
+    if (this.solid) {
+      this.context.fill();
+    }
   };
   this.findCollisionCanidates = function () {
     if (!this.visible || !this.currentNode) return [];
@@ -371,7 +379,12 @@ Ship = function () {
               0, -11,
               6,   7]);
 
+  this.color = 'navy';
+  this.solid = true;
+
   this.children.exhaust = new Sprite();
+  this.children.exhaust.solid = true;
+  this.children.exhaust.color = 'red';
   this.children.exhaust.init("exhaust",
                              [-3,  6,
                                0, 11,
@@ -647,6 +660,8 @@ Asteroid = function () {
               -4, -10,
               -4,  -5]);
 
+  this.color = 'lightgray';
+  this.solid = true;
   this.visible = true;
   this.scale = 6;
   this.postMove = this.wrapPostMove;
@@ -694,6 +709,7 @@ Explosion = function () {
   this.draw = function () {
     if (this.visible) {
       this.context.save();
+      this.context.strokeStyle = 'red';
       this.context.lineWidth = 1.0 / this.scale;
       this.context.beginPath();
       for (var i = 0; i < 5; i++) {

From 5420686136f9722a0089672df7add38236858b59 Mon Sep 17 00:00:00 2001
From: Sudhanshu Kulshrestha <48475411+SudKul@users.noreply.github.com>
Date: Tue, 28 Jun 2022 13:49:05 +0530
Subject: [PATCH 6/6] Add archival note to README

---
 README.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/README.md b/README.md
index 3464531..718c887 100644
--- a/README.md
+++ b/README.md
@@ -13,3 +13,8 @@ Git to find the commit where a bug was introduced. To play the modified version
 of the game, simply open the index.html file in your web browser.
 
 Many thanks to Doug for creating this awesome game.
+
+ # Archival Note 
+ This repository is deprecated; therefore, we are going to archive it. However, learners will be able to fork it to their personal Github account but cannot submit PRs to this repository. If you have any issues or suggestions to make, feel free to: 
+- Utilize the https://knowledge.udacity.com/ forum to seek help on content-specific issues. 
+- Submit a support ticket along with the link to your forked repository if (learners are) blocked for other reasons. Here are the links for the [retail consumers](https://udacity.zendesk.com/hc/en-us/requests/new) and [enterprise learners](https://udacityenterprise.zendesk.com/hc/en-us/requests/new?ticket_form_id=360000279131).
\ No newline at end of file