projects / tanks.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch (parent: 30ce0fc)
Restructures webroot files.
authordsc <david.schoonover@gmail.com>
Tue, 7 Dec 2010 13:38:52 +0000 (05:38 -0800)
committerdsc <david.schoonover@gmail.com>
Tue, 7 Dec 2010 13:38:52 +0000 (05:38 -0800)
22 files changed:
doc/notes.md patch | blob | history
index.php [deleted file] patch | blob | history
src/tanks/thing/tank.cjs patch | blob | history
www/build [new symlink] patch | blob
www/css/log.css [moved from css/log.css with 100% similarity] patch | blob | history
www/css/lttl.css [moved from css/lttl.css with 100% similarity] patch | blob | history
www/css/reset-old.css [moved from css/reset-old.css with 100% similarity] patch | blob | history
www/css/reset.css [moved from css/reset.css with 100% similarity] patch | blob | history
www/css/reset.min.css [moved from css/reset.min.css with 100% similarity] patch | blob | history
www/css/test.css [moved from css/test.css with 100% similarity] patch | blob | history
www/debug.html [moved from index.html with 67% similarity] patch | blob | history
www/deps.html [new file with mode: 0644] patch | blob
www/footer.html [new file with mode: 0644] patch | blob
www/ga.html [new file with mode: 0644] patch | blob
www/game.html [new file with mode: 0644] patch | blob
www/header.html [new file with mode: 0644] patch | blob
www/img/pathmap-bg.png [moved from img/pathmap-bg.png with 100% similarity] patch | blob | history
www/index.html [new file with mode: 0644] patch | blob
www/index.php [new file with mode: 0644] patch | blob
www/scripts.html [new file with mode: 0644] patch | blob
www/test [new symlink] patch | blob
www/welcome.html [new file with mode: 0644] patch | blob

diff --git a/doc/notes.md b/doc/notes.md
index 38cd78e..2c03c50 100644 (file)
--- a/doc/notes.md
+++ b/doc/notes.md
@@ -1,24 +1,19 @@
 # Bugs
-- Tanks seem to get stuck on some corners
 
 # TODOs
-- change @require to @ensure
 
-- AI: Don't shoot if it'll kill you or your friends
 - AI: Lead shots on moving targets
 - Config-driven unit-types (name, stats, properties; pointers to behavior scripts, assets)
-- DSL for AI scripts
-- Countdown to start
-- User system (so I know whose scripts are whose)
 - Game scoring
-- Move game objects into namespace `tanks`
-- Move portal into namespace (ideas: `portal`, canvas tools... `easel`, or `ezl`)
 - Support touch events (for iPad?)
 - Migrate A* code into PathMap
 
 
-# Notes
+# Code Notes
 - Replace *2 and /2 with shifts at compile-time
 - Clipping will suck (masking is easy -- overflow:hidden)
 - Classes should have generalize()-ed version of instance methods on them.
 
+
+# Other Notes
+- GA for littlestbattletanks.com: UA-20115336-1
diff --git a/index.php b/index.php
deleted file mode 100644 (file)
index 6fe8590..0000000
--- a/index.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<title>The Littlest Battletank</title>
-<link rel="stylesheet" href="css/reset.css" type="text/css" media="screen">
-<link rel="stylesheet" href="css/lttl.css" type="text/css" media="screen">
-</head>
-<body class="lttl tanks">
-
-
-<div id="overlay"></div>
-
-<div id="welcome" class="bigblue">
-    <div class="box">
-        <h1>The Littlest Battletank</h1>
-        
-        <h2>How To Play</h2>
-            
-        <ul id="notes">
-            <li>Move your tank with <code>wasd</code> or the arrow keys.</li>
-            <li>Use the mouse to aim; click to shoot (or press <code>spacebar</code>).</li>
-            <li>Press <code>enter</code> to pause.</li>
-        </ul>
-        
-        <h2 class="start">Click anywhere to start!</h2>
-    </div>
-</div>
-
-<div id="ai" style="display:none" class="bigblue">
-    <div class="box">
-        <h2>Add Tank AI</h2>
-        <textarea id="customtank"></textarea>
-        <div class="ready pinkbutton rounded">Ready</div>
-    </div>
-</div>
-
-<div id="viewport"></div>
-
-<div id="debug" style="display:none"><div class="inner box">
-    
-    <div id="config">
-        <h3>config</h3>
-        <!--<div><label for="bullets">bullets</label> <input id="bullets" name="bullets" value="10" type="text"></div>-->
-        <div><label for="pathmap">overlay pathmap</label> <input id="pathmap" name="pathmap" value="1" type="checkbox"></div>
-        <div><label for="aipaths">overlay ai paths</label> <input id="aipaths" name="aipaths" value="1" type="checkbox"></div>
-        <div><label for="trajectories">trace trajectories</label> <input id="trajectories" name="trajectories" value="1" type="checkbox"></div>
-        <div><label for="gridCoords">show coords on hover</label> <input id="gridCoords" name="gridCoords" value="1" type="checkbox"></div>
-    </div>
-    
-    <ul id="info">
-        <li id="state"></li>
-        <li><div class="fps-sparkline"></div></li>
-        <li><label for="info_fps"   >fps</label>      <input id="info_fps"     name="fps"     value="" type="text"></li>
-        <li><label for="info_frame" >frame</label>    <input id="info_frame"   name="frame"   value="" type="text"></li>
-        <li><div class="sep"></div></li>
-        <li><label for="info_active" >active</label>  <input id="info_active"  name="active"  value="" type="text"></li>
-        <li><label for="info_units"  >units</label>   <input id="info_units"   name="units"   value="" type="text"></li>
-        <li><label for="info_bullets">bullets</label> <input id="info_bullets" name="bullets" value="" type="text"></li>
-    </ul>
-    
-    <div class="clearer"></div>
-</div></div>
-
-<div id="scripts">
-<?php
-    $PYTHONPATH = "PYTHONPATH='/Users/dsc/.python/lib/python:/usr/local/lib/python2.7/site-packages:/usr/local/lib/python2.6/site-packages'";
-    
-    error_reporting(E_ALL);
-    echo "<!--\n";
-    echo shell_exec("$PYTHONPATH commonjs src/Y src/ezl src/tanks 2>&1");
-    echo "\n-->\n";
-    
-    include "tags.html";
-?>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/src/tanks/thing/tank.cjs b/src/tanks/thing/tank.cjs
index e029781..c166ff5 100644 (file)
--- a/src/tanks/thing/tank.cjs
+++ b/src/tanks/thing/tank.cjs
@@ -86,7 +86,7 @@ Thing.subclass('Tank', function(Tank){
         var ai = this.ai;
         
         // Check to see if we should obey our last decision, and not recalc
-        if ( this.forceCurrentMove && this.forceCurrentMove() && this.currentMoveLimit > NOW ) {
+        if (this.forceCurrentMove && this.forceCurrentMove() && this.currentMoveLimit > NOW) {
             this.continueMove();
             return this;
         } else
@@ -94,7 +94,7 @@ Thing.subclass('Tank', function(Tank){
         
         
         // Try to shoot down nearby bullets
-        if ( ai.shootIncoming.ready && this.ableToShoot() ) {
+        if (ai.shootIncoming.ready && this.ableToShoot()) {
             var bs = this.willCollide( this.findNearLike(25, isBullet) );
             // console.log('['+TICKS+':'+this.id, this, '] Shoot down bullets?', bs.size() && bs);
             if ( bs.size() ) {
diff --git a/www/build b/www/build
new file mode 120000 (symlink)
index 0000000..ab18017
--- /dev/null
+++ b/www/build
@@ -0,0 +1 @@
+../build
\ No newline at end of file
diff --git a/css/log.css b/www/css/log.css
similarity index 100%
rename from css/log.css
rename to www/css/log.css
diff --git a/css/lttl.css b/www/css/lttl.css
similarity index 100%
rename from css/lttl.css
rename to www/css/lttl.css
diff --git a/css/reset-old.css b/www/css/reset-old.css
similarity index 100%
rename from css/reset-old.css
rename to www/css/reset-old.css
diff --git a/css/reset.css b/www/css/reset.css
similarity index 100%
rename from css/reset.css
rename to www/css/reset.css
diff --git a/css/reset.min.css b/www/css/reset.min.css
similarity index 100%
rename from css/reset.min.css
rename to www/css/reset.min.css
diff --git a/css/test.css b/www/css/test.css
similarity index 100%
rename from css/test.css
rename to www/css/test.css
diff --git a/index.html b/www/debug.html
similarity index 67%
rename from index.html
rename to www/debug.html
index fcf29d6..49c699b 100644 (file)
--- a/index.html
+++ b/www/debug.html
@@ -1,31 +1,3 @@
-<!DOCTYPE html>
-<html>
-<head>
-<title>The Littlest Battletank</title>
-<link rel="stylesheet" href="css/reset.css" type="text/css" media="screen">
-<link rel="stylesheet" href="css/lttl.css" type="text/css" media="screen">
-</head>
-<body class="lttl tanks">
-
-
-<div id="overlay"></div>
-
-<div id="welcome" class="bigblue">
-    <div class="box">
-        <h1>The Littlest Battletank</h1>
-        
-        <h2>How To Play</h2>
-            
-        <ul id="notes">
-            <li>Move your tank with <code>wasd</code> or the arrow keys.</li>
-            <li>Use the mouse to aim; click to shoot (or press <code>spacebar</code>).</li>
-            <li>Press <code>enter</code> to pause.</li>
-        </ul>
-        
-        <h2 class="start">Click anywhere to start!</h2>
-    </div>
-</div>
-
 <div id="ai" style="display:none" class="bigblue">
     <div class="box">
         <h2>Add Tank AI</h2>
@@ -34,8 +6,6 @@
     </div>
 </div>
 
-<div id="viewport"></div>
-
 <div id="debug" style="display:none"><div class="inner box">
     
     <div id="config">
@@ -60,10 +30,3 @@
     
     <div class="clearer"></div>
 </div></div>
-
-<div id="scripts">
-<!--# include file="tags.html" -->
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/www/deps.html b/www/deps.html
new file mode 100644 (file)
index 0000000..6a71653
--- /dev/null
+++ b/www/deps.html
@@ -0,0 +1,65 @@
+<script src="build/require.js" type="text/javascript"></script>
+<script src="build/future.js" type="text/javascript"></script>
+<script src="build/functional/to-function.js" type="text/javascript"></script>
+<script src="build/Y/type.js" type="text/javascript"></script>
+<script src="build/Y/core.js" type="text/javascript"></script>
+<script src="build/Y/delegate.js" type="text/javascript"></script>
+<script src="build/Y/types/function.js" type="text/javascript"></script>
+<script src="build/Y/op.js" type="text/javascript"></script>
+<script src="build/Y/utils.js" type="text/javascript"></script>
+<script src="build/Y/class.js" type="text/javascript"></script>
+<script src="build/Y/y.js" type="text/javascript"></script>
+<script src="build/Y/types/collection.js" type="text/javascript"></script>
+<script src="build/Y/types/array.js" type="text/javascript"></script>
+<script src="build/Y/types/object.js" type="text/javascript"></script>
+<script src="build/Y/types/string.js" type="text/javascript"></script>
+<script src="build/Y/types/number.js" type="text/javascript"></script>
+<script src="build/Y.js" type="text/javascript"></script>
+<script src="build/jquery.js" type="text/javascript"></script>
+<script src="build/jquery.sparkline.min.js" type="text/javascript"></script>
+<script src="build/Y/modules/y.event.js" type="text/javascript"></script>
+<script src="build/ezl/util.js" type="text/javascript"></script>
+<script src="build/ezl/loop/fps.js" type="text/javascript"></script>
+<script src="build/ezl/math/vec.js" type="text/javascript"></script>
+<script src="build/ezl/loop/cooldown.js" type="text/javascript"></script>
+<script src="build/ezl/loop/eventloop.js" type="text/javascript"></script>
+<script src="build/ezl/loc/loc.js" type="text/javascript"></script>
+<script src="build/ezl/math/rect.js" type="text/javascript"></script>
+<script src="build/ezl/math/line.js" type="text/javascript"></script>
+<script src="build/ezl/loop.js" type="text/javascript"></script>
+<script src="build/ezl/math.js" type="text/javascript"></script>
+<script src="build/ezl/loc/boundingbox.js" type="text/javascript"></script>
+<script src="build/ezl/loc/square.js" type="text/javascript"></script>
+<script src="build/ezl/loc.js" type="text/javascript"></script>
+<script src="build/ezl/layer.js" type="text/javascript"></script>
+<script src="build/ezl/shape/shape.js" type="text/javascript"></script>
+<script src="build/ezl/shape/line.js" type="text/javascript"></script>
+<script src="build/ezl/shape/polygon.js" type="text/javascript"></script>
+<script src="build/ezl/shape/circle.js" type="text/javascript"></script>
+<script src="build/ezl/shape/rect.js" type="text/javascript"></script>
+<script src="build/ezl/shape.js" type="text/javascript"></script>
+<script src="build/ezl.js" type="text/javascript"></script>
+<script src="build/jquery.hotkeys.min.js" type="text/javascript"></script>
+<script src="build/tanks/globals.js" type="text/javascript"></script>
+<script src="build/evt.js" type="text/javascript"></script>
+<script src="build/ezl/util/binaryheap.js" type="text/javascript"></script>
+<script src="build/ezl/util/astar.js" type="text/javascript"></script>
+<script src="build/tanks/config.js" type="text/javascript"></script>
+<script src="build/Y/modules/y.kv.js" type="text/javascript"></script>
+<script src="build/ezl/util/tree/quadtree.js" type="text/javascript"></script>
+<script src="build/tanks/ui/config.js" type="text/javascript"></script>
+<script src="build/tanks/thing/thing.js" type="text/javascript"></script>
+<script src="build/tanks/map/trajectory.js" type="text/javascript"></script>
+<script src="build/tanks/map/wall.js" type="text/javascript"></script>
+<script src="build/tanks/ui/grid.js" type="text/javascript"></script>
+<script src="build/tanks/thing/bullet.js" type="text/javascript"></script>
+<script src="build/tanks/thing/tank.js" type="text/javascript"></script>
+<script src="build/tanks/map/pathmap.js" type="text/javascript"></script>
+<script src="build/tanks/thing/player.js" type="text/javascript"></script>
+<script src="build/tanks/map/level.js" type="text/javascript"></script>
+<script src="build/tanks/thing.js" type="text/javascript"></script>
+<script src="build/tanks/map.js" type="text/javascript"></script>
+<script src="build/tanks/game.js" type="text/javascript"></script>
+<script src="build/tanks/ui/main.js" type="text/javascript"></script>
+<script src="build/tanks/ui.js" type="text/javascript"></script>
+<script src="build/tanks.js" type="text/javascript"></script>
diff --git a/www/footer.html b/www/footer.html
new file mode 100644 (file)
index 0000000..11a09ca
--- /dev/null
+++ b/www/footer.html
@@ -0,0 +1,3 @@
+
+</body>
+</html>
diff --git a/www/ga.html b/www/ga.html
new file mode 100644 (file)
index 0000000..14ac0c1
--- /dev/null
+++ b/www/ga.html
@@ -0,0 +1,15 @@
+<div id="ga">
+<script type="text/javascript">
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-20115336-1']);
+  _gaq.push(['_setDomainName', 'none']);
+  _gaq.push(['_setAllowLinker', true]);
+  _gaq.push(['_trackPageview']);
+
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+</script>
+</div>
\ No newline at end of file
diff --git a/www/game.html b/www/game.html
new file mode 100644 (file)
index 0000000..30ac013
--- /dev/null
+++ b/www/game.html
@@ -0,0 +1 @@
+<div id="viewport"></div>
diff --git a/www/header.html b/www/header.html
new file mode 100644 (file)
index 0000000..5170b15
--- /dev/null
+++ b/www/header.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>The Littlest Battletank</title>
+<link rel="stylesheet" href="css/reset.css" type="text/css" media="screen">
+<link rel="stylesheet" href="css/lttl.css" type="text/css" media="screen">
+</head>
+<body class="lttl tanks">
+
+
+<div id="overlay"></div>
diff --git a/img/pathmap-bg.png b/www/img/pathmap-bg.png
new file mode 100644 (file)
index 0000000000000000000000000000000000000000..796b97ab5ff26e19f9fde7d1e96699fa5e757bfe
--- /dev/null
+++ b/www/img/pathmap-bg.png
@@ -0,0 +1,6 @@
+<!--# include file="header.html" -->
+<!--# include file="welcome.html" -->
+<!--# include file="game.html" -->
+<!--# include file="debug.html" -->
+<!--# include file="scripts.html" -->
+<!--# include file="footer.html" -->
diff --git a/www/index.html b/www/index.html
new file mode 100644 (file)
index 0000000000000000000000000000000000000000..1c125f0af25134a56eb3eb546527530325c8a104
--- /dev/null
+++ b/www/index.html
@@ -0,0 +1,23 @@
+<?php
+    include 'header.html';
+    include 'welcome.html';
+    include 'game.html';
+    include 'debug.html';
+?>
+
+<div id="scripts">
+<?php
+    $PYTHONPATH = "PYTHONPATH='/Users/dsc/.python/lib/python:/usr/local/lib/python2.7/site-packages:/usr/local/lib/python2.6/site-packages'";
+    
+    error_reporting(E_ALL);
+    echo "<!--\n";
+    echo shell_exec("cd .. && $PYTHONPATH commonjs src/{Y,ezl,tanks} 2>&1");
+    echo "\n-->\n";
+    
+    include "deps.html";
+?>
+</div>
+
+<?php
+    include 'footer.html';
+?>
diff --git a/www/index.php b/www/index.php
new file mode 100644 (file)
index 0000000000000000000000000000000000000000..9eafdffc8648d5b436e72d1fde3c4424d173165d
--- /dev/null
+++ b/www/index.php
@@ -0,0 +1,4 @@
+<div id="scripts">
+<!--# include file="deps.html" -->
+<!--# include file="ga.html" -->
+</div>
diff --git a/www/scripts.html b/www/scripts.html
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..419df4f96d452b4b9e7f0bde2e97aa928099eb95
--- /dev/null
+++ b/www/scripts.html
@@ -0,0 +1 @@
+../test
\ No newline at end of file
diff --git a/www/test b/www/test
new file mode 100644 (file)
index 0000000000000000000000000000000000000000..7c07c349287a0e25768379d69c8824f536db5ab8
--- /dev/null
+++ b/www/test
@@ -0,0 +1,15 @@
+<div id="welcome" class="bigblue">
+    <div class="box">
+        <h1>The Littlest Battletank</h1>
+        
+        <h2>How To Play</h2>
+            
+        <ul id="notes">
+            <li>Move your tank with <code>wasd</code> or the arrow keys.</li>
+            <li>Use the mouse to aim; click to shoot (or press <code>spacebar</code>).</li>
+            <li>Press <code>enter</code> to pause.</li>
+        </ul>
+        
+        <h2 class="start">Click anywhere to start!</h2>
+    </div>
+</div>
diff --cc www/welcome.html
Simple merge
the Littlest Battletank web app