thirdpartymirrors/sm64coopdx
1
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2026-05-09 18:31:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fixed merge conflict

Browse source
This commit is contained in:
iZePlayz 2025-11-21 00:55:18 +01:00
parent 9b412540d1
commit e729e13cdf
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lang/Spanish.ini
View file

@ -57,7 +57,7 @@ PERM_BAN_DESC = "/permban [NAME|ID] - Banea al jugador de todas tus partidas."
MOD_DESC = "/moderator [NAME|ID] - Permite a un jugador usar comandos como /kick, /ban o /permban de cualquier partida que crees."
NAMETAGS_DESC = "/nametags [show-tag|show-health] - Cambia si ves tu propia etiqueta y si ves la salud"
UNRECOGNIZED = "Comando desconocido."
MOD_GRANTED = "\\#fff982\\Ahora eres un moderador."
MOD_GRANTED = "\\#fff982\\Ahora eres moderador."
ALL_COMMANDS = "Todos los comandos"
TAB_COMPLETE_INFO = "Pulsa TAB para autocompletar comandos, usa Shift+TAB para retroceder"

8
src/pc/djui/djui_interactable.c
View file

@ -211,7 +211,13 @@ bool djui_interactable_on_key_down(int scancode) {
}
}
if (gDjuiChatBox != NULL) {
if (scancode == SCANCODE_ESCAPE && djui_panel_is_active()) {
// pressed escape button on keyboard
djui_panel_back();
return true;
}
if (gDjuiChatBox != NULL && !gDjuiChatBoxFocus) {
bool pressChat = false;
bool pressChatCommand = false;
for (int i = 0; i < MAX_BINDS; i++) {