[Scummvm-git-logs] scummvm master -> 6d4602100d5578fc406a128f49fe50ddc2791847
bluegr
bluegr at gmail.com
Mon Mar 15 16:39:43 UTC 2021
This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
5da3662dad DOCS: Update the Android documentation
cc328d9cfa ANDROID: Remove README.Android
6d4602100d DOCS: Add a description of the Backend tab
Commit: 5da3662dadeffcd69e362dd99de20fe46aa68f95
https://github.com/scummvm/scummvm/commit/5da3662dadeffcd69e362dd99de20fe46aa68f95
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2021-03-15T18:39:39+02:00
Commit Message:
DOCS: Update the Android documentation
Changed paths:
doc/docportal/other_platforms/android.rst
diff --git a/doc/docportal/other_platforms/android.rst b/doc/docportal/other_platforms/android.rst
index 34b3386eac..6eaae80f19 100644
--- a/doc/docportal/other_platforms/android.rst
+++ b/doc/docportal/other_platforms/android.rst
@@ -73,15 +73,27 @@ Controls can also be manually configured in the :doc:`Keymaps tab <../settings/k
Touch screen control, Action
One finger tap, Left mouse click
+ One finger tap + movement, Mouse movement
+ One finger tap held for >0.5s, Right mouse click
+ One finger tap held for >1s, Middle mouse click
+ Double Tap + movement, "Drag-and-drop, or (for some games): emulates left mouse button hold and drag, eg. for selection from action wheel in Curse of Monkey Island"
Two finger tap, Right mouse click
- One finger touch & hold, Middle mouse click
+ Two finger tap + movement of second finger, "Right mouse hold and drag, eg. for selection from action wheel in Tony Tough"
+ Three finger tap, Middle mouse click
+ Three finger tap + movement of third finger, Middle mouse hold and drag
Long press system Back button, Opens Global Main Menu
Short press system Back button, "Skip, or Cancel/Quit in the Launcher"
+ Long press system Menu button, Opens/closes Virtual keyboard
+ Short press system Menu button, Opens Global Main Menu
Small keyboard icon (top right), Opens/closes Virtual keyboard
+ D-pad up/down/left/right, Mouse movement
+ D-pad center, Left mouse click
+ Trackball movement, Mouse movement
+ Trackball click, Left mouse click
Touch controls
****************
-The touch control scheme can be switched in the global settings. From the Launcher, go to **Options > Control > Touchpad mouse mode**.
+The touch control scheme can be switched in the global settings. From the Launcher, go to **Options > Backend > Touchpad mouse mode**.
- When touchpad mouse mode is off (default), the touch controls are direct. The pointer jumps to where the finger touches the screen.
- When touchpad mouse mode is on, the touch controls are indirect. The finger can be far away from the pointer and still move it, like on a laptop touchpad.
@@ -103,7 +115,7 @@ Virtual keyboard
To open the virtual keyboard, tap on the small keyboard icon at the top right of the screen, or tap on any editable text field. To hide the virtual keyboard, tap the small keyboard icon again, or tap outside the text field.
-To display or hide the small keyboard icon, from the Launcher select **Options** and then the **Control** tab. Tick the **Show on-screen control** box to enable the keyboard icon.
+To display or hide the small keyboard icon, from the Launcher select **Options** and then the **Backend** tab. Tick the **Show on-screen control** box to enable the keyboard icon.
Paths
@@ -129,7 +141,7 @@ To access the internal app folder, use ScummVM's built-in LAN functionality:
2. Select **/root/Path**.
3. Use the file browser to **Go up** to the root of the ScummVM internal app folder.
4. Select the **ScummVM data (int)** shortcut, and tap **Choose**.
-5. Run the server to access the ``scummvm.ini``` configuration file.
+5. Run the server to access the ``scummvm.ini`` configuration file.
For more information, see the :doc:`../use_scummvm/LAN` page.
Commit: cc328d9cfaad7bb0134e373558b8def07c188562
https://github.com/scummvm/scummvm/commit/cc328d9cfaad7bb0134e373558b8def07c188562
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2021-03-15T18:39:39+02:00
Commit Message:
ANDROID: Remove README.Android
Changed paths:
R dists/android/README.Android
R dists/android3d/README.Android
backends/platform/android/android.mk
backends/platform/android3d/android.mk
diff --git a/backends/platform/android/android.mk b/backends/platform/android/android.mk
index 341004d19f..a257895d84 100644
--- a/backends/platform/android/android.mk
+++ b/backends/platform/android/android.mk
@@ -1,8 +1,6 @@
# Android specific build targets
PATH_DIST = $(srcdir)/dists/android
-PORT_DISTFILES = $(PATH_DIST)/README.Android
-
GRADLE_FILES = $(shell find $(PATH_DIST)/gradle -type f) $(PATH_DIST)/gradlew $(PATH_DIST)/build.gradle
PATH_BUILD = ./android_project
@@ -27,9 +25,9 @@ $(PATH_BUILD_GRADLE): $(GRADLE_FILES) | $(PATH_BUILD)
$(ECHO) "android.enableJetifier=true\n" >> $(PATH_BUILD)/gradle.properties
$(ECHO) "sdk.dir=$(realpath $(ANDROID_SDK_ROOT))\n" > $(PATH_BUILD)/local.properties
-$(PATH_BUILD_ASSETS): $(DIST_FILES_THEMES) $(DIST_FILES_ENGINEDATA) $(DIST_FILES_NETWORKING) $(DIST_FILES_VKEYBD) $(DIST_FILES_DOCS) $(PORT_DISTFILES) | $(PATH_BUILD)
+$(PATH_BUILD_ASSETS): $(DIST_FILES_THEMES) $(DIST_FILES_ENGINEDATA) $(DIST_FILES_NETWORKING) $(DIST_FILES_VKEYBD) $(DIST_FILES_DOCS) | $(PATH_BUILD)
$(INSTALL) -d $(PATH_BUILD_ASSETS)
- $(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(DIST_FILES_ENGINEDATA) $(DIST_FILES_NETWORKING) $(DIST_FILES_VKEYBD) $(DIST_FILES_DOCS) $(PORT_DISTFILES) $(PATH_BUILD_ASSETS)/
+ $(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(DIST_FILES_ENGINEDATA) $(DIST_FILES_NETWORKING) $(DIST_FILES_VKEYBD) $(DIST_FILES_DOCS) $(PATH_BUILD_ASSETS)/
$(PATH_BUILD_LIBSCUMMVM): libscummvm.so | $(PATH_BUILD)
$(INSTALL) -d $(PATH_BUILD_LIB)
@@ -68,14 +66,14 @@ androidtest: $(APK_MAIN)
androiddistdebug: all
$(MKDIR) debug
$(CP) $(APK_MAIN) debug/
- for i in $(DIST_FILES_DOCS) $(PORT_DISTFILES); do \
+ for i in $(DIST_FILES_DOCS); do \
sed 's/$$/\r/' < $$i > debug/`basename $$i`.txt; \
done
androiddistrelease: androidrelease
$(MKDIR) release
$(CP) $(APK_MAIN_RELEASE) release/
- for i in $(DIST_FILES_DOCS) $(PORT_DISTFILES); do \
+ for i in $(DIST_FILES_DOCS); do \
sed 's/$$/\r/' < $$i > release/`basename $$i`.txt; \
done
diff --git a/backends/platform/android3d/android.mk b/backends/platform/android3d/android.mk
index 023a0ae732..8dd4c68902 100644
--- a/backends/platform/android3d/android.mk
+++ b/backends/platform/android3d/android.mk
@@ -1,7 +1,6 @@
# Android specific build targets
PATH_DIST = $(srcdir)/dists/android3d
-PORT_DISTFILES = $(PATH_DIST)/README.Android
DIST_ANDROID_CONTROLS = $(PATH_DIST)/assets/arrows.tga
GRADLE_FILES = $(shell find $(PATH_DIST)/gradle -type f) $(PATH_DIST)/gradlew $(PATH_DIST)/build.gradle
@@ -29,9 +28,9 @@ $(PATH_BUILD_GRADLE): $(GRADLE_FILES) | $(PATH_BUILD)
$(ECHO) "sdk.dir=$(realpath $(ANDROID_SDK_ROOT))\n" > $(PATH_BUILD)/local.properties
$(ECHO) "ndk.dir=$(realpath $(ANDROID_NDK_ROOT))\n" >> $(PATH_BUILD)/local.properties
-$(PATH_BUILD_ASSETS): $(DIST_FILES_THEMES) $(DIST_FILES_ENGINEDATA) $(DIST_FILES_NETWORKING) $(DIST_FILES_VKEYBD) $(DIST_FILES_DOCS) $(DIST_ANDROID_CONTROLS) $(PORT_DISTFILES) | $(PATH_BUILD)
+$(PATH_BUILD_ASSETS): $(DIST_FILES_THEMES) $(DIST_FILES_ENGINEDATA) $(DIST_FILES_NETWORKING) $(DIST_FILES_VKEYBD) $(DIST_FILES_DOCS) $(DIST_ANDROID_CONTROLS) | $(PATH_BUILD)
$(INSTALL) -d $(PATH_BUILD_ASSETS)
- $(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(DIST_FILES_ENGINEDATA) $(DIST_FILES_NETWORKING) $(DIST_FILES_VKEYBD) $(DIST_FILES_DOCS) $(DIST_ANDROID_CONTROLS) $(PORT_DISTFILES) $(PATH_BUILD_ASSETS)/
+ $(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(DIST_FILES_ENGINEDATA) $(DIST_FILES_NETWORKING) $(DIST_FILES_VKEYBD) $(DIST_FILES_DOCS) $(DIST_ANDROID_CONTROLS) $(PATH_BUILD_ASSETS)/
ifneq ($(DIST_FILES_SHADERS),)
$(INSTALL) -d $(PATH_BUILD_ASSETS)/shaders
$(INSTALL) -c -m 644 $(DIST_FILES_SHADERS) $(PATH_BUILD_ASSETS)/shaders
@@ -74,14 +73,14 @@ androidtest: $(APK_MAIN)
androiddistdebug: all
$(MKDIR) debug
$(CP) $(APK_MAIN) debug/
- for i in $(DIST_FILES_DOCS) $(PORT_DISTFILES); do \
+ for i in $(DIST_FILES_DOCS); do \
sed 's/$$/\r/' < $$i > debug/`basename $$i`.txt; \
done
androiddistrelease: androidrelease
$(MKDIR) release
$(CP) $(APK_MAIN_RELEASE) release/
- for i in $(DIST_FILES_DOCS) $(PORT_DISTFILES); do \
+ for i in $(DIST_FILES_DOCS); do \
sed 's/$$/\r/' < $$i > release/`basename $$i`.txt; \
done
diff --git a/dists/android/README.Android b/dists/android/README.Android
deleted file mode 100644
index c64da66b09..0000000000
--- a/dists/android/README.Android
+++ /dev/null
@@ -1,58 +0,0 @@
-README for the Android port of ScummVM
---------------------------------------
-
-REQUIREMENTS
-
- - Android 4.1 or later
-
-INSTALL
-
- TODO
-
-CONTROLS
-
- 5-Way navigation control / DPAD
-
- DPAD up/down/left/right: Mouse movement
- DPAD center: Left mouse button
-
- Trackball
-
- Movement: Mouse movement
- Click: Left mouse button
-
- Touchscreen
-
- The touchscreen can be used in two modes
-
- 1) Direct mode
- 2) Touchpad mode
-
- When in direct mode, the mouse cursor moves to the touched point on screen.
- In touchpad mode, the mouse cursor is independent of the touched point, it
- is moved relative to its current position - like on a touchpad.
-
- The mode can be toggled with the "Touchpad mouse mode" on the Backend tab
- in ScummVM's own option dialog.
-
- Tap + movement: Mouse movement
- Tap without movement: Left mouse button click
- Tap held for >0.5s without movement: Right mouse button click
- Tap held for >1s without movement: Middle mouse button click
- Double Tap + movement: Drag-and-drop
- or (for some games): emulates left mouse button hold and drag,
- eg. for selection from action wheel in Curse of Monkey Island
-
- On devices supporting multitouch:
-
- Two finger tap: Right mouse button click
- Two finger tap + movement of second finger: Right mouse button hold and drag,
- eg. for selection from action wheel in Tony Tough
- Three finger tap: Middle mouse button click
- Three finger tap + movement of third finger: Middle mouse button hold and drag
-
- System keys
-
- Back button: Escape/Skip
- Menu button: ScummVM menu
- Menu button held for 0.5s: Toggle virtual keyboard
diff --git a/dists/android3d/README.Android b/dists/android3d/README.Android
deleted file mode 100644
index aaed6808da..0000000000
--- a/dists/android3d/README.Android
+++ /dev/null
@@ -1,55 +0,0 @@
-README for the Android port of ResidualVM
---------------------------------------
-
-REQUIREMENTS
-
- TODO
-
-INSTALL
-
- TODO
-
-CONTROLS
-
- 5-Way navigation control / DPAD
-
- DPAD up/down/left/right: Mouse movement
- DPAD center: Left mouse button
-
- Trackball
-
- Movement: Mouse movement
- Click: Left mouse button
-
- Touchscreen
-
- The touchscreen can be used in two modes
-
- 1) Direct mode
- 2) Touchpad mode
-
- When in direct mode, the mouse cursor moves to the touched point on screen.
- In touchpad mode, the mouse cursor is independent of the touched point, it
- is moved relative to its current position - like on a touchpad.
-
- The port currently misses its own configuration dialog, the mode can
- be toggled with the "Mixed AdLib/MIDI mode" on the MIDI tab in ResidualVM's
- own option dialog.
-
- Tap + movement: Mouse movement
- Tap without movement: Left mouse button click
- Tap held for >0.5s without movement: Right mouse button click
- Tap held for >1s without movement: Middle mouse button click
- Double Tap + movement: Drag and drop
-
- On devices supporting multitouch:
-
- Two finger tap: Right mouse button click
- Three finger tap: Middle mouse button click
-
- System keys
-
- Back button: Escape
- Menu button: ResidualVM menu
- Menu button held for 0.5s: Toggle virtual keyboard
- Camera or Search button: Right mouse button click
Commit: 6d4602100d5578fc406a128f49fe50ddc2791847
https://github.com/scummvm/scummvm/commit/6d4602100d5578fc406a128f49fe50ddc2791847
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2021-03-15T18:39:39+02:00
Commit Message:
DOCS: Add a description of the Backend tab
Changed paths:
A doc/docportal/settings/backend.rst
doc/docportal/index.rst
doc/docportal/settings/control.rst
diff --git a/doc/docportal/index.rst b/doc/docportal/index.rst
index 8a86e38936..fa10833d1b 100644
--- a/doc/docportal/index.rst
+++ b/doc/docportal/index.rst
@@ -29,6 +29,7 @@
settings/game
settings/engine
+ settings/backend
settings/graphics
settings/control
settings/keymaps
diff --git a/doc/docportal/settings/backend.rst b/doc/docportal/settings/backend.rst
new file mode 100644
index 0000000000..42db38879a
--- /dev/null
+++ b/doc/docportal/settings/backend.rst
@@ -0,0 +1,16 @@
+=====================
+Backend
+=====================
+
+Use the Backend tab to change settings that are unique to the platform being used. This tab is not available for all platforms.
+
+To change settings globally:
+
+From the Launcher, select **Options**, then select the **Backend** tab.
+
+To change settings for a specific game:
+
+Highlight the game in the games list, select **Edit Game**, then select the **Backend** tab.
+
+For a comprehensive look at how to use these settings, check out the individual platform guides.
+
diff --git a/doc/docportal/settings/control.rst b/doc/docportal/settings/control.rst
index 3236d13208..19a54eed17 100644
--- a/doc/docportal/settings/control.rst
+++ b/doc/docportal/settings/control.rst
@@ -28,8 +28,5 @@ Joy deadzone
*joystick_deadzone*
-Show on-screen control
- Toggles the small on-screen keyboard icon on and off.
-
Touchpad mouse mode
Toggles between direct mode and touchpad mode.
\ No newline at end of file
More information about the Scummvm-git-logs
mailing list