Merge remote-tracking branch 'upstream/master'

zenseii · May 14, 2024 · 49599f3 · 49599f3
2 parents 6a3ffb9 + d4cf5ef
commit 49599f3
Show file tree

Hide file tree

Showing 148 changed files with 18,923 additions and 7,206 deletions.
diff --git a/VisualStudio/fheroes2/sources.props b/VisualStudio/fheroes2/sources.props
@@ -109,8 +109,12 @@
     <ClCompile Include="src\fheroes2\editor\editor_interface.cpp" />
     <ClCompile Include="src\fheroes2\editor\editor_interface_panel.cpp" />
     <ClCompile Include="src\fheroes2\editor\editor_mainmenu.cpp" />
+    <ClCompile Include="src\fheroes2\editor\editor_map_specs_window.cpp" />
     <ClCompile Include="src\fheroes2\editor\editor_object_popup_window.cpp" />
+    <ClCompile Include="src\fheroes2\editor\editor_castle_details_window.cpp" />
     <ClCompile Include="src\fheroes2\editor\editor_options.cpp" />
+    <ClCompile Include="src\fheroes2\editor\editor_save_map_window.cpp" />
+    <ClCompile Include="src\fheroes2\editor\editor_sphinx_window.cpp" />
     <ClCompile Include="src\fheroes2\editor\history_manager.cpp" />
     <ClCompile Include="src\fheroes2\game\difficulty.cpp" />
     <ClCompile Include="src\fheroes2\game\fheroes2.cpp" />
@@ -319,8 +323,12 @@
     <ClInclude Include="src\fheroes2\editor\editor.h" />
     <ClInclude Include="src\fheroes2\editor\editor_interface.h" />
     <ClInclude Include="src\fheroes2\editor\editor_interface_panel.h" />
+    <ClInclude Include="src\fheroes2\editor\editor_map_specs_window.h" />
     <ClInclude Include="src\fheroes2\editor\editor_object_popup_window.h" />
+    <ClInclude Include="src\fheroes2\editor\editor_castle_details_window.h" />
     <ClInclude Include="src\fheroes2\editor\editor_options.h" />
+    <ClInclude Include="src\fheroes2\editor\editor_save_map_window.h" />
+    <ClInclude Include="src\fheroes2\editor\editor_sphinx_window.h" />
     <ClInclude Include="src\fheroes2\editor\history_manager.h" />
     <ClInclude Include="src\fheroes2\game\difficulty.h" />
     <ClInclude Include="src\fheroes2\game\game.h" />
@@ -330,6 +338,7 @@
     <ClInclude Include="src\fheroes2\game\game_interface.h" />
     <ClInclude Include="src\fheroes2\game\game_io.h" />
     <ClInclude Include="src\fheroes2\game\game_logo.h" />
+    <ClInclude Include="src\fheroes2\game\game_language.h" />
     <ClInclude Include="src\fheroes2\game\game_mainmenu_ui.h" />
     <ClInclude Include="src\fheroes2\game\game_mode.h" />
     <ClInclude Include="src\fheroes2\game\game_over.h" />

diff --git a/docs/json/lang_be.json b/docs/json/lang_be.json
@@ -1 +1 @@
-{"schemaVersion":1,"label":"Belarusian","message":"19%","color":"red"}
+{"schemaVersion":1,"label":"Belarusian","message":"18%","color":"red"}
diff --git a/docs/json/lang_bg.json b/docs/json/lang_bg.json
@@ -1 +1 @@
-{"schemaVersion":1,"label":"Bulgarian","message":"88%","color":"yellow"}
+{"schemaVersion":1,"label":"Bulgarian","message":"86%","color":"yellow"}
diff --git a/docs/json/lang_cs.json b/docs/json/lang_cs.json
@@ -1 +1 @@
-{"schemaVersion":1,"label":"Czech","message":"56%","color":"red"}
+{"schemaVersion":1,"label":"Czech","message":"54%","color":"red"}
diff --git a/docs/json/lang_de.json b/docs/json/lang_de.json
@@ -1 +1 @@
-{"schemaVersion":1,"label":"German","message":"88%","color":"yellow"}
+{"schemaVersion":1,"label":"German","message":"86%","color":"yellow"}
diff --git a/docs/json/lang_dk.json b/docs/json/lang_dk.json
@@ -1 +1 @@
-{"schemaVersion":1,"label":"Danish","message":"98%","color":"green"}
+{"schemaVersion":1,"label":"Danish","message":"95%","color":"green"}
diff --git a/docs/json/lang_es.json b/docs/json/lang_es.json
@@ -1 +1 @@
-{"schemaVersion":1,"label":"Spanish","message":"69%","color":"red"}
+{"schemaVersion":1,"label":"Spanish","message":"67%","color":"red"}
diff --git a/docs/json/lang_fr.json b/docs/json/lang_fr.json
@@ -1 +1 @@
-{"schemaVersion":1,"label":"French","message":"98%","color":"green"}
+{"schemaVersion":1,"label":"French","message":"95%","color":"green"}
diff --git a/docs/json/lang_hu.json b/docs/json/lang_hu.json
@@ -1 +1 @@
-{"schemaVersion":1,"label":"Hungarian","message":"99%","color":"green"}
+{"schemaVersion":1,"label":"Hungarian","message":"96%","color":"green"}
diff --git a/docs/json/lang_it.json b/docs/json/lang_it.json
@@ -1 +1 @@
-{"schemaVersion":1,"label":"Italian","message":"42%","color":"red"}
+{"schemaVersion":1,"label":"Italian","message":"41%","color":"red"}
diff --git a/docs/json/lang_nb.json b/docs/json/lang_nb.json
@@ -1 +1 @@
-{"schemaVersion":1,"label":"Norwegian","message":"84%","color":"yellow"}
+{"schemaVersion":1,"label":"Norwegian","message":"82%","color":"yellow"}
diff --git a/docs/json/lang_pl.json b/docs/json/lang_pl.json
@@ -1 +1 @@
-{"schemaVersion":1,"label":"Polish","message":"85%","color":"yellow"}
+{"schemaVersion":1,"label":"Polish","message":"83%","color":"yellow"}
diff --git a/docs/json/lang_pt.json b/docs/json/lang_pt.json
@@ -1 +1 @@
-{"schemaVersion":1,"label":"Brazilian Portuguese","message":"15%","color":"red"}
+{"schemaVersion":1,"label":"Brazilian Portuguese","message":"98%","color":"green"}
diff --git a/docs/json/lang_ro.json b/docs/json/lang_ro.json
@@ -1 +1 @@
-{"schemaVersion":1,"label":"Romanian","message":"12%","color":"red"}
+{"schemaVersion":1,"label":"Romanian","message":"15%","color":"red"}
diff --git a/docs/json/lang_ru.json b/docs/json/lang_ru.json
@@ -1 +1 @@
-{"schemaVersion":1,"label":"Russian","message":"97%","color":"green"}
+{"schemaVersion":1,"label":"Russian","message":"95%","color":"green"}
diff --git a/docs/json/lang_sk.json b/docs/json/lang_sk.json
@@ -1 +1 @@
-{"schemaVersion":1,"label":"Slovak","message":"88%","color":"yellow"}
+{"schemaVersion":1,"label":"Slovak","message":"86%","color":"yellow"}
diff --git a/docs/json/lang_sv.json b/docs/json/lang_sv.json
@@ -1 +1 @@
-{"schemaVersion":1,"label":"Swedish","message":"98%","color":"green"}
+{"schemaVersion":1,"label":"Swedish","message":"96%","color":"green"}
diff --git a/docs/json/lang_uk.json b/docs/json/lang_uk.json
@@ -1 +1 @@
-{"schemaVersion":1,"label":"Ukrainian","message":"84%","color":"yellow"}
+{"schemaVersion":1,"label":"Ukrainian","message":"90%","color":"yellow"}
diff --git a/docs/json/lang_vi.json b/docs/json/lang_vi.json
@@ -1 +1 @@
-{"schemaVersion":1,"label":"Vietnamese","message":"89%","color":"yellow"}
+{"schemaVersion":1,"label":"Vietnamese","message":"87%","color":"yellow"}
diff --git a/files/data/resurrection.h2d b/files/data/resurrection.h2d