Merge branch 'master' of https://github.com/sgmeyer/generator-crafty

sgmeyer · Mar 26, 2014 · cacbac0 · cacbac0
2 parents e11ff87 + bd10ddb
commit cacbac0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 59 deletions.
diff --git a/app/templates/_index.html b/app/templates/_index.html
@@ -1,61 +1,4 @@
 <!doctype html>
-<<<<<<< HEAD
-<!-- paulirish.com/2008/conditional-stylesheets-vs-css-hacks-answer-neither/ -->
-<!--[if lt IE 7]> <html class="no-js lt-ie9 lt-ie8 lt-ie7" lang="en"> <![endif]-->
-<!--[if IE 7]>    <html class="no-js lt-ie9 lt-ie8" lang="en"> <![endif]-->
-<!--[if IE 8]>    <html class="no-js lt-ie9" lang="en"> <![endif]-->
-<!-- Consider adding a manifest.appcache: h5bp.com/d/Offline -->
-<!--[if gt IE 8]><!--> <html class="no-js" lang="en"> <!--<![endif]-->
-<head>
-  <meta charset="utf-8">
-  <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-  <title><%= gameName %></title>
-  <meta name="description" content="">
-  <meta name="viewport" content="width=device-width">
-  <script src="src/bower_components/modernizr/modernizr.js"></script>
-  <style type="text/css">body {-webkit-tap-highlight-color: rgba(0,0,0,0);  margin: 0;}</style>
-</head>
-<body>
-  <!--[if lt IE 8]><p class=chromeframe>Your browser is <em>ancient!</em> <a href="http://browsehappy.com/">Upgrade to a different browser</a> or <a href="http://www.google.com/chromeframe/?redirect=true">install Google Chrome Frame</a> to experience this site.</p><![endif]-->
-
-  <!-- Add your site or application content here -->
-
-  <script src="src/bower_components/jquery/jquery.js"></script>
-  <script src="src/libs/Crafty/crafty.js"></script>
-  <script src="src/bower_components/underscore/underscore.js"></script>
-  <script src="src/bower_components/backbone/backbone.js"></script>
-  <script src="src/bower_components/requirejs-jquery/parts/require.js"></script>
-  <script src="src/game.js"></script>
-
-  <!-- These are debugging libraries and can be removed if you don't want the debugger. -->
-  <script src="src/libs/CraftyDebug/craftyDebug.js"></script>
-  <script src="src/libs/CraftyDebug/panels/assets.js"></script>
-  <script src="src/libs/CraftyDebug/panels/entities.js"></script>
-  <script type="text/javascript">
-  gameContainer = {
-    env : 'dev',
-    gameVersion : '0.0.1',
-    scene : 'main'
-  },
-  sc    = [], // container for backbone scene elements
-  infc  = []  // container for backbone interface elements
-
-  $(document).ready(function () {
-    Crafty.debugBar.show();
-  });
-  </script>
-  <!-- end scripts -->
-
-  <!-- Setup google analytics -->
-  <script>
-    var _gaq=[['_setAccount','UA-XXXXX-X'],['_trackPageview']];
-    (function(d,t){var g=d.createElement(t),s=d.getElementsByTagName(t)[0];
-    g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
-    s.parentNode.insertBefore(g,s)}(document,'script'));
-  </script>
-  <script src="//localhost:35729/livereload.js"></script>
-</body>
-=======
 <html>
   <head>
     <meta charset="utf-8">
@@ -64,7 +7,7 @@
     <meta name="description" content="">
     <meta name="viewport" content="width=device-width">
   </head>
+  <body>
 
-  <body></body>
->>>>>>> bd10ddbf8732c0e714aef30dafae4eec3374c87a
+  </body>
 </html>
diff --git a/changelog.txt b/changelog.txt
@@ -6,6 +6,8 @@ v0.3.0 - 3-26-2014
 * Scaffolding for CraftyJS components
 * updated package dependencies for grunting to the latest, resembling the official Yeoman generators
 * cleaning all files from trailing whitespaces
+* prompt user to enter canvas size
+* make index.html to be built dynamically
 
 v0.2.2 - 3-21-2014