Permalink
Browse files

merged

  • Loading branch information...
2 parents b7207fe + 29ac8f7 commit 988466031b42049222c0eb0a58098b98a0d349f7 @deets deets committed Apr 3, 2011
Showing with 324 additions and 313 deletions.
  1. BIN stn/__init__.pyc
  2. +3 −2 stn/static/game.html
  3. +1 −1 stn/static/iphone3.html
  4. +183 −177 stn/static/js/game.js
  5. +33 −33 stn/static/js/news_item.js
  6. +18 −14 stn/static/js/rect.js
  7. +86 −86 stn/static/js/sorting.js
View
Binary file not shown.
View
@@ -32,12 +32,13 @@
</head>
<body>
<h1>Save the news</h1>
- <canvas id="arena" width="960" height="480"></canvas>
+ <!--canvas id="arena" width="960" height="480"></canvas-->
+ <canvas id="arena" width="480" height="320"></canvas>
<script type="text/javascript">
$(function() {
var canvas = $("#arena").get(0);
- window.game = new LoadScreen(canvas, 30.0, .5); //new StartScreen(canvas, 30.0);
+ window.game = new LoadScreen(canvas, 30.0, canvas.width / 960.0); //new StartScreen(canvas, 30.0);
window.game.debug = true;
window.game.start();
function mousedown(event) {
View
@@ -36,7 +36,7 @@
<script type="text/javascript">
$(function() {
var canvas = $("#arena").get(0);
- window.game = new LoadScreen(canvas, 30.0, 480.0 / 960.0); //new StartScreen(canvas, 30.0);
+ window.game = new LoadScreen(canvas, 30.0, 480.0 / 960.0);
window.game.debug = true;
window.game.start();
function mousedown(event) {
Oops, something went wrong.

0 comments on commit 9884660

Please sign in to comment.