noby
/
workadventure
2
2
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into develop

This commit is contained in:
Gregoire Parant 2021-04-19 21:19:35 +02:00
parent 06f6b3153c d44e449e92
commit 5e8951fdaa
4 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
front/dist/resources/style/style.css vendored
View File

@ -806,7 +806,7 @@ input[type=range]:focus::-ms-fill-upper {
right: 0; right: 0;
} }
.main-container .audio-playing img{ .main-container .audio-playing img{
width: 30px; /*width: 30px;*/
border-radius: 50%; border-radius: 50%;
background-color: #ffda01; background-color: #ffda01;
padding: 10px; padding: 10px;
@ -814,6 +814,7 @@ input[type=range]:focus::-ms-fill-upper {
.main-container .audio-playing p{ .main-container .audio-playing p{
color: white; color: white;
margin-left: 10px; margin-left: 10px;
margin-top: 14px;
} }
/* VIDEO QUALITY */ /* VIDEO QUALITY */

1
front/src/Connexion/AdminMessagesService.ts
View File

@ -5,6 +5,7 @@ export enum AdminMessageEventTypes {
admin = 'message', admin = 'message',
audio = 'audio', audio = 'audio',
ban = 'ban', ban = 'ban',
banned = 'banned',
} }
interface AdminMessageEvent { interface AdminMessageEvent {

2
front/src/Connexion/RoomConnection.ts
View File

@ -188,7 +188,7 @@ export class RoomConnection implements RoomConnection {
} else if (message.hasSendusermessage()) { } else if (message.hasSendusermessage()) {
adminMessagesService.onSendusermessage(message.getSendusermessage() as SendUserMessage); adminMessagesService.onSendusermessage(message.getSendusermessage() as SendUserMessage);
} else if (message.hasBanusermessage()) { } else if (message.hasBanusermessage()) {
adminMessagesService.onSendusermessage(message.getSendusermessage() as BanUserMessage); adminMessagesService.onSendusermessage(message.getBanusermessage() as BanUserMessage);
} else if (message.hasWorldfullwarningmessage()) { } else if (message.hasWorldfullwarningmessage()) {
worldFullWarningStream.onMessage(); worldFullWarningStream.onMessage();
} else if (message.hasRefreshroommessage()) { } else if (message.hasRefreshroommessage()) {

2
front/src/index.ts
View File

@ -34,7 +34,7 @@ const fps : Phaser.Types.Core.FPSConfig = {
/** /**
* Use setTimeout instead of requestAnimationFrame to run the game loop. * Use setTimeout instead of requestAnimationFrame to run the game loop.
*/ */
forceSetTimeOut: true, forceSetTimeOut: false,
/** /**
* Calculate the average frame delta from this many consecutive frame intervals. * Calculate the average frame delta from this many consecutive frame intervals.
*/ */