Skip to content

Commit

Permalink
integrations for good lookeryness
Browse files Browse the repository at this point in the history
  • Loading branch information
omgimanerd committed Apr 3, 2016
1 parent e95fad5 commit dc96f76
Show file tree
Hide file tree
Showing 21 changed files with 725 additions and 194 deletions.
4 changes: 3 additions & 1 deletion bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
"tests"
],
"dependencies": {
"jquery": "~2.2.1"
"jquery": "~2.2.1",
"modernizr": "^3.3.1",
"bootstrap": "^3.3.6"
}
}
6 changes: 3 additions & 3 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ gulp.task('js-compile', function() {
});

gulp.task('less', function() {
return gulp.src('./public/less/index.less')
return gulp.src('./public/styles/index.less')
.pipe(plumber())
.pipe(getLessConfiguration())
.pipe(rename('index.min.css'))
Expand All @@ -90,13 +90,13 @@ gulp.task('watch-js', function() {
});

gulp.task('watch-less', function() {
gulp.watch('./public/less/*.less', ['less']);
gulp.watch('./public/styles/*.less', ['less']);
});

gulp.task('watch', function() {
gulp.watch(['./extern/*.js',
'./lib/**/*.js',
'./public/js/**/*.js',
'./shared/*.js' ], ['js-compile']);
gulp.watch('./public/less/*.less', ['less']);
gulp.watch('./public/styles/*.less', ['less']);
});
8 changes: 2 additions & 6 deletions lib/Map.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,20 +15,16 @@ function Map() {
throw new Error('Map should not be instantiated!');
}

Map.MAP = [
[0, 0, 2500, 20],
];

Map.generateMap = function() {
var map = [
[0, 0, 2500, 20]
];
var padding = 0;
for (var y = 75; y < Constants.WORLD_MAX - 200; y += 75) {
var x = Constants.WORLD_MIN + padding;
var x = Constants.WORLD_MIN + padding + Util.randRange(175, 400);
while (x < Constants.WORLD_MAX - padding) {
map.push([x, y, 100, 20]);
x += Util.randRange(175, 400);
x += Util.randRange(350, 550);
}
padding += 75;
}
Expand Down
1 change: 0 additions & 1 deletion public/js/game/Game.js
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@ Game.prototype.stopAnimation = function() {
Game.prototype.receiveGameState = function(state) {
this.self = state['self'];
this.players = state['players'];
console.log(this.platforms);
this.projectiles = state['projectiles'];
this.platforms = state['platforms'];
x = this.platforms;
Expand Down
Loading

0 comments on commit dc96f76

Please sign in to comment.