improve: https/http login

.github/PULL_REQUEST_TEMPLATE.md

@@ -3,7 +3,8 @@
 
 Please include a summary of the change and which issue is fixed. Please also include relevant motivation and context. List any dependencies that are required for this change.
 
-## Behaviour
+## Behavior
+
 ### **Actual**
 
 Do this and that doesn't happens

.github/workflows/build-windows.yml

@@ -68,7 +68,7 @@ jobs:
           name: otclient-${{ matrix.buildtype }}-${{ github.sha }}
           path: |
             ${{ github.workspace }}/otclient.exe
-            
+
       - name: Create and Upload Artifact (dlls)
         uses: actions/upload-artifact@main
         with:

Dockerfile

@@ -5,7 +5,7 @@ RUN export DEBIAN_FRONTEND=noninteractive \
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
 	git cmake curl zip unzip tar automake ca-certificates build-essential \
-	libglew-dev libx11-dev autoconf libtool pkg-config tzdata \
+	libglew-dev libx11-dev autoconf libtool pkg-config tzdata libssl3 \
 	&& dpkg-reconfigure --frontend noninteractive tzdata \
 	&& apt-get clean && apt-get autoclean
 

data/locales/pt.lua

@@ -9,16 +9,17 @@ locale = {
 
   -- As tradu��es devem vir sempre em ordem alfab�tica.
   translation = {
+    ["(ERROR %d)"] = "(ERRO %d)",
     ["%d of experience per hour"] = "%d de experi�ncia por hora",
     ["%s has finished the request"] = "%s finalizou o pedido",
     ["%s has logged in."] = "%s entrou.",
     ["%s has logged out."] = "%s saiu.",
     ["%s of experience left"] = "%s de experi�ncia faltando",
+    ["%s of experience per hour"] = "%s experi�ncia por hora",
     ["%s: (use object on target)"] = "%s: (usar objeto no alvo)",
     ["%s: (use object on yourself)"] = "%s: (usar objeto em si)",
     ["%s: (use object with crosshair)"] = "%s: (usar objeto com mira)",
     ["%s: (use object)"] = "%s: (usar objeto)",
-    ["(ERROR %d)"] = "(ERRO %d)",
     ["1a) Offensive Name"] = "1a) Nome ofensivo",
     ["1b) Invalid Name Format"] = "1b) Nome com formato inv�lido",
     ["1c) Unsuitable Name"] = "1c) Nome n�o adequado",
@@ -94,6 +95,7 @@ locale = {
     ["Channel appended to %s"] = "Canais acrescentados a %s",
     ["Channels"] = "Canais",
     ["Character List"] = "Lista de personagens",
+    ["Character"] = "Personagem",
     ["Classic control"] = "Controle cl�ssico",
     ["Clear current message window"] = "Apagar mensagens",
     ["Clear Messages"] = "Limpar mensagens",
@@ -107,6 +109,7 @@ locale = {
     ["Comment"] = "Coment�rio",
     ["Connecting to game server..."] = "Conectando no servidor do jogo...",
     ["Connecting to login server..."] = "Conectando no servidor de autentica��o...",
+    ["Connecting to login server...\nServer: [%s]"] = "Conectando no servidor de autentica��o...\nServidor: [%s]",
     ["Connection Error"] = "Erro de Conex�o",
     ["Connection failed the server address does not exist."] = "Conex�o falhou, servidor n�o existe.",
     ["Connection failed, the server address does not exist."] = false,
@@ -139,7 +142,6 @@ locale = {
     ["Details"] = "Detalhes",
     ["Disable chat mode allow to walk using WASD"] = "Desativar modo de chat permite andar usando WASD",
     ["Disable chat mode, allow to walk using WASD"] = false,
-    ["Disable chat mode, allow to walk using WASD"] = false,
     ["Disable Shared Experience"] = "Desativar experi�ncia compartilhada",
     ["Dismount"] = "Desmontar",
     ["Display connection speed to the server (milliseconds)"] = "Exibir a velocidade de conex�o com o servidor (milisegundos)",
@@ -154,14 +156,15 @@ locale = {
     ["Draw Viewport Edge"] = "Desenhar borda da janela de visualiza��o",
     ["Druid"] = "Druid",
     ["Edit %s"] = "Editar %s",
-    ["Edit hotkey text"] = false,
     ["Edit hotkey text:"] = "Editar texto do atalho",
+    ["Edit hotkey text"] = false,
     ["Edit List"] = "Editar lista",
     ["Edit Text"] = "Editar Texto",
     ["Edit VIP list entry"] = false,
     ["Enable audio"] = "Ativar �udio",
     ["Enable chat mode"] = false,
     ["Enable dash walking"] = "Ativar andar r�pido",
+    ["Enable HTTP login"] = "Ativar login HTTP",
     ["Enable lights"] = "Ativar luzes",
     ["Enable music sound"] = "Ativar m�sica",
     ["Enable music"] = "Ativar musica",
@@ -218,6 +221,7 @@ locale = {
     ["Hotkey delay: %dms"] = false,
     ["Hotkey delay: %sms"] = false,
     ["Hotkeys"] = "Atalhos",
+    ["If login fails using HTTPS (encrypted) try with HTTP (unencrypted)"] = "Se o login falhar utilizando HTTPS(criptografado) tente com HTTP(sem criptografia)",
     ["If you shut down the program, your character might stay in the game.\nClick on 'Logout' to ensure that you character leaves the game properly.\nClick on 'Exit' if you want to exit the program without logging out your character."] = "Se voc� desligar o programa o seu personagem pode continuar no jogo.\nClique em 'Sair' para assegurar que seu personagem saia do jogo adequadamente.\nClique em 'For�ar Saida' para fechar o programa sem desconectar seu personagem.",
     ["Ignore capacity"] = "Ignorar capacidade",
     ["Ignore equipped"] = "Ignorar equipado",
@@ -226,8 +230,8 @@ locale = {
     ["Ignore Private Messages"] = "Ignorar mensagens privadas",
     ["Ignore Yelling"] = "Ignorar gritos",
     ["Ignore"] = "Ignorar",
-    ["Ignored Players"] = false,
     ["Ignored players:"] = "Joadores ignorados:",
+    ["Ignored Players"] = false,
     ["Interface framerate limit: %s"] = "Limite da taxa de quadros da interface: %s",
     ["Invalid authentification token."] = false,
     ["Inventory"] = "Invent�rio",
@@ -287,15 +291,16 @@ locale = {
     ["No"] = "N�o",
     ["Notation"] = "Nota��o",
     ["Notify-Login"] = false,
+    ["Now you will gain 50%% more experience"] = "Agora voc� ganhar� 50%% mais experi�ncia",
     ["NPC Trade"] = "Troca com NPC",
     ["Offer History"] = "Hist�rico de ofertas",
     ["Offer Type"] = "Tipo de oferta",
     ["Offers"] = "Ofertas",
     ["Offline Training"] = "Treino Offline",
     ["Ok"] = "Ok",
     ["on %s.\n"] = "em %s.\n",
-    ["Open a private message channel"] = false,
     ["Open a private message channel:"] = "Abrir um canal privado:",
+    ["Open a private message channel"] = false,
     ["Open charlist automatically when starting client"] = "Abrir lista de personagens ao iniciar o cliente",
     ["Open in new window"] = "Abrir em nova janela",
     ["Open new channel"] = "Abrir novo canal",
@@ -317,8 +322,8 @@ locale = {
     ["Please wait"] = "Por favor, espere",
     ["Please, press the key you wish to add onto your hotkeys manager"] = "Por favor, pressione a tecla que voc� deseja\nadicionar no gerenciador de atalhos",
     ["Port"] = "Porta",
-    ["Position"] = "Posi��o",
     ["Position: %i %i %i"] = "Posi��o: %i %i %i",
+    ["Position"] = "Posi��o",
     ["Premium Account (%s) days left"] = "Conta Premium (%s) dias faltando",
     ["Premium"] = "Premium",
     ["Price"] = "Pre�o",
@@ -358,6 +363,7 @@ locale = {
     ["Search"] = "Procurar",
     ["Secondary"] = "Secund�rio",
     ["Select all"] = false,
+    ["Select monster"] = "Selecione o monstro",
     ["Select object"] = "Selecionar objeto",
     ["Select Outfit"] = "Selecionar Roupa",
     ["Select your language"] = "Selecione sua l�ngua",
@@ -370,9 +376,10 @@ locale = {
     ["Send automatically"] = "Enviar automaticamente",
     ["Send Message"] = "Enviar Mensagem",
     ["Send"] = "Enviar",
-    ["Server List"] = "Lista de Servidores",
     ["Server list"] = "Lista de servidores",
+    ["Server List"] = "Lista de Servidores",
     ["Server Log"] = "Registro do servidor",
+    ["Server: %s"] = "Servidor: %s",
     ["Server"] = "Servidor",
     ["Set Outfit"] = "Escolher Roupa",
     ["Shielding"] = "Defesa",
@@ -410,6 +417,7 @@ locale = {
     ["Statement Report"] = "Afirmar Relato",
     ["Statement"] = "Afirma��o",
     ["Statistics"] = "Estat�sticas",
+    ["Status"] = "Condi��o",
     ["Stay logged during session"] = false,
     ["Stop Attack"] = "Parar de Atacar",
     ["Stop Follow"] = "Parar de Seguir",
@@ -451,13 +459,14 @@ locale = {
     ["Will boost your walk on high speed characters"] = "Ir� melhorar o andar de persnagens r�pidos",
     ["Will detect when to use diagonal step based on the\nkeys you are pressing"] = "Detectar quando usar o passo diagonal\nbaseado nas teclas pressionadas",
     ["With crosshair"] = "Com mira",
+    ["World"] = "Mundo",
     ["Yes"] = "Sim",
     ["You are bleeding"] = "Voc� est� sangrando",
     ["You are burning"] = "Voc� est� queimando",
     ["You are cursed"] = "Voc� est� amaldi�oado",
     ["You are dazzled"] = "Voc� est� deslumbrado",
-    ["You are dead"] = "Voc� est� morto",
     ["You are dead."] = "Voc� est� morto.",
+    ["You are dead"] = "Voc� est� morto",
     ["You are drowning"] = "Voc� est� se afogando",
     ["You are drunk"] = "Voc� est� b�bado",
     ["You are electrified"] = "Voc� est� eletrificado",
@@ -470,7 +479,9 @@ locale = {
     ["You are strengthened"] = "Voc� est� refor�ado",
     ["You are within a protection zone"] = "Voc� est� dentro de uma zona de prote��o",
     ["You can enter new text."] = "Voc� pode entrar com um novo texto.",
+    ["You don't may receive experience and loot from monsters"] = "Voc� talvez n�o possa receber experiencia e loot dos monstros",
     ["You have %d%% to advance to level %d."] = "Voc� tem %d%% para avan�ar para o n�vel %d.",
+    ["You have %s hours and %s minutes left"] = "Voc� tem %s horas e %s minutos restando",
     ["You have %s percent to go"] = "Voc� tem %s porcento para avan�ar",
     ["You have %s percent"] = "Voc� tem %s porcento",
     ["You may not logout during a fight"] = "Voc� n�o pode sair durante um combate",
@@ -482,6 +493,7 @@ locale = {
     ["You must select an action."] = false,
     ["You read the following, written by \n%s\n"] = "Voc� l� o seguinte, escrito por \n%s\n",
     ["You read the following, written on \n%s.\n"] = "Voc� l� o seguinte, escrito em \n%s.\n",
+    ["You will not gain 50%% more experience because you aren't premium player, now you receive only 1x experience points"] = "Voc� n�o ganhar� 50%% mais experiencia pois voc� n�o � premium, agora voc� receber� apenas 1x pontos de experi�ncia",
     ["Your Capacity"] = "Sua capacidade",
     ["Your character health is %d out of %d."] = "A vida do seu personagem � %d de %d.",
     ["Your character mana is %d out of %d."] = "A mana do seu personagem � %d de %d.",

modules/client_entergame/characterlist.otui

@@ -96,7 +96,7 @@ CharacterWidget < UIWidget
     color: #bbbbbb
     anchors.top: parent.top
     anchors.left: parent.left
-    margin-left: 300
+    margin-left: 350
     font: verdana-11px-monochrome
     text-auto-resize: true
     background-color: alpha
@@ -114,7 +114,7 @@ CharacterWidget < UIWidget
     color: #bbbbbb
     anchors.top: parent.top
     anchors.left: parent.left
-    margin-left: 350
+    margin-left: 410
     font: verdana-11px-monochrome
     text-auto-resize: true
     background-color: alpha
@@ -199,7 +199,7 @@ MainWindow
       end
 
   FlatLabel
-    width: 50
+    width: 100
     anchors.left: parent.left
     anchors.top: characters.top
     margin-left: 250
@@ -210,10 +210,10 @@ MainWindow
       end
 
   FlatLabel
-    width: 50
+    width: 60
     anchors.left: parent.left
     anchors.top: characters.top
-    margin-left: 300
+    margin-left: 350
     !text: tr('Level') .. ''
     @onSetup: |
       if not(g_game.getFeature(GameEnterGameShowAppearance)) then
@@ -224,17 +224,18 @@ MainWindow
     width: 150
     anchors.left: parent.left
     anchors.top: characters.top
-    margin-left: 350
+    margin-left: 410
     !text: tr('Vocation') .. ''
     @onSetup: |
       if not(g_game.getFeature(GameEnterGameShowAppearance)) then
         self:hide()
       end
 
   FlatLabel
-    width: 201
+    width: 200
     anchors.right: characters.right
     anchors.top: characters.top
+    margin-left: 550
     !text: tr('World') .. ''
     @onSetup: |
       if not(g_game.getFeature(GameEnterGameShowAppearance)) then
@@ -264,7 +265,7 @@ MainWindow
     anchors.left: parent.left
     anchors.top: parent.top
     anchors.bottom: prev.bottom
-    margin-left: 299
+    margin-left: 349
     @onSetup: |
       if not(g_game.getFeature(GameEnterGameShowAppearance)) then
         self:hide()
@@ -274,7 +275,7 @@ MainWindow
     anchors.left: parent.left
     anchors.top: parent.top
     anchors.bottom: prev.bottom
-    margin-left: 349
+    margin-left: 409
     @onSetup: |
       if not(g_game.getFeature(GameEnterGameShowAppearance)) then
         self:hide()
@@ -284,7 +285,7 @@ MainWindow
     anchors.left: parent.left
     anchors.top: parent.top
     anchors.bottom: prev.bottom
-    margin-left: 499
+    margin-left: 500
     @onSetup: |
       if not(g_game.getFeature(GameEnterGameShowAppearance)) then
         self:hide()