Merged from revision: 7586

Multiplayer Bugfix:
- Improved (fixed) interrupt endless clock when enemy interrupts (CO-OP game) (tested by Woquit)
- Override turn (ALT + E): Now it is possible again for the server to give the turn back to itself
- Updated MP Version Number to 3.1

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7587 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2014-10-18 14:08:28 +00:00
parent 03e6f0bb0b
commit e000abcc57
10 changed files with 116 additions and 62 deletions
+1 -1
View File
@@ -6939,7 +6939,7 @@ STR16 MPClientMessage[] =
L"'%s' (客户端 %d - '%S') 已被 '%s' (客户端 %d - '%S' 杀死)",
L"踢出客户端 #%d - '%S'",
// 30
L"开始排序客户端号. #1: <取消>, #2: %S, #3: %S, #4: %S",
L"开始排序客户端号. #1: %S, #2: %S, #3: %S, #4: %S",
L"开始客户端 #%d",
L"请求即时模式...",
L"转回即时模式。",
+1 -1
View File
@@ -6944,7 +6944,7 @@ STR16 MPClientMessage[] =
L"'%s' (client %d - '%S') was killed by '%s' (client %d - '%S')",
L"Kicked client #%d - '%S'",
// 30
L"Start a new turn for the selected client. #1: <Cancel>, #2: %S, #3: %S, #4: %S",
L"Start a new turn for the selected client. #1: %S, #2: %S, #3: %S, #4: %S",
L"Starting turn for client #%d",
L"Requesting for realtime...",
L"Switched back to realtime.",
+1 -1
View File
@@ -6939,7 +6939,7 @@ STR16 MPClientMessage[] =
L"'%s' (client %d - '%S') was killed by '%s' (client %d - '%S').",
L"Kicked client #%d - '%S'.",
// 30
L"Start a new turn for the selected client. #1: <Cancel>, #2: %S, #3: %S, #4: %S",
L"Start a new turn for the selected client. #1: %S, #2: %S, #3: %S, #4: %S",
L"Starting turn for client #%d.",
L"Requesting for realtime...",
L"Switched back to realtime.",
+1 -1
View File
@@ -6769,7 +6769,7 @@ STR16 MPClientMessage[] =
L"'%s' (Client #%d - '%S') wurde getötet von '%s' (Client #%d - '%S')",
L"Werfe Client #%d - '%S' aus dem Spiel.",
// 30
L"Starte neuen Spielzug für gewählten Client. #1: <Abbruch>, #2: %S, #3: %S, #4: %S",
L"Starte neuen Spielzug für gewählten Client. #1: %S, #2: %S, #3: %S, #4: %S",
L"Starte Spielzug für Client #%d",
L"Anfrage auf Echtzeit-Modus...",
L"In Echtzeit-Modus gewechselt.",
+1 -1
View File
@@ -6940,7 +6940,7 @@ STR16 MPClientMessage[] =
L"'%s' (client %d - '%S') was killed by '%s' (client %d - '%S')",
L"Kicked client #%d - '%S'",
// 30
L"Start a new turn for the selected client. #1: <Cancel>, #2: %S, #3: %S, #4: %S",
L"Start a new turn for the selected client. #1: %S, #2: %S, #3: %S, #4: %S",
L"Starting turn for client #%d",
L"Requesting for realtime...",
L"Switched back to realtime.",
+1 -1
View File
@@ -6952,7 +6952,7 @@ STR16 MPClientMessage[] =
L"'%s' (klient %d - '%S') zabity przez '%s' (client %d - '%S')",
L"Wyrzucono #%d - '%S'",
// 30
L"Zacząć turę dla klientów. #1: <Anulować>, #2: %S, #3: %S, #4: %S",
L"Zacząć turę dla klientów. #1: %S, #2: %S, #3: %S, #4: %S",
L"Początek tury dla #%d",
L"Żądanie trybu realtime…",
L"Zmieniono w tryb realtime.",
+1 -1
View File
@@ -6936,7 +6936,7 @@ STR16 MPClientMessage[] =
L"%s (клиент %d - '%S') был убит %s (клиент %d - '%S')",
L"Клиент №%d - '%S' выкинут из игры.",
// 30
L"Принудительно дать ход клиенту. №1: <Отменить>, №2: %S, №3: %S, №4: %S",
L"Принудительно дать ход клиенту. №1: %S, №2: %S, №3: %S, №4: %S",
L"Начался ход клиента №%d",
L"Запрос перехода в режим реального время...",
L"Переход в режим реального времени.",