Kraut.World/server
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into develop

Browse source 
# Conflicts:
#	front/src/Connexion/RoomConnection.ts
#	front/src/Phaser/Menu/ReportMenu.ts
This commit is contained in:
Gregoire Parant 2021-03-11 02:22:05 +01:00
commit 2fcb8a76b1
8 changed files with 100 additions and 93 deletions
Download patch file Download diff file Expand all files Collapse all files

3
messages/protos/messages.proto
View file

@ -350,6 +350,7 @@ message AdminMessage {
string message = 1;
string recipientUuid = 2;
string roomId = 3;
string type = 4;
}
// A message sent by an administrator to everyone in a specific room
@ -366,6 +367,8 @@ message AdminGlobalMessage {
message BanMessage {
string recipientUuid = 1;
string roomId = 2;
string type = 3;
string message = 4;
}
message EmptyMessage {