Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Touch swipe tutorial #1201

Open
wants to merge 33 commits into
base: master
Choose a base branch
from
Open

Touch swipe tutorial #1201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
a5795a6
Initial touch input support
AllyTally Jan 29, 2024
9eeb737
Add string to language files
AllyTally Jan 29, 2024
9c83a4b
Ignore Android's back button when disabling touch
NyakoFox Apr 2, 2024
1412c90
Don't close ingame menu when pressing confirm btn
NyakoFox Apr 2, 2024
c5b3664
Replace screen_tapped with screen_down
NyakoFox Apr 11, 2024
a53adde
Replace float scale with int scale
NyakoFox Apr 11, 2024
018cbd9
Initial touch button attempt
NyakoFox Mar 25, 2024
eea8741
Automatic menu buttons
NyakoFox Mar 25, 2024
59a97d2
Modify a few menus
NyakoFox Apr 9, 2024
e96d139
Slider inputs for audio volume
NyakoFox Apr 9, 2024
3bdeaf8
Touch input menu
NyakoFox Apr 9, 2024
21496e3
Accessibility menu
NyakoFox Apr 10, 2024
b47955e
Work on language menu
NyakoFox Apr 10, 2024
8b45529
Finish language menu
NyakoFox Apr 11, 2024
1ba14b0
Summary changes
NyakoFox Apr 11, 2024
eef83a0
Buttonify map screen
NyakoFox Apr 11, 2024
a32bf13
Fix bug with graphics menu
NyakoFox Apr 11, 2024
d54af27
Fix first-time lang screen
NyakoFox Apr 11, 2024
07dfb6e
Fix M&P builds failing
NyakoFox Apr 11, 2024
504208e
Fix a few options
NyakoFox Apr 11, 2024
8c06371
Language menu changes
NyakoFox Apr 11, 2024
42ab55d
Remove save and exit button
NyakoFox Apr 11, 2024
44a40c1
Secret lab buttons, fix preloader buttons
NyakoFox Apr 11, 2024
a396424
Comment out player levels for now
NyakoFox Apr 11, 2024
e0debda
Working back button
NyakoFox Apr 12, 2024
c394a63
Offset back button, fix buttons appearing in ingame menu when returni…
NyakoFox Apr 12, 2024
757e20a
Fix saveless saving and quitting hiding buttons
NyakoFox Jun 4, 2024
9f9c813
Remove buggy switch to touch controls in touch input menu
NyakoFox Jun 4, 2024
30abc8a
Add checkpoint saving option to touch controls
NyakoFox Sep 29, 2024
44632e1
Swipe control scheme
NyakoFox Jun 4, 2024
dc04fcc
Initial control tutorial
NyakoFox Jun 7, 2024
c6dd712
Fix script error, only show touch tutorial once
NyakoFox Oct 4, 2024
823433d
Only show swipe tutorial if you're using swipe mode
NyakoFox Oct 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions desktop_version/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ set(VVV_CXX_SRC
src/TerminalScripts.cpp
src/Textbox.cpp
src/Tower.cpp
src/Touch.cpp
src/UtilityClass.cpp
src/WarpClass.cpp
src/XMLUtils.cpp
Expand Down
3 changes: 3 additions & 0 deletions desktop_version/VVVVVV-android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,9 @@ def zipRepoAssetsTask = tasks.register("zipRepoAssets", Zip) {
from('../../lang') { spec ->
spec.into('lang')
}
from('../../touch') { spec ->
spec.into('graphics')
}
archiveFileName.set('repo.zip')
destinationDirectory.value(layout.buildDirectory.dir("generated/main/assets"))
}
Expand Down
11 changes: 11 additions & 0 deletions desktop_version/lang/ar/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,16 @@
<string english="Re-enable the 1-frame input delay from previous versions of the game." translation="إرجاع تأجيل الضغطة بإطار واحد كما كان الحال في تحديثات اللعبة السابقة" explanation="input delay" max="38*3" max_local="38*3"/>
<string english="Input delay is ON" translation="تأجيل الضغطة يعمل" explanation="" max="38*2" max_local="38*2"/>
<string english="Input delay is OFF" translation="تأجيل الضغطة معطل" explanation="" max="38*2" max_local="38*2"/>
<string english="touch input" translation="" explanation="menu option"/>
<string english="Touch Input" translation="" explanation="title" max="20" max_local="20"/>
<string english="Change touch input options." translation="" explanation="" max="38*5" max_local="38*5"/>
<string english="control style" translation="" explanation="menu option"/>
<string english="Control Style" translation="" explanation="title" max="20" max_local="20"/>
<string english="Change the control style for touch input." translation="" explanation="" max="38*3" max_local="38*3"/>
<string english="ui scale" translation="" explanation="menu option"/>
<string english="UI Scale" translation="" explanation="title" max="20" max_local="20"/>
<string english="Change the scale of the UI buttons." translation="" explanation="" max="38*3" max_local="38*3"/>
<string english="Current scale: {scale}.{extra}x" translation="" explanation="scale and extra are both numbers. 1 and 5 show as 1.5" max="38*2" max_local="38*2"/>
<string english="accessibility" translation="تسهيل الاستعمال" explanation="menu option"/>
<string english="Accessibility" translation="تسهيل الاستعمال" explanation="title" max="20" max_local="20"/>
<string english="Disable screen effects, enable slowdown modes or invincibility." translation="تعطيل بعض مؤثرات الشاشة، تفعيل أطوار لإبطاء اللعبة أو للحصانة من الأذى." explanation="" max="38*5" max_local="38*5"/>
Expand Down Expand Up @@ -446,6 +456,7 @@
<string english="ACTION = Space, Z, or V" translation="زر الفعل = المسافة أو Z أو V" explanation="title screen" max="38*3" max_local="38*3"/>
<string english="[Press {button} to return to editor]" translation="[نضغط {button} للعودة للمحرر]" explanation="`to editor` is sorta redundant" max="40" max_local="40"/>
<string english="- Press {button} to advance text -" translation="- نضغط {button} للتقدم في النص -" explanation="to dismiss a textbox. Expect `ACTION`" max="40" max_local="40"/>
<string english="- Tap screen to advance text -" translation="" explanation="to dismiss a textbox using touch controls" max="40" max_local="40"/>
<string english="Press {button} to continue" translation="نضغط {button} للمواصلة" explanation="Expect `ACTION`" max="34" max_local="34"/>
<string english="[Press {button} to unfreeze gameplay]" translation="[نضغط {button} لوقف تجميد اللعب العادي]" explanation="in level debugger: {button} makes everything start moving as normal. Limit is treacherous, expect TAB for {button}. Frozen is the initial state, so this is the first string of the two that users will see!" max="39" max_local="39"/>
<string english="[Press {button} to freeze gameplay]" translation="[نضغط {button} لتجميد اللعب العادي]" explanation="in level debugger: {button} makes everything stop moving. Limit is treacherous, expect TAB for {button}." max="39" max_local="39"/>
Expand Down
11 changes: 11 additions & 0 deletions desktop_version/lang/ca/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,16 @@
<string english="Re-enable the 1-frame input delay from previous versions of the game." translation="Reactiva el retard en l’entrada|d’un fotograma que hi havia|en versions anteriors del joc." explanation="input delay" max="38*3"/>
<string english="Input delay is ON" translation="El retard en l’entrada està ACTIVAT" explanation="" max="38*2"/>
<string english="Input delay is OFF" translation="El retard en l’entrada està DESACTIVAT" explanation="" max="38*2"/>
<string english="touch input" translation="" explanation="menu option"/>
<string english="Touch Input" translation="" explanation="title" max="20"/>
<string english="Change touch input options." translation="" explanation="" max="38*5"/>
<string english="control style" translation="" explanation="menu option"/>
<string english="Control Style" translation="" explanation="title" max="20"/>
<string english="Change the control style for touch input." translation="" explanation="" max="38*3"/>
<string english="ui scale" translation="" explanation="menu option"/>
<string english="UI Scale" translation="" explanation="title" max="20"/>
<string english="Change the scale of the UI buttons." translation="" explanation="" max="38*3"/>
<string english="Current scale: {scale}.{extra}x" translation="" explanation="scale and extra are both numbers. 1 and 5 show as 1.5" max="38*2"/>
<string english="accessibility" translation="accessibilitat" explanation="menu option"/>
<string english="Accessibility" translation="Accessibilitat" explanation="title" max="20"/>
<string english="Disable screen effects, enable slowdown modes or invincibility." translation="Desactiva efectes de pantalla, activa modes alentits o la invencibilitat." explanation="" max="38*5"/>
Expand Down Expand Up @@ -440,6 +450,7 @@
<string english="ACTION = Space, Z, or V" translation="Acció = Espai, Z o V" explanation="title screen" max="38*3"/>
<string english="[Press {button} to return to editor]" translation="[Prem {button} per a tornar a l’editor]" explanation="`to editor` is sorta redundant" max="40"/>
<string english="- Press {button} to advance text -" translation="- Prem {button} per a avançar el text -" explanation="to dismiss a textbox. Expect `ACTION`" max="40"/>
<string english="- Tap screen to advance text -" translation="" explanation="to dismiss a textbox using touch controls" max="40"/>
<string english="Press {button} to continue" translation="Prem {button} per a continuar" explanation="Expect `ACTION`" max="34"/>
<string english="[Press {button} to unfreeze gameplay]" translation="" explanation="in level debugger: {button} makes everything start moving as normal. Limit is treacherous, expect TAB for {button}. Frozen is the initial state, so this is the first string of the two that users will see!" max="39"/>
<string english="[Press {button} to freeze gameplay]" translation="" explanation="in level debugger: {button} makes everything stop moving. Limit is treacherous, expect TAB for {button}." max="39"/>
Expand Down
11 changes: 11 additions & 0 deletions desktop_version/lang/cy/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,16 @@
<string english="Re-enable the 1-frame input delay from previous versions of the game." translation="Ail-alluogi&apos;r oedi mewnbwn 1-ffrâm o fersiynau blaenorol y gêm." explanation="input delay" max="38*3"/>
<string english="Input delay is ON" translation="Mae oedi mewnbwn YMLAEN" explanation="" max="38*2"/>
<string english="Input delay is OFF" translation="Oedi mewnbwn yn BANT" explanation="" max="38*2"/>
<string english="touch input" translation="" explanation="menu option"/>
<string english="Touch Input" translation="" explanation="title" max="20"/>
<string english="Change touch input options." translation="" explanation="" max="38*5"/>
<string english="control style" translation="" explanation="menu option"/>
<string english="Control Style" translation="" explanation="title" max="20"/>
<string english="Change the control style for touch input." translation="" explanation="" max="38*3"/>
<string english="ui scale" translation="" explanation="menu option"/>
<string english="UI Scale" translation="" explanation="title" max="20"/>
<string english="Change the scale of the UI buttons." translation="" explanation="" max="38*3"/>
<string english="Current scale: {scale}.{extra}x" translation="" explanation="scale and extra are both numbers. 1 and 5 show as 1.5" max="38*2"/>
<string english="accessibility" translation="hygyrchedd" explanation="menu option"/>
<string english="Accessibility" translation="Hygyrchedd" explanation="title" max="20"/>
<string english="Disable screen effects, enable slowdown modes or invincibility." translation="Analluogi effeithiau sgrin, galluogi dulliau arafu neu anorchfygol." explanation="" max="38*5"/>
Expand Down Expand Up @@ -440,6 +450,7 @@
<string english="ACTION = Space, Z, or V" translation="GWEITHREDU = Bylchwr, Z, neu V" explanation="title screen" max="38*3"/>
<string english="[Press {button} to return to editor]" translation="[{button} i ddychwelyd i&apos;r golygydd]" explanation="`to editor` is sorta redundant" max="40"/>
<string english="- Press {button} to advance text -" translation="- Pwyswch {button} i sgipio&apos;r testun -" explanation="to dismiss a textbox. Expect `ACTION`" max="40"/>
<string english="- Tap screen to advance text -" translation="" explanation="to dismiss a textbox using touch controls" max="40"/>
<string english="Press {button} to continue" translation="Pwyswch {button} i barhau" explanation="Expect `ACTION`" max="34"/>
<string english="[Press {button} to unfreeze gameplay]" translation="" explanation="in level debugger: {button} makes everything start moving as normal. Limit is treacherous, expect TAB for {button}. Frozen is the initial state, so this is the first string of the two that users will see!" max="39"/>
<string english="[Press {button} to freeze gameplay]" translation="" explanation="in level debugger: {button} makes everything stop moving. Limit is treacherous, expect TAB for {button}." max="39"/>
Expand Down
11 changes: 11 additions & 0 deletions desktop_version/lang/de/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,16 @@
<string english="Re-enable the 1-frame input delay from previous versions of the game." translation="Reaktiviere die 1-Frame-Eingabeverzögerung aus früheren Versionen des Spiels." explanation="input delay" max="38*3"/>
<string english="Input delay is ON" translation="Eingabeverzögerung ist AN" explanation="" max="38*2"/>
<string english="Input delay is OFF" translation="Eingabeverzögerung ist AUS" explanation="" max="38*2"/>
<string english="touch input" translation="" explanation="menu option"/>
<string english="Touch Input" translation="" explanation="title" max="20"/>
<string english="Change touch input options." translation="" explanation="" max="38*5"/>
<string english="control style" translation="" explanation="menu option"/>
<string english="Control Style" translation="" explanation="title" max="20"/>
<string english="Change the control style for touch input." translation="" explanation="" max="38*3"/>
<string english="ui scale" translation="" explanation="menu option"/>
<string english="UI Scale" translation="" explanation="title" max="20"/>
<string english="Change the scale of the UI buttons." translation="" explanation="" max="38*3"/>
<string english="Current scale: {scale}.{extra}x" translation="" explanation="scale and extra are both numbers. 1 and 5 show as 1.5" max="38*2"/>
<string english="accessibility" translation="barrierefreiheit" explanation="menu option"/>
<string english="Accessibility" translation="Barrierefreiheit" explanation="title" max="20"/>
<string english="Disable screen effects, enable slowdown modes or invincibility." translation="Deaktiviere Bildschirmeffekte, aktiviere Verlangsamungsmodi oder Unbesiegbarkeit." explanation="" max="38*5"/>
Expand Down Expand Up @@ -440,6 +450,7 @@
<string english="ACTION = Space, Z, or V" translation="HANDLUNG = Leertaste, Z oder V" explanation="title screen" max="38*3"/>
<string english="[Press {button} to return to editor]" translation="[Kehre mit {button} zum Editor zurück]" explanation="`to editor` is sorta redundant" max="40"/>
<string english="- Press {button} to advance text -" translation="- Drücke {button} zum Fortsetzen -" explanation="to dismiss a textbox. Expect `ACTION`" max="40"/>
<string english="- Tap screen to advance text -" translation="" explanation="to dismiss a textbox using touch controls" max="40"/>
<string english="Press {button} to continue" translation="Drücke {button} zum Fortfahren" explanation="Expect `ACTION`" max="34"/>
<string english="[Press {button} to unfreeze gameplay]" translation="" explanation="in level debugger: {button} makes everything start moving as normal. Limit is treacherous, expect TAB for {button}. Frozen is the initial state, so this is the first string of the two that users will see!" max="39"/>
<string english="[Press {button} to freeze gameplay]" translation="" explanation="in level debugger: {button} makes everything stop moving. Limit is treacherous, expect TAB for {button}." max="39"/>
Expand Down
11 changes: 11 additions & 0 deletions desktop_version/lang/en/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,16 @@
<string english="Re-enable the 1-frame input delay from previous versions of the game." translation="" explanation="input delay" max="38*3"/>
<string english="Input delay is ON" translation="" explanation="" max="38*2"/>
<string english="Input delay is OFF" translation="" explanation="" max="38*2"/>
<string english="touch input" translation="" explanation="menu option"/>
<string english="Touch Input" translation="" explanation="title" max="20"/>
<string english="Change touch input options." translation="" explanation="" max="38*5"/>
<string english="control style" translation="" explanation="menu option"/>
<string english="Control Style" translation="" explanation="title" max="20"/>
<string english="Change the control style for touch input." translation="" explanation="" max="38*3"/>
<string english="ui scale" translation="" explanation="menu option"/>
<string english="UI Scale" translation="" explanation="title" max="20"/>
<string english="Change the scale of the UI buttons." translation="" explanation="" max="38*3"/>
<string english="Current scale: {scale}.{extra}x" translation="" explanation="scale and extra are both numbers. 1 and 5 show as 1.5" max="38*2"/>
<string english="accessibility" translation="" explanation="menu option"/>
<string english="Accessibility" translation="" explanation="title" max="20"/>
<string english="Disable screen effects, enable slowdown modes or invincibility." translation="" explanation="" max="38*5"/>
Expand Down Expand Up @@ -440,6 +450,7 @@
<string english="ACTION = Space, Z, or V" translation="" explanation="title screen" max="38*3"/>
<string english="[Press {button} to return to editor]" translation="" explanation="`to editor` is sorta redundant" max="40"/>
<string english="- Press {button} to advance text -" translation="" explanation="to dismiss a textbox. Expect `ACTION`" max="40"/>
<string english="- Tap screen to advance text -" translation="" explanation="to dismiss a textbox using touch controls" max="40"/>
<string english="Press {button} to continue" translation="" explanation="Expect `ACTION`" max="34"/>
<string english="[Press {button} to unfreeze gameplay]" translation="" explanation="in level debugger: {button} makes everything start moving as normal. Limit is treacherous, expect TAB for {button}. Frozen is the initial state, so this is the first string of the two that users will see!" max="39"/>
<string english="[Press {button} to freeze gameplay]" translation="" explanation="in level debugger: {button} makes everything stop moving. Limit is treacherous, expect TAB for {button}." max="39"/>
Expand Down
11 changes: 11 additions & 0 deletions desktop_version/lang/eo/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,16 @@
<string english="Re-enable the 1-frame input delay from previous versions of the game." translation="Reebligi la 1-kadran enigprokraston de pli-fruaj versioj de la ludo." explanation="input delay" max="38*3"/>
<string english="Input delay is ON" translation="Enigprokrasto estas ŜALTA" explanation="" max="38*2"/>
<string english="Input delay is OFF" translation="Enigprokrasto estas MALŜALTA" explanation="" max="38*2"/>
<string english="touch input" translation="" explanation="menu option"/>
<string english="Touch Input" translation="" explanation="title" max="20"/>
<string english="Change touch input options." translation="" explanation="" max="38*5"/>
<string english="control style" translation="" explanation="menu option"/>
<string english="Control Style" translation="" explanation="title" max="20"/>
<string english="Change the control style for touch input." translation="" explanation="" max="38*3"/>
<string english="ui scale" translation="" explanation="menu option"/>
<string english="UI Scale" translation="" explanation="title" max="20"/>
<string english="Change the scale of the UI buttons." translation="" explanation="" max="38*3"/>
<string english="Current scale: {scale}.{extra}x" translation="" explanation="scale and extra are both numbers. 1 and 5 show as 1.5" max="38*2"/>
<string english="accessibility" translation="alirebleco" explanation="menu option"/>
<string english="Accessibility" translation="Alirebleco" explanation="title" max="20"/>
<string english="Disable screen effects, enable slowdown modes or invincibility." translation="Malebligi ekranefikojn, ebligi malrapidigreĝimon aŭ nevundeblecon." explanation="" max="38*5"/>
Expand Down Expand Up @@ -440,6 +450,7 @@
<string english="ACTION = Space, Z, or V" translation="AGOKLAVO = Spaceto, Z aŭ V" explanation="title screen" max="38*3"/>
<string english="[Press {button} to return to editor]" translation="[Premu {button} por reveni al redaktilo]" explanation="`to editor` is sorta redundant" max="40"/>
<string english="- Press {button} to advance text -" translation="- Premu {button} por daŭrigi -" explanation="to dismiss a textbox. Expect `ACTION`" max="40"/>
<string english="- Tap screen to advance text -" translation="" explanation="to dismiss a textbox using touch controls" max="40"/>
<string english="Press {button} to continue" translation="Premu {button} por daŭrigi" explanation="Expect `ACTION`" max="34"/>
<string english="[Press {button} to unfreeze gameplay]" translation="[Premu {button} por malfrostigi ludon]" explanation="in level debugger: {button} makes everything start moving as normal. Limit is treacherous, expect TAB for {button}. Frozen is the initial state, so this is the first string of the two that users will see!" max="39"/>
<string english="[Press {button} to freeze gameplay]" translation="[Premu {button} por frostigi ludon]" explanation="in level debugger: {button} makes everything stop moving. Limit is treacherous, expect TAB for {button}." max="39"/>
Expand Down
Loading
Loading