Skip to content

Commit b602787

Browse files
michaljazmichaljaz
committed
delete broken blur
1 parent 77d5684 commit b602787

6 files changed

Lines changed: 57 additions & 77 deletions

File tree

‎coffee/client/module/FirstPersonControls.coffee‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,15 +107,12 @@ class FirstPersonControls
107107
else
108108
$(".chat").removeClass("focus")
109109
$(".chat").addClass("blur")
110-
if @gameState isnt "menu"
111-
$(".winbl").removeClass("blur")
112110
console.log "Game state: "+state
113111
_Game:()->
114112
@state "game"
115113
@canvas.requestPointerLock()
116114
_Menu:()->
117115
@state "menu"
118-
$(".winbl").addClass("blur")
119116
$(".gameMenu").css "display", "block"
120117
document.exitPointerLock = document.exitPointerLock or document.mozExitPointerLock
121118
document.exitPointerLock();

‎package-lock.json‎

Lines changed: 9 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
"html-webpack-plugin": "^4.5.0",
3535
"raw-loader": "^4.0.2",
3636
"uglifyjs-webpack-plugin": "^2.2.0",
37-
"webpack": "^5.4.0",
37+
"webpack": "^5.5.0",
3838
"webpack-cli": "^4.2.0",
3939
"webpack-node-externals": "^2.5.2"
4040
}

‎src/client/css/style.css‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -204,14 +204,3 @@ canvas {
204204
right:calc(50vw - 245px);
205205
display:block;
206206
}
207-
.winbl{
208-
z-index:13;
209-
position:fixed;
210-
top:0px;
211-
left:0px;
212-
width:100%;
213-
height:100%;
214-
}
215-
.winbl.blur{
216-
background:rgba(0,0,0,0.5);
217-
}

‎src/client/index.html‎

Lines changed: 47 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -107,55 +107,53 @@ <h1 class="loadingText">Ładowanie zasobów...</h1>
107107
</div>
108108

109109
<!-- GAME MENU -->
110-
<div class="winbl blur">
111-
<div class="gameMenu">
112-
<div class="row">
113-
114-
<!-- FIRST COLUMN -->
115-
<div class="col-4 pl-5 pt-4">
116-
Web-minecraft v.1.0<br>
117-
Wykonanie: michaljaz
118-
</div>
119-
120-
<!--SECOND COLUMN -->
121-
<div class="col-4 text-center p-3">
122-
<h3>Gra zatrzymana</h3>
123-
<button class="gameOn btn btn-dark w-100">
124-
Graj
125-
</button>
126-
</div>
127-
128-
<!-- THIRD COLUMN -->
129-
<div class="col-4 p-3">
130-
Kontrolki
131-
<li>
132-
<button>W</button> do przodu
133-
</li>
134-
<li>
135-
<button>S</button> do tyłu
136-
</li>
137-
<li>
138-
<button>A</button> w lewo
139-
</li>
140-
<li>
141-
<button>D</button> w prawo
142-
</li>
143-
<li>
144-
<button>R</button> sprint
145-
</li>
146-
<li>
147-
<button>Spacja</button> skakanie
148-
</li>
149-
<li>
150-
<button>Shift</button> skradanie się
151-
</li>
152-
<li>
153-
<button>`</button> odpowiednik Escape
154-
</li>
155-
<li>
156-
<button>/</button> <button>T</button> czat
157-
</li>
158-
</div>
110+
<div class="gameMenu">
111+
<div class="row">
112+
113+
<!-- FIRST COLUMN -->
114+
<div class="col-4 pl-5 pt-4">
115+
Web-minecraft v.1.0<br>
116+
Wykonanie: michaljaz
117+
</div>
118+
119+
<!--SECOND COLUMN -->
120+
<div class="col-4 text-center p-3">
121+
<h3>Gra zatrzymana</h3>
122+
<button class="gameOn btn btn-dark w-100">
123+
Graj
124+
</button>
125+
</div>
126+
127+
<!-- THIRD COLUMN -->
128+
<div class="col-4 p-3">
129+
Kontrolki
130+
<li>
131+
<button>W</button> do przodu
132+
</li>
133+
<li>
134+
<button>S</button> do tyłu
135+
</li>
136+
<li>
137+
<button>A</button> w lewo
138+
</li>
139+
<li>
140+
<button>D</button> w prawo
141+
</li>
142+
<li>
143+
<button>R</button> sprint
144+
</li>
145+
<li>
146+
<button>Spacja</button> skakanie
147+
</li>
148+
<li>
149+
<button>Shift</button> skradanie się
150+
</li>
151+
<li>
152+
<button>`</button> odpowiednik Escape
153+
</li>
154+
<li>
155+
<button>/</button> <button>T</button> czat
156+
</li>
159157
</div>
160158
</div>
161159
</div>

‎src/client/module/FirstPersonControls.js‎

Lines changed: 0 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)