edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-12 19:18:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of git://github.com/matricks/teeworlds

Browse source
This commit is contained in:
Fujnky 2010-06-02 21:47:47 +02:00
parent 0d4c0ccef5 7a1953e60b
commit 64ddee0a21
3 changed files with 24 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
data/languages/portuguese.txt
View file

@ -113,7 +113,7 @@ Fire
== Atirar
Force vote
== Forçar votação
== Forçar
Fullscreen
== Tela cheia
@ -167,13 +167,13 @@ Internet
== Internet
Join blue
== Entre no az.
== Azul
Join game
== Entre no jogo
Join red
== Entre no verm.
== Vermelho
Jump
== Pular
@ -218,7 +218,7 @@ Movement
== Movimento
Mute when not active
== Silenciar quando não ativo
== Silenciar quando inativo
Name
== Nome
@ -260,13 +260,13 @@ Pistol
== Pistola
Play
== Jogar
== Assistir
Player
== Jogador
Players
== Jogador
== Jogadores
Prev. weapon
== Arma anterior
@ -320,7 +320,7 @@ Score board
== Placar
Score limit
== Pontuação máxima
== Placar máx.
Scoreboard
== Placar
@ -343,6 +343,9 @@ Settings
Shotgun
== Espingarda
Show chat
== Mostrar conversa
Show name plates
== Mostrar apelidos
@ -389,7 +392,7 @@ The server is running a non-standard tuning on a pure game type.
== O servidor está rodando uma modificação não padrão em um tipo de jogo puro.
Time limit
== Limite de tempo
== Tempo máx.
Try again
== Tente novamente
@ -435,8 +438,6 @@ Your skin
##### needs translation ####
Show chat
== Show chat
Password incorrect
== Password incorrect

5
src/game/client/components/controls.cpp
View file

@ -19,7 +19,10 @@ void CControls::OnReset()
{
m_LastData.m_Direction = 0;
m_LastData.m_Hook = 0;
m_LastData.m_Fire = 0;
// simulate releasing the fire button
if((m_LastData.m_Fire&1) != 0)
m_LastData.m_Fire++;
m_LastData.m_Fire &= INPUT_STATE_MASK;
m_LastData.m_Jump = 0;
m_InputData = m_LastData;

8
src/game/editor/ed_editor.cpp
View file

@ -1029,6 +1029,14 @@ void CEditor::DoQuadPoint(CQuad *q, int QuadIndex, int v)
s_Operation = OP_CONTEXT_MENU;
m_SelectedQuad = QuadIndex;
UI()->SetActiveItem(pId);
if(!(m_SelectedPoints&(1<<v)))
{
if(Input()->KeyPressed(KEY_LSHIFT) || Input()->KeyPressed(KEY_RSHIFT))
m_SelectedPoints |= 1<<v;
else
m_SelectedPoints = 1<<v;
s_Moved = true;
}
}
}
else