Merge branch 'master' into develop
This commit is contained in:
commit
5e8951fdaa
3
front/dist/resources/style/style.css
vendored
3
front/dist/resources/style/style.css
vendored
@ -806,7 +806,7 @@ input[type=range]:focus::-ms-fill-upper {
|
||||
right: 0;
|
||||
}
|
||||
.main-container .audio-playing img{
|
||||
width: 30px;
|
||||
/*width: 30px;*/
|
||||
border-radius: 50%;
|
||||
background-color: #ffda01;
|
||||
padding: 10px;
|
||||
@ -814,6 +814,7 @@ input[type=range]:focus::-ms-fill-upper {
|
||||
.main-container .audio-playing p{
|
||||
color: white;
|
||||
margin-left: 10px;
|
||||
margin-top: 14px;
|
||||
}
|
||||
|
||||
/* VIDEO QUALITY */
|
||||
|
@ -5,6 +5,7 @@ export enum AdminMessageEventTypes {
|
||||
admin = 'message',
|
||||
audio = 'audio',
|
||||
ban = 'ban',
|
||||
banned = 'banned',
|
||||
}
|
||||
|
||||
interface AdminMessageEvent {
|
||||
|
@ -188,7 +188,7 @@ export class RoomConnection implements RoomConnection {
|
||||
} else if (message.hasSendusermessage()) {
|
||||
adminMessagesService.onSendusermessage(message.getSendusermessage() as SendUserMessage);
|
||||
} else if (message.hasBanusermessage()) {
|
||||
adminMessagesService.onSendusermessage(message.getSendusermessage() as BanUserMessage);
|
||||
adminMessagesService.onSendusermessage(message.getBanusermessage() as BanUserMessage);
|
||||
} else if (message.hasWorldfullwarningmessage()) {
|
||||
worldFullWarningStream.onMessage();
|
||||
} else if (message.hasRefreshroommessage()) {
|
||||
|
@ -34,7 +34,7 @@ const fps : Phaser.Types.Core.FPSConfig = {
|
||||
/**
|
||||
* 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.
|
||||
*/
|
||||
|
Loading…
Reference in New Issue
Block a user