tom/METH_Transcendence
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Site :

Browse Source 
- Fix icon invit game
    - Fix bug history
    - Add scroll history (maybe)
    - Fix cross notification to real cross
This commit is contained in:
Mathis Degryck
2024-09-30 19:16:36 +02:00
parent c8052db9a5
commit 33957b5ffe
8 changed files with 28 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
docker-compose/requirements/nginx/static/javascript/multiOnlineGame/Ball.js
View File

@ -3,10 +3,10 @@
/* ::: :::::::: */
/* Ball.js :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: hubourge <hubourge@student.42.fr> +#+ +:+ +#+ */
/* By: madegryc <madegryc@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/08/20 17:02:47 by edbernar #+# #+# */
/* Updated: 2024/09/30 16:06:58 by hubourge ### ########.fr */
/* Updated: 2024/09/30 19:17:05 by madegryc ### ########.fr */
/* */
/* ************************************************************************** */
@ -30,6 +30,13 @@ class Ball
this.limits = map.playerLimits;
this.resetPosBall();
scene.add(this.object);
// this.world = new CANNON.World();
// this.ballBody = new CANNON.Body({
// shape: new CANNON.Sphere(0.15),
// mass: 10,
// });
// this.ballBody.position.copy(this.object.position);
// this.world.addBody(this.ballBody);
}
#createBall()

12
docker-compose/requirements/nginx/static/javascript/notification/main.js
View File

@ -3,10 +3,10 @@
/* ::: :::::::: */
/* main.js :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: edbernar <edbernar@student.42angouleme. +#+ +:+ +#+ */
/* By: madegryc <madegryc@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/08/04 23:32:52 by edbernar #+# #+# */
/* Updated: 2024/09/28 00:38:44 by edbernar ### ########.fr */
/* Updated: 2024/09/30 19:07:35 by madegryc ### ########.fr */
/* */
/* ************************************************************************** */
@ -15,7 +15,7 @@ function createHeader(title, img)
const divHeader = document.createElement("div");
const icon = document.createElement("img");
const h1Title = document.createElement("h1");
const cross = document.createElement("p");
const cross = document.createElement("span");
const titleTextNode = document.createTextNode(title);
divHeader.classList.add("header");
@ -30,14 +30,12 @@ function createHeader(title, img)
h1Title.style.textAlign = "center";
h1Title.style.width = "100%";
h1Title.style.marginTop = "5px";
cross.innerHTML = "X";
cross.innerHTML = "&times";
cross.style.position = 'absolute';
cross.style.cursor = 'pointer';
cross.style.margin = '0';
cross.style.right = '10px';
cross.style.marginTop = '5px';
cross.style.fontSize = '20px';
cross.style.fontWeight = 'bold';
cross.style.fontSize = '25px';
cross.addEventListener("click", () => {
divHeader.parentNode.style.animation = "slideOut 0.21s";
setTimeout(() => {