[Scummvm-git-logs] scummvm branch-2-8 -> 92ee330c17bafd905e8638ba5c377ef10c4d93ea
sev-
noreply at scummvm.org
Sat Dec 16 20:14:10 UTC 2023
This automated email contains information about 4 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
b4374b6615 DOC: fix readthedocs pdf build
b2ff421869 GUI: adds cloud connection to inline help
38ed0c7b77 DISTS: Rename cloud_connection.zip to helpdialog.zip and add it to the dist lists
92ee330c17 BUILD: Make release check script happier
Commit: b4374b66153f85583e7da870820b00d4c7dae3a4
https://github.com/scummvm/scummvm/commit/b4374b66153f85583e7da870820b00d4c7dae3a4
Author: CadiH (cadihowley at gmail.com)
Date: 2023-12-16T21:12:37+01:00
Commit Message:
DOC: fix readthedocs pdf build
Changed paths:
.readthedocs.yaml
diff --git a/.readthedocs.yaml b/.readthedocs.yaml
index bf3fd666694..6d688adecf4 100644
--- a/.readthedocs.yaml
+++ b/.readthedocs.yaml
@@ -10,4 +10,7 @@ sphinx:
python:
install:
- - requirements: doc/docportal/requirements.txt
\ No newline at end of file
+ - requirements: doc/docportal/requirements.txt
+
+formats:
+ - pdf
Commit: b2ff4218696150b22a99208a5124edab5a9f44d4
https://github.com/scummvm/scummvm/commit/b2ff4218696150b22a99208a5124edab5a9f44d4
Author: CadiH (cadihowley at gmail.com)
Date: 2023-12-16T21:12:48+01:00
Commit Message:
GUI: adds cloud connection to inline help
Changed paths:
A dists/engine-data/cloud_connection.zip
gui/helpdialog.cpp
diff --git a/dists/engine-data/cloud_connection.zip b/dists/engine-data/cloud_connection.zip
new file mode 100644
index 00000000000..31fd8d8674b
Binary files /dev/null and b/dists/engine-data/cloud_connection.zip differ
diff --git a/gui/helpdialog.cpp b/gui/helpdialog.cpp
index 7e14fcd27ea..19b83105fbb 100644
--- a/gui/helpdialog.cpp
+++ b/gui/helpdialog.cpp
@@ -40,21 +40,70 @@ _s("General"),
_s(
"## Where to get the games\n"
"\n"
-"Visit [our Wiki](https://wiki.scummvm.org/index.php?title=Where_to_get_the_games) for a list of supported games and where they can be purchased.\n"
+"Visit [our Wiki](https://wiki.scummvm.org/index.php?title=Where_to_get_the_games) for a detailed list of supported games and where to purchase them.\n"
"\n"
-"Alternatively, download a selection of [freeware games](https://scummvm.org/games) and [demos](https://www.scummvm.org/demos/) from our website.\n"
+"Alternatively, you can download a variety of [freeware games](https://scummvm.org/games) and [demos](https://www.scummvm.org/demos/) directly from our website.\n"
"\n"
-"The ScummVM team does not recommend any individual supplier of games. "
-"However the project does get a cut from every purchase on "
+"The ScummVM team does not endorse any specific game supplier. "
+"However, the project receives a commission from every purchase made on "
"[ZOOM-Platform](https://www.zoom-platform.com/?affiliate=c049516c-9c4c-42d6-8649-92ed870e8b53) "
"through affiliate referral links.\n"
"\n"
-"Additionally, some games that are not available on ZOOM-Platform can be found on other suppliers such as GOG.com and Steam.\n"
+"Additionally, games not available on ZOOM-Platform can be found on other suppliers such as GOG.com and Steam.\n"
"\n"
-"For other (out of print) games, try Amazon, eBay, Game Trading Zone or other auction "
-"sites. Beware of faulty games and illegal game copies.\n"
+"For other (out-of-print) games, consider checking platforms like Amazon, eBay, Game Trading Zone, or other auction "
+"sites. Be cautious of faulty games and illegal game copies.\n"
),
+#ifdef USE_CLOUD
+
+_s("Cloud"),
+"cloud_connection.zip",
+_s(
+"## Connecting a cloud service - Quick mode\n"
+"\n"
+"1. From the Launcher, select **Global Options** and then select the **Cloud** tab.\n"
+"\n"
+"2. Select your preferred cloud storage service from the **Active storage** dropdown, then select **Connect**.\n"
+"\n "
+" ![Select cloud service](choose_storage.png \"Select cloud service\"){w=70%}\n"
+"\n"
+"3. Select **Quick mode**.\n"
+"\n "
+" ![Quick mode](quick_mode.png \"Quick mode\"){w=70%}\n"
+"\n"
+"4. Select **Run server** and then select **Next** \n"
+"\n "
+" ![Run server](run_server.png \"Run server\"){w=70%}\n"
+"\n"
+" ![Next step](server_next.png \"Next step\"){w=70%}\n"
+"\n"
+"5. Open the link.\n"
+"\n "
+" ![Open the link](open_link.png \"Open the link\"){w=70%}\n"
+"\n"
+"6. In the browser window that opens, select the cloud service to connect. \n"
+"\n "
+" ![Choose the cloud service](cloud_browser.png \"Choose the cloud service\"){w=70%}\n"
+"\n"
+"7. Sign in to the chosen cloud service. Once completed, return to ScummVM.\n"
+"\n"
+"8. On the success screen, select **Finish** to exit. \n"
+"\n "
+" ![Success](cloud_success.png \"Success\"){w=70%}\n"
+"9. Back on the main Cloud tab, select **Enable storage**.\n"
+"\n "
+" ![Enable storage](enable_storage.png \"Enable storage\"){w=70%}\n"
+"\n"
+"10. You're ready to go! Use the cloud functionality to sync saved games or game files between your devices.\n"
+"\n "
+" ![Cloud functionality](cloud_functions.png \"Cloud functionality\"){w=70%}\n"
+"\n"
+" For more information, including how to use the manual connection wizard, see our [Cloud documentation](https://docs.scummvm.org/en/latest/use_scummvm/connect_cloud.html) "
+),
+
+#endif
+
0,
};
Commit: 38ed0c7b7795c042d82836b1cb59985712d0a813
https://github.com/scummvm/scummvm/commit/38ed0c7b7795c042d82836b1cb59985712d0a813
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-12-16T21:12:56+01:00
Commit Message:
DISTS: Rename cloud_connection.zip to helpdialog.zip and add it to the dist lists
Changed paths:
A dists/engine-data/helpdialog.zip
R dists/engine-data/cloud_connection.zip
Makefile.common
devtools/create_project/xcode.cpp
dists/engine-data/README
dists/irix/scummvm.idb
dists/scummvm.rc
dists/win32/migration.txt
gui/helpdialog.cpp
diff --git a/Makefile.common b/Makefile.common
index 0ba3541a262..1d03a626855 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -494,6 +494,7 @@ endif
DIST_FILES_ENGINEDATA+=achievements.dat
DIST_FILES_ENGINEDATA+=classicmacfonts.dat
DIST_FILES_ENGINEDATA+=encoding.dat
+DIST_FILES_ENGINEDATA+=helpdialog.zip
DIST_FILES_ENGINEDATA+=macgui.dat
DIST_FILES_ENGINEDATA:=$(addprefix $(srcdir)/dists/engine-data/,$(DIST_FILES_ENGINEDATA))
diff --git a/devtools/create_project/xcode.cpp b/devtools/create_project/xcode.cpp
index be81f53c396..ed581b298ca 100644
--- a/devtools/create_project/xcode.cpp
+++ b/devtools/create_project/xcode.cpp
@@ -1036,6 +1036,7 @@ XcodeProvider::ValueList& XcodeProvider::getResourceFiles(const BuildSetup &setu
files.push_back("dists/engine-data/fonts-cjk.dat");
files.push_back("dists/engine-data/freescape.dat");
files.push_back("dists/engine-data/hadesch_translations.dat");
+ files.push_back("dists/engine-data/helpdialog.zip");
files.push_back("dists/engine-data/hugo.dat");
files.push_back("dists/engine-data/kyra.dat");
files.push_back("dists/engine-data/lure.dat");
diff --git a/dists/engine-data/README b/dists/engine-data/README
index 56366c668cf..62e5a9f79a6 100644
--- a/dists/engine-data/README
+++ b/dists/engine-data/README
@@ -45,6 +45,9 @@ This file contains set of script patches for Grim Fandango game.
hadesch_translations.dat:
This file contains essential data for Hadesch Challenge game.
+helpdialog.zip:
+This file contains images for Help Dialog.
+
hugo.dat:
This file contains all the hardcoded logic, strings and fonts used by Hugo
engine. Those information were stored in the original executables.
diff --git a/dists/engine-data/cloud_connection.zip b/dists/engine-data/helpdialog.zip
similarity index 100%
rename from dists/engine-data/cloud_connection.zip
rename to dists/engine-data/helpdialog.zip
diff --git a/dists/irix/scummvm.idb b/dists/irix/scummvm.idb
index 31063feea26..7859736903f 100644
--- a/dists/irix/scummvm.idb
+++ b/dists/irix/scummvm.idb
@@ -26,6 +26,7 @@ f 0644 root sys usr/ScummVM/share/scummvm/encoding.dat encoding.dat scummvm.sw.e
f 0644 root sys usr/ScummVM/share/scummvm/fonts.dat fonts.dat scummvm.sw.eoe
f 0644 root sys usr/ScummVM/share/scummvm/fonts-cjk.dat fonts-cjk.dat scummvm.sw.eoe
f 0644 root sys usr/ScummVM/share/scummvm/grim-patch.lab grim-patch.lab scummvm.sw.eoe
+f 0644 root sys usr/ScummVM/share/scummvm/helpdialog.zip helpdialog.zip scummvm.sw.eoe
f 0644 root sys usr/ScummVM/share/scummvm/hugo.dat hugo.dat scummvm.sw.eoe
f 0644 root sys usr/ScummVM/share/scummvm/hadesch_translations.dat hadesch_translations.dat scummvm.sw.eoe
f 0644 root sys usr/ScummVM/share/scummvm/kyra.dat kyra.dat scummvm.sw.eoe
diff --git a/dists/scummvm.rc b/dists/scummvm.rc
index 504ae321843..8daa4f12558 100644
--- a/dists/scummvm.rc
+++ b/dists/scummvm.rc
@@ -28,6 +28,7 @@ gui-icons.dat FILE "gui/themes/gui-icons.dat"
shaders.dat FILE "gui/themes/shaders.dat"
achievements.dat FILE "dists/engine-data/achievements.dat"
encoding.dat FILE "dists/engine-data/encoding.dat"
+helpdialog.zip FILE "dists/engine-data/helpdialog.zip"
macgui.dat FILE "dists/engine-data/macgui.dat"
classicmacfonts.dat FILE "dists/engine-data/classicmacfonts.dat"
diff --git a/dists/win32/migration.txt b/dists/win32/migration.txt
index c39fcb77734..a897aeb3e8a 100644
--- a/dists/win32/migration.txt
+++ b/dists/win32/migration.txt
@@ -25,6 +25,7 @@ freescape.dat
grim-patch.lab
gui-icons.dat
hadesch_translations.dat
+helpdialog.zip
hugo.dat
kyra.dat
lure.dat
diff --git a/gui/helpdialog.cpp b/gui/helpdialog.cpp
index 19b83105fbb..c6b33e7f110 100644
--- a/gui/helpdialog.cpp
+++ b/gui/helpdialog.cpp
@@ -58,7 +58,7 @@ _s(
#ifdef USE_CLOUD
_s("Cloud"),
-"cloud_connection.zip",
+"helpdialog.zip",
_s(
"## Connecting a cloud service - Quick mode\n"
"\n"
@@ -82,7 +82,7 @@ _s(
"\n "
" ![Open the link](open_link.png \"Open the link\"){w=70%}\n"
"\n"
-"6. In the browser window that opens, select the cloud service to connect. \n"
+"6. In the browser window that opens, select the cloud service to connect. \n"
"\n "
" ![Choose the cloud service](cloud_browser.png \"Choose the cloud service\"){w=70%}\n"
"\n"
Commit: 92ee330c17bafd905e8638ba5c377ef10c4d93ea
https://github.com/scummvm/scummvm/commit/92ee330c17bafd905e8638ba5c377ef10c4d93ea
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-12-16T21:13:55+01:00
Commit Message:
BUILD: Make release check script happier
Changed paths:
Makefile.common
diff --git a/Makefile.common b/Makefile.common
index 1d03a626855..a1ffdc70e37 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -468,7 +468,8 @@ ifdef ENABLE_TOON
DIST_FILES_ENGINEDATA+=toon.dat
endif
ifdef ENABLE_ULTIMA
-DIST_FILES_ENGINEDATA+=ultima.dat ultima8.dat
+DIST_FILES_ENGINEDATA+=ultima.dat
+DIST_FILES_ENGINEDATA+=ultima8.dat
endif
ifdef ENABLE_WINTERMUTE
DIST_FILES_ENGINEDATA+=wintermute.zip
More information about the Scummvm-git-logs
mailing list