mirror of https://github.com/sundowndev/Detank.git
270 SEVRAN
parent
9eae7baf84
commit
06b61e58d2
|
@ -66,6 +66,8 @@ body{
|
|||
padding-top: 150px;
|
||||
background: rgba(155, 0, 0, 0.85);
|
||||
box-shadow: inset 0px 0px 60px 0px rgba(0,0,0,0.75);
|
||||
display: none;
|
||||
z-index: 4;
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -113,7 +113,6 @@ function move(event) {
|
|||
}
|
||||
}
|
||||
|
||||
<<<<<<< Updated upstream
|
||||
setInterval(function(){
|
||||
console.log('test');
|
||||
if(bulletX == 0 || bulletY == 0){
|
||||
|
@ -192,9 +191,6 @@ setInterval(function(){
|
|||
grid.style.background = 'url(./assets/img/bg_bullet.png) no-repeat';
|
||||
grid.style.backgroundPosition = bulletDir;
|
||||
}, 32.12);
|
||||
=======
|
||||
document.addEventListener('keydown', move, false);
|
||||
>>>>>>> Stashed changes
|
||||
|
||||
var ntm = setInterval(function(){
|
||||
x2 = Math.floor(Math.random() * 11);
|
||||
|
@ -225,8 +221,3 @@ var ntm = setInterval(function(){
|
|||
|
||||
document.addEventListener('keydown', move, false);
|
||||
setPosition(x, y, direction);
|
||||
=======
|
||||
|
||||
|
||||
}, 3000);
|
||||
>>>>>>> Stashed changes
|
||||
|
|
Loading…
Reference in New Issue