Merge branch 'main' into aleajactaest

This commit is contained in:
AleaJactaEst 2022-03-05 11:52:34 +01:00
commit f13e51ca5a
100 changed files with 984 additions and 503 deletions

View file

@ -10,7 +10,7 @@ Project to have a basic third person scene for Godot 4 where to move a character
## Godot version used ## Godot version used
Use only the official Alpha 2 Godot release : https://downloads.tuxfamily.org/godotengine/4.0/alpha2/ Use only the official Alpha 3 Godot release : https://downloads.tuxfamily.org/godotengine/4.0/alpha3/
## Tips & tricks ## Tips & tricks
@ -20,4 +20,4 @@ The simple grid used is based on 50x50cm squares to give an idea of the scale an
## Best practices ## Best practices
- use only snake case for names - use only snake_case for names, with no capitals

View file

@ -29,6 +29,6 @@ roughness/src_normal=""
process/fix_alpha_border=true process/fix_alpha_border=true
process/premult_alpha=false process/premult_alpha=false
process/normal_map_invert_y=false process/normal_map_invert_y=false
process/HDR_as_SRGB=false process/hdr_as_srgb=false
process/size_limit=0 process/size_limit=0
detect_3d/compress_to=1 detect_3d/compress_to=1

View file

@ -29,6 +29,6 @@ roughness/src_normal=""
process/fix_alpha_border=true process/fix_alpha_border=true
process/premult_alpha=false process/premult_alpha=false
process/normal_map_invert_y=false process/normal_map_invert_y=false
process/HDR_as_SRGB=false process/hdr_as_srgb=false
process/size_limit=0 process/size_limit=0
detect_3d/compress_to=1 detect_3d/compress_to=1

View file

@ -29,6 +29,6 @@ roughness/src_normal=""
process/fix_alpha_border=true process/fix_alpha_border=true
process/premult_alpha=false process/premult_alpha=false
process/normal_map_invert_y=false process/normal_map_invert_y=false
process/HDR_as_SRGB=false process/hdr_as_srgb=false
process/size_limit=0 process/size_limit=0
detect_3d/compress_to=1 detect_3d/compress_to=1

View file

@ -29,6 +29,6 @@ roughness/src_normal=""
process/fix_alpha_border=true process/fix_alpha_border=true
process/premult_alpha=false process/premult_alpha=false
process/normal_map_invert_y=false process/normal_map_invert_y=false
process/HDR_as_SRGB=false process/hdr_as_srgb=false
process/size_limit=0 process/size_limit=0
detect_3d/compress_to=1 detect_3d/compress_to=1

View file

@ -29,6 +29,6 @@ roughness/src_normal=""
process/fix_alpha_border=true process/fix_alpha_border=true
process/premult_alpha=false process/premult_alpha=false
process/normal_map_invert_y=false process/normal_map_invert_y=false
process/HDR_as_SRGB=false process/hdr_as_srgb=false
process/size_limit=0 process/size_limit=0
detect_3d/compress_to=1 detect_3d/compress_to=1

View file

@ -29,6 +29,6 @@ roughness/src_normal=""
process/fix_alpha_border=true process/fix_alpha_border=true
process/premult_alpha=false process/premult_alpha=false
process/normal_map_invert_y=false process/normal_map_invert_y=false
process/HDR_as_SRGB=false process/hdr_as_srgb=false
process/size_limit=0 process/size_limit=0
detect_3d/compress_to=1 detect_3d/compress_to=1

View file

@ -29,6 +29,6 @@ roughness/src_normal=""
process/fix_alpha_border=true process/fix_alpha_border=true
process/premult_alpha=false process/premult_alpha=false
process/normal_map_invert_y=false process/normal_map_invert_y=false
process/HDR_as_SRGB=false process/hdr_as_srgb=false
process/size_limit=0 process/size_limit=0
detect_3d/compress_to=1 detect_3d/compress_to=1

View file

@ -29,6 +29,6 @@ roughness/src_normal=""
process/fix_alpha_border=true process/fix_alpha_border=true
process/premult_alpha=false process/premult_alpha=false
process/normal_map_invert_y=false process/normal_map_invert_y=false
process/HDR_as_SRGB=false process/hdr_as_srgb=false
process/size_limit=0 process/size_limit=0
detect_3d/compress_to=1 detect_3d/compress_to=1

View file

@ -29,6 +29,6 @@ roughness/src_normal=""
process/fix_alpha_border=true process/fix_alpha_border=true
process/premult_alpha=false process/premult_alpha=false
process/normal_map_invert_y=false process/normal_map_invert_y=false
process/HDR_as_SRGB=false process/hdr_as_srgb=false
process/size_limit=0 process/size_limit=0
detect_3d/compress_to=1 detect_3d/compress_to=1

View file

@ -18,6 +18,7 @@ msdf_pixel_range=8
msdf_size=48 msdf_size=48
force_autohinter=false force_autohinter=false
hinting=1 hinting=1
subpixel_positioning=1
oversampling=0.0 oversampling=0.0
compress=true compress=true
opentype_feature_overrides={} opentype_feature_overrides={}

View file

@ -18,6 +18,7 @@ msdf_pixel_range=8
msdf_size=48 msdf_size=48
force_autohinter=false force_autohinter=false
hinting=1 hinting=1
subpixel_positioning=1
oversampling=0.0 oversampling=0.0
compress=true compress=true
opentype_feature_overrides={} opentype_feature_overrides={}

View file

@ -18,6 +18,7 @@ msdf_pixel_range=8
msdf_size=48 msdf_size=48
force_autohinter=false force_autohinter=false
hinting=1 hinting=1
subpixel_positioning=1
oversampling=0.0 oversampling=0.0
compress=true compress=true
opentype_feature_overrides={} opentype_feature_overrides={}

View file

@ -18,6 +18,7 @@ msdf_pixel_range=8
msdf_size=48 msdf_size=48
force_autohinter=false force_autohinter=false
hinting=1 hinting=1
subpixel_positioning=1
oversampling=0.0 oversampling=0.0
compress=true compress=true
opentype_feature_overrides={} opentype_feature_overrides={}

View file

@ -18,6 +18,7 @@ msdf_pixel_range=8
msdf_size=48 msdf_size=48
force_autohinter=false force_autohinter=false
hinting=1 hinting=1
subpixel_positioning=1
oversampling=0.0 oversampling=0.0
compress=true compress=true
opentype_feature_overrides={} opentype_feature_overrides={}

View file

@ -18,6 +18,7 @@ msdf_pixel_range=8
msdf_size=48 msdf_size=48
force_autohinter=false force_autohinter=false
hinting=1 hinting=1
subpixel_positioning=1
oversampling=0.0 oversampling=0.0
compress=true compress=true
opentype_feature_overrides={} opentype_feature_overrides={}

View file

@ -18,6 +18,7 @@ msdf_pixel_range=8
msdf_size=48 msdf_size=48
force_autohinter=false force_autohinter=false
hinting=1 hinting=1
subpixel_positioning=1
oversampling=0.0 oversampling=0.0
compress=true compress=true
opentype_feature_overrides={} opentype_feature_overrides={}

View file

@ -18,6 +18,7 @@ msdf_pixel_range=8
msdf_size=48 msdf_size=48
force_autohinter=false force_autohinter=false
hinting=1 hinting=1
subpixel_positioning=1
oversampling=0.0 oversampling=0.0
compress=true compress=true
opentype_feature_overrides={} opentype_feature_overrides={}

View file

@ -18,6 +18,7 @@ msdf_pixel_range=8
msdf_size=48 msdf_size=48
force_autohinter=false force_autohinter=false
hinting=1 hinting=1
subpixel_positioning=1
oversampling=0.0 oversampling=0.0
compress=true compress=true
opentype_feature_overrides={} opentype_feature_overrides={}

View file

@ -18,6 +18,7 @@ msdf_pixel_range=8
msdf_size=48 msdf_size=48
force_autohinter=false force_autohinter=false
hinting=1 hinting=1
subpixel_positioning=1
oversampling=0.0 oversampling=0.0
compress=true compress=true
opentype_feature_overrides={} opentype_feature_overrides={}

View file

@ -18,6 +18,7 @@ msdf_pixel_range=8
msdf_size=48 msdf_size=48
force_autohinter=false force_autohinter=false
hinting=1 hinting=1
subpixel_positioning=1
oversampling=0.0 oversampling=0.0
compress=true compress=true
opentype_feature_overrides={} opentype_feature_overrides={}

View file

@ -18,6 +18,7 @@ msdf_pixel_range=8
msdf_size=48 msdf_size=48
force_autohinter=false force_autohinter=false
hinting=1 hinting=1
subpixel_positioning=1
oversampling=0.0 oversampling=0.0
compress=true compress=true
opentype_feature_overrides={} opentype_feature_overrides={}

View file

@ -18,6 +18,7 @@ msdf_pixel_range=8
msdf_size=48 msdf_size=48
force_autohinter=false force_autohinter=false
hinting=1 hinting=1
subpixel_positioning=1
oversampling=0.0 oversampling=0.0
compress=true compress=true
opentype_feature_overrides={} opentype_feature_overrides={}

View file

@ -29,6 +29,6 @@ roughness/src_normal=""
process/fix_alpha_border=true process/fix_alpha_border=true
process/premult_alpha=false process/premult_alpha=false
process/normal_map_invert_y=false process/normal_map_invert_y=false
process/HDR_as_SRGB=false process/hdr_as_srgb=false
process/size_limit=0 process/size_limit=0
detect_3d/compress_to=1 detect_3d/compress_to=1

View file

@ -29,6 +29,6 @@ roughness/src_normal=""
process/fix_alpha_border=true process/fix_alpha_border=true
process/premult_alpha=false process/premult_alpha=false
process/normal_map_invert_y=false process/normal_map_invert_y=false
process/HDR_as_SRGB=false process/hdr_as_srgb=false
process/size_limit=0 process/size_limit=0
detect_3d/compress_to=1 detect_3d/compress_to=1

View file

@ -29,6 +29,6 @@ roughness/src_normal=""
process/fix_alpha_border=true process/fix_alpha_border=true
process/premult_alpha=false process/premult_alpha=false
process/normal_map_invert_y=false process/normal_map_invert_y=false
process/HDR_as_SRGB=false process/hdr_as_srgb=false
process/size_limit=0 process/size_limit=0
detect_3d/compress_to=1 detect_3d/compress_to=1

View file

@ -29,6 +29,6 @@ roughness/src_normal=""
process/fix_alpha_border=true process/fix_alpha_border=true
process/premult_alpha=false process/premult_alpha=false
process/normal_map_invert_y=false process/normal_map_invert_y=false
process/HDR_as_SRGB=false process/hdr_as_srgb=false
process/size_limit=0 process/size_limit=0
detect_3d/compress_to=1 detect_3d/compress_to=1

View file

@ -29,6 +29,6 @@ roughness/src_normal=""
process/fix_alpha_border=true process/fix_alpha_border=true
process/premult_alpha=false process/premult_alpha=false
process/normal_map_invert_y=false process/normal_map_invert_y=false
process/HDR_as_SRGB=false process/hdr_as_srgb=false
process/size_limit=0 process/size_limit=0
detect_3d/compress_to=1 detect_3d/compress_to=1

View file

@ -29,6 +29,6 @@ roughness/src_normal=""
process/fix_alpha_border=true process/fix_alpha_border=true
process/premult_alpha=false process/premult_alpha=false
process/normal_map_invert_y=false process/normal_map_invert_y=false
process/HDR_as_SRGB=false process/hdr_as_srgb=false
process/size_limit=0 process/size_limit=0
detect_3d/compress_to=1 detect_3d/compress_to=1

View file

@ -29,6 +29,6 @@ roughness/src_normal=""
process/fix_alpha_border=true process/fix_alpha_border=true
process/premult_alpha=false process/premult_alpha=false
process/normal_map_invert_y=false process/normal_map_invert_y=false
process/HDR_as_SRGB=false process/hdr_as_srgb=false
process/size_limit=0 process/size_limit=0
detect_3d/compress_to=1 detect_3d/compress_to=1

View file

@ -29,6 +29,6 @@ roughness/src_normal=""
process/fix_alpha_border=true process/fix_alpha_border=true
process/premult_alpha=false process/premult_alpha=false
process/normal_map_invert_y=false process/normal_map_invert_y=false
process/HDR_as_SRGB=false process/hdr_as_srgb=false
process/size_limit=0 process/size_limit=0
detect_3d/compress_to=1 detect_3d/compress_to=1

View file

@ -29,6 +29,6 @@ roughness/src_normal=""
process/fix_alpha_border=true process/fix_alpha_border=true
process/premult_alpha=false process/premult_alpha=false
process/normal_map_invert_y=false process/normal_map_invert_y=false
process/HDR_as_SRGB=false process/hdr_as_srgb=false
process/size_limit=0 process/size_limit=0
detect_3d/compress_to=1 detect_3d/compress_to=1

View file

@ -18,6 +18,7 @@ msdf_pixel_range=8
msdf_size=48 msdf_size=48
force_autohinter=false force_autohinter=false
hinting=1 hinting=1
subpixel_positioning=1
oversampling=0.0 oversampling=0.0
compress=true compress=true
opentype_feature_overrides={} opentype_feature_overrides={}

View file

@ -18,6 +18,7 @@ msdf_pixel_range=8
msdf_size=48 msdf_size=48
force_autohinter=false force_autohinter=false
hinting=1 hinting=1
subpixel_positioning=1
oversampling=0.0 oversampling=0.0
compress=true compress=true
opentype_feature_overrides={} opentype_feature_overrides={}

View file

@ -18,6 +18,7 @@ msdf_pixel_range=8
msdf_size=48 msdf_size=48
force_autohinter=false force_autohinter=false
hinting=1 hinting=1
subpixel_positioning=1
oversampling=0.0 oversampling=0.0
compress=true compress=true
opentype_feature_overrides={} opentype_feature_overrides={}

View file

@ -18,6 +18,7 @@ msdf_pixel_range=8
msdf_size=48 msdf_size=48
force_autohinter=false force_autohinter=false
hinting=1 hinting=1
subpixel_positioning=1
oversampling=0.0 oversampling=0.0
compress=true compress=true
opentype_feature_overrides={} opentype_feature_overrides={}

View file

@ -18,6 +18,7 @@ msdf_pixel_range=8
msdf_size=48 msdf_size=48
force_autohinter=false force_autohinter=false
hinting=1 hinting=1
subpixel_positioning=1
oversampling=0.0 oversampling=0.0
compress=true compress=true
opentype_feature_overrides={} opentype_feature_overrides={}

View file

@ -18,6 +18,7 @@ msdf_pixel_range=8
msdf_size=48 msdf_size=48
force_autohinter=false force_autohinter=false
hinting=1 hinting=1
subpixel_positioning=1
oversampling=0.0 oversampling=0.0
compress=true compress=true
opentype_feature_overrides={} opentype_feature_overrides={}

View file

@ -18,6 +18,7 @@ msdf_pixel_range=8
msdf_size=48 msdf_size=48
force_autohinter=false force_autohinter=false
hinting=1 hinting=1
subpixel_positioning=1
oversampling=0.0 oversampling=0.0
compress=true compress=true
opentype_feature_overrides={} opentype_feature_overrides={}

View file

@ -18,6 +18,7 @@ msdf_pixel_range=8
msdf_size=48 msdf_size=48
force_autohinter=false force_autohinter=false
hinting=1 hinting=1
subpixel_positioning=1
oversampling=0.0 oversampling=0.0
compress=true compress=true
opentype_feature_overrides={} opentype_feature_overrides={}

View file

@ -18,6 +18,7 @@ msdf_pixel_range=8
msdf_size=48 msdf_size=48
force_autohinter=false force_autohinter=false
hinting=1 hinting=1
subpixel_positioning=1
oversampling=0.0 oversampling=0.0
compress=true compress=true
opentype_feature_overrides={} opentype_feature_overrides={}

View file

@ -18,6 +18,7 @@ msdf_pixel_range=8
msdf_size=48 msdf_size=48
force_autohinter=false force_autohinter=false
hinting=1 hinting=1
subpixel_positioning=1
oversampling=0.0 oversampling=0.0
compress=true compress=true
opentype_feature_overrides={} opentype_feature_overrides={}

View file

@ -18,6 +18,7 @@ msdf_pixel_range=8
msdf_size=48 msdf_size=48
force_autohinter=false force_autohinter=false
hinting=1 hinting=1
subpixel_positioning=1
oversampling=0.0 oversampling=0.0
compress=true compress=true
opentype_feature_overrides={} opentype_feature_overrides={}

View file

@ -18,6 +18,7 @@ msdf_pixel_range=8
msdf_size=48 msdf_size=48
force_autohinter=false force_autohinter=false
hinting=1 hinting=1
subpixel_positioning=1
oversampling=0.0 oversampling=0.0
compress=true compress=true
opentype_feature_overrides={} opentype_feature_overrides={}

View file

@ -18,6 +18,7 @@ msdf_pixel_range=8
msdf_size=48 msdf_size=48
force_autohinter=false force_autohinter=false
hinting=1 hinting=1
subpixel_positioning=1
oversampling=0.0 oversampling=0.0
compress=true compress=true
opentype_feature_overrides={} opentype_feature_overrides={}

View file

@ -29,6 +29,6 @@ roughness/src_normal=""
process/fix_alpha_border=true process/fix_alpha_border=true
process/premult_alpha=false process/premult_alpha=false
process/normal_map_invert_y=false process/normal_map_invert_y=false
process/HDR_as_SRGB=false process/hdr_as_srgb=false
process/size_limit=0 process/size_limit=0
detect_3d/compress_to=1 detect_3d/compress_to=1

View file

@ -43,3 +43,73 @@ msgstr "Select theme"
msgid "Themes" msgid "Themes"
msgstr "Theme" msgstr "Theme"
msgid "EDIT_CONTROL/TITLE"
msgstr "Edit your control"
msgid "EDIT_CONTROL/SORT_BY_INPUT"
msgstr "Sort by input"
msgid "EDIT_CONTROL/RELOAD_SYSTEM_CONFIG"
msgstr "Reload system config"
msgid "EDIT_CONTROL/QUIT"
msgstr "Exit"
msgid "HUD/KEYS"
msgstr "Control"
msgid "HUD/THEMES"
msgstr "Themes"
msgid "HUD/LANGUAGES"
msgstr "Languages"
msgid "HUD/QUIT"
msgstr "Quit"
msgid "POPUP_CONFIRM_QUIT/TITLE"
msgstr "Please Confirm..."
msgid "POPUP_CONFIRM_QUIT/MESSAGE"
msgstr "Do you want quit?"
msgid "OK"
msgstr "OK"
msgid "Cancel"
msgstr "Cancel"
msgid "CONTROL_SELECT_TYPE/TITLE"
msgstr "Select type control"
msgid "CONTROL_SELECT_TYPE/KEY"
msgstr "Keyboard"
msgid "CONTROL_SELECT_TYPE/MOUSE"
msgstr "Button Mouse"
msgid "CONTROL_SELECT_TYPE/JOYPAD"
msgstr "Button Joypad"
msgid "CONTROL_SELECT_TYPE/QUIT"
msgstr "Cancel"
msgid "OPTION_DEFINE_INPUT/TITLE"
msgstr "Define input"
msgid "OPTION_DEFINE_INPUT/CANCEL"
msgstr "Cancel"
msgid "OPTION_DEFINE_INPUT/OK"
msgstr "OK"
msgid "OPTION_DEFINE_INPUT/MESSAGE_KEY"
msgstr "Please select your key"
msgid "OPTION_DEFINE_INPUT/MESSAGE_MOUSE"
msgstr "Please select your button mouse"
msgid "OPTION_DEFINE_INPUT/MESSAGE_JOYPAD"
msgstr "Please select your button joypad"

View file

@ -43,3 +43,72 @@ msgstr "Sélectionner le thème"
msgid "Themes" msgid "Themes"
msgstr "Thème" msgstr "Thème"
msgid "EDIT_CONTROL/TITLE"
msgstr "Modifier les contrôles"
msgid "EDIT_CONTROL/SORT_BY_INPUT"
msgstr "Trier par rapport aux entrées"
msgid "EDIT_CONTROL/RELOAD_SYSTEM_CONFIG"
msgstr "Recharger la configuration système"
msgid "EDIT_CONTROL/QUIT"
msgstr "Sortir"
msgid "HUD/KEYS"
msgstr "Contrôles"
msgid "HUD/THEMES"
msgstr "Thèmes"
msgid "HUD/LANGUAGES"
msgstr "Langue"
msgid "HUD/QUIT"
msgstr "Quitter"
msgid "POPUP_CONFIRM_QUIT/TITLE"
msgstr "Merci de confirmer"
msgid "POPUP_CONFIRM_QUIT/MESSAGE"
msgstr "Voulez-vous fermer le jeux ?"
msgid "OK"
msgstr "Valider"
msgid "Cancel"
msgstr "Annuler"
msgid "CONTROL_SELECT_TYPE/TITLE"
msgstr "Sélectionner le type de contrôle"
msgid "CONTROL_SELECT_TYPE/KEY"
msgstr "Clavier"
msgid "CONTROL_SELECT_TYPE/MOUSE"
msgstr "Bouton de souris"
msgid "CONTROL_SELECT_TYPE/JOYPAD"
msgstr "Bouton de manette"
msgid "CONTROL_SELECT_TYPE/QUIT"
msgstr "Sortir"
msgid "OPTION_DEFINE_INPUT/TITLE"
msgstr "Définir votre entrée"
msgid "OPTION_DEFINE_INPUT/CANCEL"
msgstr "Annuler"
msgid "OPTION_DEFINE_INPUT/OK"
msgstr "Valider"
msgid "OPTION_DEFINE_INPUT/MESSAGE_KEY"
msgstr "Merci d'appuyer sur une touche"
msgid "OPTION_DEFINE_INPUT/MESSAGE_MOUSE"
msgstr "Merci d'appuyer sur un bouton de la souris"
msgid "OPTION_DEFINE_INPUT/MESSAGE_JOYPAD"
msgstr "Merci d'appuyer sur un bouton de votre manette de jeux"

View file

@ -1,4 +1,4 @@
*#!/bin/bash #!/bin/bash
WORKDIR="$(dirname $(readlink -f $0))" WORKDIR="$(dirname $(readlink -f $0))"
function generate_locale() function generate_locale()

Binary file not shown.

View file

@ -34,3 +34,73 @@ msgstr ""
msgid "Themes" msgid "Themes"
msgstr "" msgstr ""
msgid "EDIT_CONTROL/TITLE"
msgstr ""
msgid "EDIT_CONTROL/SORT_BY_INPUT"
msgstr ""
msgid "EDIT_CONTROL/RELOAD_SYSTEM_CONFIG"
msgstr ""
msgid "EDIT_CONTROL/QUIT"
msgstr ""
msgid "HUD/KEYS"
msgstr ""
msgid "HUD/THEMES"
msgstr ""
msgid "HUD/LANGUAGES"
msgstr ""
msgid "HUD/QUIT"
msgstr ""
msgid "POPUP_CONFIRM_QUIT/TITLE"
msgstr ""
msgid "POPUP_CONFIRM_QUIT/MESSAGE"
msgstr ""
msgid "OK"
msgstr ""
msgid "Cancel"
msgstr ""
msgid "CONTROL_SELECT_TYPE/TITLE"
msgstr ""
msgid "CONTROL_SELECT_TYPE/KEY"
msgstr ""
msgid "CONTROL_SELECT_TYPE/MOUSE"
msgstr ""
msgid "CONTROL_SELECT_TYPE/JOYPAD"
msgstr ""
msgid "CONTROL_SELECT_TYPE/QUIT"
msgstr ""
msgid "OPTION_DEFINE_INPUT/TITLE"
msgstr ""
msgid "OPTION_DEFINE_INPUT/CANCEL"
msgstr ""
msgid "OPTION_DEFINE_INPUT/OK"
msgstr ""
msgid "OPTION_DEFINE_INPUT/MESSAGE_KEY"
msgstr ""
msgid "OPTION_DEFINE_INPUT/MESSAGE_MOUSE"
msgstr ""
msgid "OPTION_DEFINE_INPUT/MESSAGE_JOYPAD"
msgstr ""

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View file

@ -31,6 +31,6 @@ roughness/src_normal=""
process/fix_alpha_border=true process/fix_alpha_border=true
process/premult_alpha=false process/premult_alpha=false
process/normal_map_invert_y=false process/normal_map_invert_y=false
process/HDR_as_SRGB=false process/hdr_as_srgb=false
process/size_limit=0 process/size_limit=0
detect_3d/compress_to=0 detect_3d/compress_to=0

View file

@ -31,6 +31,6 @@ roughness/src_normal="res://maps/textures/base_ground_aa_01/base_ground_aa_01_no
process/fix_alpha_border=true process/fix_alpha_border=true
process/premult_alpha=false process/premult_alpha=false
process/normal_map_invert_y=false process/normal_map_invert_y=false
process/HDR_as_SRGB=false process/hdr_as_srgb=false
process/size_limit=0 process/size_limit=0
detect_3d/compress_to=0 detect_3d/compress_to=0

View file

@ -31,6 +31,6 @@ roughness/src_normal="res://maps/textures/base_ground_aa_01/base_ground_aa_01_no
process/fix_alpha_border=true process/fix_alpha_border=true
process/premult_alpha=false process/premult_alpha=false
process/normal_map_invert_y=false process/normal_map_invert_y=false
process/HDR_as_SRGB=false process/hdr_as_srgb=false
process/size_limit=0 process/size_limit=0
detect_3d/compress_to=0 detect_3d/compress_to=0

View file

@ -31,6 +31,6 @@ roughness/src_normal=""
process/fix_alpha_border=true process/fix_alpha_border=true
process/premult_alpha=false process/premult_alpha=false
process/normal_map_invert_y=false process/normal_map_invert_y=false
process/HDR_as_SRGB=false process/hdr_as_srgb=false
process/size_limit=0 process/size_limit=0
detect_3d/compress_to=0 detect_3d/compress_to=0

View file

@ -31,6 +31,6 @@ roughness/src_normal=""
process/fix_alpha_border=true process/fix_alpha_border=true
process/premult_alpha=false process/premult_alpha=false
process/normal_map_invert_y=false process/normal_map_invert_y=false
process/HDR_as_SRGB=false process/hdr_as_srgb=false
process/size_limit=0 process/size_limit=0
detect_3d/compress_to=0 detect_3d/compress_to=0

View file

@ -29,7 +29,7 @@ roughness/src_normal=""
process/fix_alpha_border=true process/fix_alpha_border=true
process/premult_alpha=false process/premult_alpha=false
process/normal_map_invert_y=false process/normal_map_invert_y=false
process/HDR_as_SRGB=false process/hdr_as_srgb=false
process/size_limit=0 process/size_limit=0
detect_3d/compress_to=1 detect_3d/compress_to=1
svg/scale=1.0 svg/scale=1.0

View file

@ -29,6 +29,6 @@ roughness/src_normal=""
process/fix_alpha_border=true process/fix_alpha_border=true
process/premult_alpha=false process/premult_alpha=false
process/normal_map_invert_y=false process/normal_map_invert_y=false
process/HDR_as_SRGB=false process/hdr_as_srgb=false
process/size_limit=0 process/size_limit=0
detect_3d/compress_to=1 detect_3d/compress_to=1

View file

@ -31,6 +31,6 @@ roughness/src_normal=""
process/fix_alpha_border=true process/fix_alpha_border=true
process/premult_alpha=false process/premult_alpha=false
process/normal_map_invert_y=false process/normal_map_invert_y=false
process/HDR_as_SRGB=false process/hdr_as_srgb=false
process/size_limit=0 process/size_limit=0
detect_3d/compress_to=0 detect_3d/compress_to=0

View file

@ -31,6 +31,6 @@ roughness/src_normal=""
process/fix_alpha_border=true process/fix_alpha_border=true
process/premult_alpha=false process/premult_alpha=false
process/normal_map_invert_y=false process/normal_map_invert_y=false
process/HDR_as_SRGB=false process/hdr_as_srgb=false
process/size_limit=0 process/size_limit=0
detect_3d/compress_to=0 detect_3d/compress_to=0

View file

@ -31,6 +31,6 @@ roughness/src_normal=""
process/fix_alpha_border=true process/fix_alpha_border=true
process/premult_alpha=false process/premult_alpha=false
process/normal_map_invert_y=false process/normal_map_invert_y=false
process/HDR_as_SRGB=false process/hdr_as_srgb=false
process/size_limit=0 process/size_limit=0
detect_3d/compress_to=0 detect_3d/compress_to=0

View file

@ -31,6 +31,6 @@ roughness/src_normal=""
process/fix_alpha_border=true process/fix_alpha_border=true
process/premult_alpha=false process/premult_alpha=false
process/normal_map_invert_y=false process/normal_map_invert_y=false
process/HDR_as_SRGB=false process/hdr_as_srgb=false
process/size_limit=0 process/size_limit=0
detect_3d/compress_to=0 detect_3d/compress_to=0

View file

@ -29,7 +29,7 @@ roughness/src_normal=""
process/fix_alpha_border=true process/fix_alpha_border=true
process/premult_alpha=false process/premult_alpha=false
process/normal_map_invert_y=false process/normal_map_invert_y=false
process/HDR_as_SRGB=false process/hdr_as_srgb=false
process/size_limit=0 process/size_limit=0
detect_3d/compress_to=1 detect_3d/compress_to=1
svg/scale=1.0 svg/scale=1.0

View file

@ -29,6 +29,6 @@ roughness/src_normal=""
process/fix_alpha_border=true process/fix_alpha_border=true
process/premult_alpha=false process/premult_alpha=false
process/normal_map_invert_y=false process/normal_map_invert_y=false
process/HDR_as_SRGB=false process/hdr_as_srgb=false
process/size_limit=0 process/size_limit=0
detect_3d/compress_to=1 detect_3d/compress_to=1

View file

@ -1,85 +1,87 @@
[gd_scene load_steps=2 format=3 uid="uid://cjklxedjnvc1c"] [gd_scene load_steps=2 format=3 uid="uid://cjklxedjnvc1c"]
[ext_resource type="PackedScene" uid="uid://dqy6r22nywdf8" path="res://player/character/import/development_character_animations_v7.glb" id="1_fjis3"] [ext_resource type="PackedScene" uid="uid://cixovgo1t2l8i" path="res://player/character/import/development_character_animations_v8.glb" id="1_c1shc"]
[node name="character" instance=ExtResource( "1_fjis3" )] [node name="development_character_animations_v8" instance=ExtResource( "1_c1shc" )]
[node name="Skeleton3D" parent="char_grp/rig" index="0"] [node name="Skeleton3D" parent="char_grp/rig" index="0"]
bones/2/position = Vector3(-0.0168953, 0.508946, 0.0291032) bones/2/position = Vector3(-0.15192, 0.141193, 0.458639)
bones/3/rotation = Quaternion(0.0770252, 0.0061187, -0.0212199, 0.996785) bones/2/rotation = Quaternion(-0.519517, -0.442971, 0.636258, 0.359241)
bones/5/position = Vector3(-0.338156, 0.447438, -0.124041) bones/3/rotation = Quaternion(-1.91462e-08, 0.0551514, -1.20863e-07, 0.998478)
bones/5/rotation = Quaternion(-0.307262, -0.314094, -0.387365, 0.810484) bones/7/position = Vector3(0.0914858, 0.0759587, 0.657651)
bones/6/rotation = Quaternion(-1.33212e-07, 0.587936, 2.74967e-07, 0.808907) bones/7/rotation = Quaternion(-0.271758, 0.626496, -0.507842, 0.525117)
bones/10/position = Vector3(0.00813095, 0.0408708, -0.108271) bones/10/position = Vector3(-0.100232, 0.070909, 0.658184)
bones/10/rotation = Quaternion(-0.0316695, 0.99443, 0.0903084, 0.0441596) bones/10/rotation = Quaternion(-0.269356, -0.603459, 0.515835, 0.54516)
bones/11/rotation = Quaternion(-0.0554995, 0.082172, -0.0341149, 0.994487) bones/13/position = Vector3(0.133484, 0.149241, 0.456913)
bones/12/rotation = Quaternion(-0.00305444, 0.025317, 0.0780189, 0.996626) bones/13/rotation = Quaternion(-0.502103, 0.436597, -0.652123, 0.363333)
bones/16/rotation = Quaternion(-0.556256, 0.383694, 0.301203, 0.672781) bones/16/rotation = Quaternion(2.94007e-09, -4.13647e-05, -1.54702e-08, 1)
bones/17/rotation = Quaternion(-0.141952, 0.0631606, 0.424369, 0.89206) bones/18/position = Vector3(0.176787, -0.0261384, 1.00934)
bones/21/rotation = Quaternion(-0.545859, -0.416195, -0.418758, 0.594526) bones/18/rotation = Quaternion(-0.463397, 0.418158, -0.389542, 0.677247)
bones/23/rotation = Quaternion(-0.0614123, -0.0911368, -0.507933, 0.854358) bones/21/rotation = Quaternion(-2.10322e-07, -0.040541, -2.75302e-07, 0.999178)
bones/26/rotation = Quaternion(-0.092396, -0.012508, -0.016474, 0.995508) bones/23/position = Vector3(-0.224224, -0.0374793, 1.04974)
bones/35/rotation = Quaternion(0.213681, -0.169249, -0.44672, 0.852136) bones/23/rotation = Quaternion(-0.422459, -0.330855, 0.405728, 0.739898)
bones/36/rotation = Quaternion(0.0247409, -0.037012, 0.820981, 0.569217) bones/24/rotation = Quaternion(-0.067789, -0.0294414, -0.0321138, 0.996748)
bones/38/rotation = Quaternion(0.453842, 0.608797, -0.453608, 0.466513) bones/27/rotation = Quaternion(-0.574211, 0.0203224, 0.0987876, 0.812471)
bones/39/rotation = Quaternion(0.00476178, 0.990816, 0.135133, 0.000459045) bones/30/rotation = Quaternion(-0.663777, 0.0235976, 0.0521688, 0.745736)
bones/40/rotation = Quaternion(0.296613, -3.00156e-08, -0.396533, 0.868782) bones/32/rotation = Quaternion(-0.361751, 0.00527711, 0.0430036, 0.931267)
bones/46/rotation = Quaternion(0.108501, 0.138792, 0.458381, 0.871121) bones/35/rotation = Quaternion(-0.474577, -0.0113585, 0.030631, 0.879608)
bones/47/rotation = Quaternion(0.0456323, -0.0606414, -0.827615, 0.556142) bones/38/rotation = Quaternion(-0.781749, -0.00433087, 0.0929099, 0.616618)
bones/49/rotation = Quaternion(0.280632, -0.521484, 0.48779, 0.641374) bones/40/rotation = Quaternion(-0.357714, 0.00928431, 0.0423253, 0.932826)
bones/51/rotation = Quaternion(0.179271, -2.5339e-08, 0.4356, 0.882108) bones/43/rotation = Quaternion(-0.508272, -0.0129833, 0.0348485, 0.860393)
bones/54/position = Vector3(0.312623, 0.437755, -0.109832) bones/46/rotation = Quaternion(-0.788088, 0.00548673, 0.0939959, 0.608319)
bones/54/rotation = Quaternion(-0.337628, 0.316336, 0.395958, 0.793194) bones/48/rotation = Quaternion(-0.396174, 0.00236768, 0.0475975, 0.916938)
bones/55/rotation = Quaternion(0.220858, -0.415893, -0.0365474, 0.88143) bones/51/rotation = Quaternion(-0.529658, 0.0176954, 0.0583603, 0.846016)
bones/58/rotation = Quaternion(-0.178058, -0.000701349, -0.0247728, 0.983708) bones/54/rotation = Quaternion(-0.686348, 0.000695461, 0.0817067, 0.722669)
bones/61/rotation = Quaternion(-0.102877, -0.00071574, -0.0123909, 0.994617) bones/56/rotation = Quaternion(-0.325638, 0.000781161, 0.0388156, 0.944697)
bones/63/rotation = Quaternion(-0.0472496, -0.000244748, -0.00575957, 0.998866) bones/59/rotation = Quaternion(0.0583021, -0.0664381, 0.18425, 0.978897)
bones/66/rotation = Quaternion(-0.234863, 0.000405445, -0.0293189, 0.971586) bones/62/rotation = Quaternion(-0.325608, 0.006726, -0.0201309, 0.945267)
bones/69/rotation = Quaternion(-0.0621532, 0.000344386, -0.00745976, 0.998039) bones/64/rotation = Quaternion(-0.476819, 0.0786276, -0.0477728, 0.874174)
bones/71/rotation = Quaternion(-0.0202359, -0.000526936, -0.00241824, 0.999792) bones/65/position = Vector3(-0.224224, -0.0374793, 1.04974)
bones/74/rotation = Quaternion(-0.118501, -0.00204265, -0.00167214, 0.99295) bones/65/rotation = Quaternion(-0.422458, -0.330855, 0.405728, 0.739898)
bones/77/rotation = Quaternion(-0.0608605, -6.15146e-05, -0.00731642, 0.998119) bones/68/rotation = Quaternion(-1.07016e-07, -0.0289177, 2.38612e-07, 0.999582)
bones/79/rotation = Quaternion(-0.0215469, -0.000118847, -0.0025894, 0.999765) bones/70/position = Vector3(0.0125341, -0.0113273, 1.3694)
bones/82/rotation = Quaternion(-0.045812, 0.0774554, -0.0426766, 0.995028) bones/71/rotation = Quaternion(-0.030377, 0.00768932, 0.00157884, 0.999508)
bones/85/rotation = Quaternion(-0.341894, -0.0505131, -0.00712847, 0.938353) bones/73/position = Vector3(-0.169314, -0.0399844, 1.15969)
bones/87/rotation = Quaternion(-0.112437, -0.0105561, -0.016501, 0.993466) bones/73/rotation = Quaternion(-0.469426, -0.259913, 0.519085, 0.665308)
bones/90/rotation = Quaternion(-0.226489, 0.0119206, 0.0152102, 0.973822) bones/76/position = Vector3(0.14906, -0.0284767, 1.12907)
bones/93/rotation = Quaternion(-0.0421871, 5.92849e-06, -0.00505668, 0.999097) bones/76/rotation = Quaternion(-0.514091, 0.35404, -0.475604, 0.619812)
bones/95/rotation = Quaternion(-0.00828159, -0.000121388, -0.000993767, 0.999965) bones/79/position = Vector3(-1.91301e-05, 0.0170883, 0.882974)
bones/96/position = Vector3(0.26788, -0.0799248, -0.461465) bones/79/rotation = Quaternion(0.0097308, -0.701742, -0.712346, 0.00508848)
bones/96/rotation = Quaternion(0.495633, 0.199817, 0.813215, 0.230442) bones/80/rotation = Quaternion(-0.0911941, -0.00258285, 0.000984978, 0.995829)
bones/97/rotation = Quaternion(8.85872e-08, 0.0024306, -5.89807e-10, 0.999997) bones/81/rotation = Quaternion(0.080616, 0.00590208, 0.00270844, 0.996724)
bones/101/position = Vector3(0.312623, 0.437755, -0.109832) bones/85/rotation = Quaternion(-0.562449, 0.324106, 0.455498, 0.609203)
bones/101/rotation = Quaternion(-0.337628, 0.316336, 0.395958, 0.793194) bones/86/rotation = Quaternion(-0.539888, -0.0493987, 0.199217, 0.81633)
bones/104/rotation = Quaternion(-2.57163e-07, -0.424214, -1.98708e-07, 0.905562) bones/90/rotation = Quaternion(0.105174, 0.00605959, 0.0129845, 0.994351)
bones/106/position = Vector3(-0.23823, 0.429048, -0.0548472) bones/92/rotation = Quaternion(-0.558722, -0.301251, -0.453266, 0.625802)
bones/106/rotation = Quaternion(-0.431817, 0.089361, 0.488602, 0.752872) bones/94/rotation = Quaternion(-0.508332, 0.0333607, -0.240729, 0.826157)
bones/109/position = Vector3(0.162602, -0.0317358, -0.27701) bones/104/rotation = Quaternion(0.105475, -3.10003e-08, -0.0774747, 0.991399)
bones/109/rotation = Quaternion(-0.381183, 0.322201, -0.682154, 0.53437) bones/107/rotation = Quaternion(0.0980113, -0.0899481, -0.0867249, 0.98731)
bones/112/position = Vector3(-0.253918, -0.103652, -0.463478) bones/108/rotation = Quaternion(-0.0310007, 0.0719017, 0.355743, 0.931298)
bones/112/rotation = Quaternion(0.433082, -0.134603, -0.846937, 0.277523) bones/110/rotation = Quaternion(0.470828, 0.517658, -0.563252, 0.439429)
bones/115/rotation = Quaternion(-1.31103e-07, 0.048314, 5.07712e-08, 0.998832) bones/111/rotation = Quaternion(0.00477382, 0.990276, 0.139034, 0.000545604)
bones/117/position = Vector3(-0.338156, 0.447438, -0.124041) bones/113/rotation = Quaternion(0.0834683, -2.99962e-08, 0.0769499, 0.993535)
bones/117/rotation = Quaternion(-0.307262, -0.314094, -0.387365, 0.810484) bones/116/rotation = Quaternion(0.0726204, 0.130697, 0.0872612, 0.984901)
bones/118/rotation = Quaternion(0.1203, 0.584517, 0.0686503, 0.799472) bones/117/rotation = Quaternion(0.0219061, -0.0761316, -0.353842, 0.931944)
bones/121/rotation = Quaternion(-0.0553657, 0.093504, 0.059485, 0.992297) bones/119/rotation = Quaternion(0.474683, -0.474536, 0.557822, 0.488187)
bones/124/rotation = Quaternion(-0.130073, 0.0138176, -0.00793818, 0.991376) bones/120/rotation = Quaternion(0.00478841, -0.989589, -0.143844, 0.000650865)
bones/126/rotation = Quaternion(0.0566031, -0.00251201, 0.0386277, 0.997646) bones/123/position = Vector3(0.176787, -0.0261384, 1.00934)
bones/129/rotation = Quaternion(0.000190053, -0.00104534, 0.00800264, 0.999968) bones/123/rotation = Quaternion(-0.463398, 0.418158, -0.389543, 0.677247)
bones/132/rotation = Quaternion(-0.0190412, 0.000132444, 0.00227098, 0.999816) bones/124/rotation = Quaternion(-0.0372554, -0.0374979, 0.122351, 0.991078)
bones/134/rotation = Quaternion(-0.0647147, 0.000386823, 0.00777492, 0.997873) bones/127/rotation = Quaternion(0.0189979, 0.0622678, -0.039629, 0.997091)
bones/137/rotation = Quaternion(0.00235471, -0.00315775, 0.0401739, 0.999185) bones/130/rotation = Quaternion(-0.352984, -0.0533485, -0.00972456, 0.934057)
bones/140/rotation = Quaternion(-0.0165778, 0.0003923, -0.0339278, 0.999287) bones/132/rotation = Quaternion(-0.300365, -0.0452239, -0.0234475, 0.952463)
bones/142/rotation = Quaternion(-0.0201405, 0.000293718, 0.00239391, 0.999794) bones/135/rotation = Quaternion(-0.541706, 0.00703879, -0.0505262, 0.839019)
bones/145/rotation = Quaternion(-0.0346762, 0.00433396, 0.039094, 0.998624) bones/138/rotation = Quaternion(-0.727666, -0.0050635, -0.0876433, 0.680291)
bones/148/rotation = Quaternion(-8.86981e-05, -4.99268e-07, 1.03173e-05, 1) bones/140/rotation = Quaternion(-0.340549, -0.00194645, -0.041411, 0.939312)
bones/150/rotation = Quaternion(-0.00112873, 2.94077e-05, 0.000133846, 0.999999) bones/143/rotation = Quaternion(-0.55521, 0.0120764, -0.0438172, 0.830467)
bones/153/rotation = Quaternion(-0.0254682, -0.00272336, 0.00153101, 0.999671) bones/146/rotation = Quaternion(-0.864959, 0.00479226, -0.103815, 0.490964)
bones/156/rotation = Quaternion(-0.000252583, 2.31054e-07, 2.96366e-05, 1) bones/148/rotation = Quaternion(-0.171698, -0.00446995, -0.0205173, 0.984926)
bones/159/position = Vector3(-0.147036, -0.0462964, -0.282602) bones/151/rotation = Quaternion(-0.55327, -0.021387, -0.0662289, 0.830089)
bones/159/rotation = Quaternion(-0.381505, -0.31016, 0.697233, 0.521652) bones/154/rotation = Quaternion(-0.69924, -0.000707518, -0.0840618, 0.709927)
bones/162/position = Vector3(0.20413, 0.430834, -0.0524523) bones/156/rotation = Quaternion(-0.281124, -0.000329501, -0.0339629, 0.95907)
bones/162/rotation = Quaternion(-0.438851, -0.149045, -0.528447, 0.711294) bones/159/rotation = Quaternion(-0.533238, 0.00141206, -0.0644206, 0.843508)
bones/162/rotation = Quaternion(-0.716109, 9.68884e-05, -0.0860518, 0.692664)
bones/164/rotation = Quaternion(-0.38892, -0.00569121, -0.0466897, 0.92007)
[node name="AnimationPlayer" parent="." index="1"] [node name="AnimationPlayer" parent="." index="1"]
autoplay = "CHAR_idle_bored" autoplay = "CHAR_idle_bored"

View file

@ -3,13 +3,13 @@
importer="scene" importer="scene"
importer_version=1 importer_version=1
type="PackedScene" type="PackedScene"
uid="uid://dqy6r22nywdf8" uid="uid://cixovgo1t2l8i"
path="res://.godot/imported/development_character_animations_v7.glb-0bcee6e0475e31da8b8360d6bd037189.scn" path="res://.godot/imported/development_character_animations_v8.glb-c86654431aa20c30d2880f1376ab2ec0.scn"
[deps] [deps]
source_file="res://player/character/import/development_character_animations_v7.glb" source_file="res://player/character/import/development_character_animations_v8.glb"
dest_files=["res://.godot/imported/development_character_animations_v7.glb-0bcee6e0475e31da8b8360d6bd037189.scn"] dest_files=["res://.godot/imported/development_character_animations_v8.glb-c86654431aa20c30d2880f1376ab2ec0.scn"]
[params] [params]
@ -27,6 +27,12 @@ animation/fps=30
import_script/path="" import_script/path=""
_subresources={ _subresources={
"animations": { "animations": {
"CHAR_falling_jump": {
"save_to_file/enabled": false,
"save_to_file/keep_custom_tracks": "",
"save_to_file/path": "",
"settings/loop_mode": 1
},
"CHAR_fly": { "CHAR_fly": {
"save_to_file/enabled": false, "save_to_file/enabled": false,
"save_to_file/keep_custom_tracks": "", "save_to_file/keep_custom_tracks": "",

View file

@ -18,6 +18,7 @@ config/features=PackedStringArray("4.0", "Vulkan Clustered")
[autoload] [autoload]
Themes="*res://scripts/themes.gd" Themes="*res://scripts/themes.gd"
Common="*res://scripts/common.gd"
[input] [input]

View file

@ -29,6 +29,6 @@ roughness/src_normal=""
process/fix_alpha_border=true process/fix_alpha_border=true
process/premult_alpha=false process/premult_alpha=false
process/normal_map_invert_y=false process/normal_map_invert_y=false
process/HDR_as_SRGB=false process/hdr_as_srgb=false
process/size_limit=0 process/size_limit=0
detect_3d/compress_to=1 detect_3d/compress_to=1

View file

@ -29,7 +29,7 @@ roughness/src_normal=""
process/fix_alpha_border=true process/fix_alpha_border=true
process/premult_alpha=false process/premult_alpha=false
process/normal_map_invert_y=false process/normal_map_invert_y=false
process/HDR_as_SRGB=false process/hdr_as_srgb=false
process/size_limit=0 process/size_limit=0
detect_3d/compress_to=1 detect_3d/compress_to=1
svg/scale=1.0 svg/scale=1.0

View file

@ -8,9 +8,11 @@ var action = null
func set_label( command ): func set_label( command ):
$Label.text = command $Label.text = command
func set_action( _action ): func set_action( _action ):
action = _action action = _action
func set_param(_action, _command, position): func set_param(_action, _command, position):
set_label(_command) set_label(_command)
set_action(_action) set_action(_action)
@ -21,5 +23,7 @@ func set_param(_action, _command, position):
$Add_front.visible = false $Add_front.visible = false
$Add.visible = true $Add.visible = true
func _on_add_pressed(): func _on_add_pressed():
emit_signal( "add_pressed", action, $Label.text ) emit_signal( "add_pressed", action, $Label.text )

View file

@ -7,9 +7,6 @@
anchor_right = 1.0 anchor_right = 1.0
anchor_bottom = 1.0 anchor_bottom = 1.0
script = ExtResource( "1_2cvgr" ) script = ExtResource( "1_2cvgr" )
__meta__ = {
"_edit_use_anchors_": false
}
[node name="Add_front" type="TextureButton" parent="."] [node name="Add_front" type="TextureButton" parent="."]
offset_right = 23.0 offset_right = 23.0
@ -30,3 +27,6 @@ offset_right = 1024.0
offset_bottom = 600.0 offset_bottom = 600.0
texture_normal = ExtResource( "2_f4wes" ) texture_normal = ExtResource( "2_f4wes" )
stretch_mode = 3 stretch_mode = 3
[connection signal="pressed" from="Add_front" to="." method="_on_add_pressed"]
[connection signal="pressed" from="Add" to="." method="_on_add_pressed"]

View file

@ -6,10 +6,10 @@ signal del_pressed( command, control, eventInput )
var command:String var command:String
var eventInput var eventInput
func set_param( command:String, control:String, param_comment:String, eventInput ): func set_param( _command:String, control:String, param_comment:String, _eventInput ):
self.command = command self.command = _command
$Label.text = control $Label.text = control
self.eventInput = eventInput self.eventInput = _eventInput
if param_comment.length() > 0: if param_comment.length() > 0:
$Comment.text = param_comment $Comment.text = param_comment
$Empty.visible = false $Empty.visible = false

View file

@ -9,9 +9,6 @@ anchor_bottom = 1.0
size_flags_horizontal = 3 size_flags_horizontal = 3
size_flags_vertical = 3 size_flags_vertical = 3
script = ExtResource( "1_dp231" ) script = ExtResource( "1_dp231" )
__meta__ = {
"_edit_use_anchors_": false
}
[node name="Empty" type="Label" parent="."] [node name="Empty" type="Label" parent="."]
offset_right = 329.0 offset_right = 329.0
@ -30,9 +27,9 @@ size_flags_vertical = 5
offset_left = 666.0 offset_left = 666.0
offset_right = 690.0 offset_right = 690.0
offset_bottom = 600.0 offset_bottom = 600.0
hint_tooltip = "Delete"
size_flags_horizontal = 5 size_flags_horizontal = 5
size_flags_vertical = 5 size_flags_vertical = 5
hint_tooltip = "Delete"
texture_normal = ExtResource( "2_r7srr" ) texture_normal = ExtResource( "2_r7srr" )
stretch_mode = 0 stretch_mode = 0
@ -42,3 +39,5 @@ offset_right = 1024.0
offset_bottom = 600.0 offset_bottom = 600.0
size_flags_horizontal = 3 size_flags_horizontal = 3
size_flags_vertical = 5 size_flags_vertical = 5
[connection signal="pressed" from="Del" to="." method="_on_del_pressed"]

View file

@ -1,5 +1,6 @@
extends Control extends Control
#signal reload_control
var control_system_conf = {} var control_system_conf = {}
@ -9,7 +10,11 @@ func _init():
func _ready(): func _ready():
pass $SelectType.connect("refresh_select_type_control", refresh.bind() )
func refresh():
configure_control()
func reload_control_system(): func reload_control_system():
@ -32,7 +37,7 @@ func reload_control_system():
if not foundAction: if not foundAction:
InputMap.erase_action(keyInput) InputMap.erase_action(keyInput)
continue continue
var listInput = InputMap.get_action_list(keyInput) var listInput = InputMap.action_get_events(keyInput)
for eventInput in listInput: for eventInput in listInput:
var foundEvent:bool = false var foundEvent:bool = false
var vis = get_dict_inputevent(eventInput) var vis = get_dict_inputevent(eventInput)
@ -42,6 +47,7 @@ func reload_control_system():
break break
if not foundEvent: if not foundEvent:
InputMap.action_erase_event(keyInput, eventInput) InputMap.action_erase_event(keyInput, eventInput)
configure_control()
func compare_dict_inputevent(ref, cmp): func compare_dict_inputevent(ref, cmp):
@ -79,16 +85,16 @@ func get_dict_inputevent(event):
func generate_inputevent(param): func generate_inputevent(param):
if param['type'] == 'InputEventKey': if param['type'] == 'InputEventKey':
var ele:InputEventKey = InputEventKey.new() var ele:InputEventKey = InputEventKey.new()
ele.set_physical_scancode(param['physical_scancode']) ele.set_keycode(param['keycode'])
ele.set_scancode(param['scancode']) ele.set_physical_keycode(param['physical_keycode'])
ele.set_echo(param['echo'])
if OS.get_ime_selection():
ele.set_unicode(param['unicode']) ele.set_unicode(param['unicode'])
ele.set_alt(param['alt']) ele.set_echo(param['echo'])
ele.set_command(param['command']) ele.set_alt_pressed(param['alt'])
ele.set_control(param['control']) ele.set_command_pressed(param['command'])
ele.set_metakey(param['meta']) ele.set_ctrl_pressed(param['control'])
ele.set_shift(param['shift']) ele.set_meta_pressed(param['meta'])
ele.set_shift_pressed(param['shift'])
ele.set_store_command(param['storing_command'])
return ele return ele
elif param['type'] == 'InputEventMouseButton': elif param['type'] == 'InputEventMouseButton':
var ele:InputEventMouseButton = InputEventMouseButton.new() var ele:InputEventMouseButton = InputEventMouseButton.new()
@ -111,82 +117,7 @@ func get_hash_inputevent(event):
head = 'j' head = 'j'
else: else:
head ='z' head ='z'
return head + str(get_string_input(event)) return head + str(Common.get_string_input(event))
func get_string_input_mousse_button(event:InputEventMouseButton):
match event.get_button_index():
1:
return "BUTTON_LEFT"
3:
return "BUTTON_MIDDLE"
2:
return "BUTTON_RIGHT"
4:
return "BUTTON_WHEEL_UP"
5:
return "BUTTON_WHEEL_DOWN"
6:
return "BUTTON_WHEEL_LEFT"
7:
return "BUTTON_WHEEL_RIGHT"
8:
return "BUTTON_XBUTTON1"
9:
return "BUTTON_XBUTTON2"
_:
return "MOUSSE BUTTON: " + str(event.get_button_index())
func get_string_input_joypad_button(event:InputEventJoypadButton):
match event.get_button_index():
0:
return "JOY_BUTTON_A"
1:
return "JOY_BUTTON_B"
2:
return "JOY_BUTTON_X"
3:
return "JOY_BUTTON_Y"
4:
return "JOY_BUTTON_BACK"
5:
return "JOY_BUTTON_GUIDE"
6:
return "JOY_BUTTON_START"
7:
return "JOY_BUTTON_LEFT_STICK"
8:
return "JOY_BUTTON_RIGHT_STICK"
9:
return "JOY_BUTTON_LEFT_SHOULDER"
10:
return "JOY_BUTTON_RIGHT_SHOULDER"
11:
return "JOY_BUTTON_DPAD_UP"
12:
return "JOY_BUTTON_DPAD_DOWN"
13:
return "JOY_BUTTON_DPAD_LEFT"
14:
return "JOY_BUTTON_DPAD_RIGHT"
_:
return "JOYPAD BUTTON: " + str(event.get_button_index())
func get_string_input_keyboard(event:InputEventKey):
return OS.get_keycode_string(event.keycode)
func get_string_input(event):
if event is InputEventKey:
return get_string_input_keyboard(event) # OS.get_scancode_string(event.get_scancode_with_modifiers())
elif event is InputEventMouseButton:
return get_string_input_mousse_button(event)
elif event is InputEventJoypadButton:
return get_string_input_joypad_button(event)
else:
return str(event)
func load_current_control(): func load_current_control():
@ -208,7 +139,8 @@ func configure_control():
func configure_control_sort_by_input(): func configure_control_sort_by_input():
#$Window/VBox/Input/Control for child in $Window/VBox/Input/Control.get_children():
child.queue_free()
var def = {} var def = {}
for action in InputMap.get_actions(): for action in InputMap.get_actions():
for z in InputMap.action_get_events(action): for z in InputMap.action_get_events(action):
@ -226,38 +158,56 @@ func configure_control_sort_by_input():
$Window/VBox/Input/Control.add_child( separator ) $Window/VBox/Input/Control.add_child( separator )
lastevent = zhash lastevent = zhash
if z is InputEventKey: if z is InputEventKey:
var item = preload( "res://scenes/controls/control_input.tscn" ).instantiate(1) #.instance() var item = preload( "res://scenes/controls/control_input.tscn" ).instantiate() #.instance()
item.set_param(action, get_string_input_keyboard(z), action, z) item.set_param(action, "Key: " + Common.get_string_input_keyboard(z), action, z)
#item.connect( "del_pressed", self, "_on_input_box_del_pressed" ) item.connect( "del_pressed", _on_input_box_del_pressed.bind() )
#print(action,':', z, z.get_scancode_with_modifiers(),' - ', z.get_scancode(), ' - ', z.unicode , ' - ', OS.get_scancode_string(z.get_scancode_with_modifiers()))
$Window/VBox/Input/Control.add_child( item ) $Window/VBox/Input/Control.add_child( item )
#$Window/VBox/Test.add_child( item )
elif z is InputEventMouseButton: elif z is InputEventMouseButton:
var item = preload( "res://scenes/controls/control_input.tscn" ).instantiate() var item = preload( "res://scenes/controls/control_input.tscn" ).instantiate()
#item.set_label(action, "Mouse Button: " + str(z.get_button_index())) item.set_param(action, "Mouse Button: " + Common.get_string_input_mousse_button(z), action, z)
item.set_param(action, "Mouse Button: " + get_string_input_mousse_button(z), action, z) item.connect( "del_pressed", _on_input_box_del_pressed.bind() )
#item.connect( "del_pressed", self, "_on_input_box_del_pressed" )
$Window/VBox/Input/Control.add_child( item ) $Window/VBox/Input/Control.add_child( item )
#print(action,':', z, z.get_button_mask(), ' - ', z.get_factor(), ' - ' , z.get_button_index() )
elif z is InputEventJoypadButton: elif z is InputEventJoypadButton:
#print(action,':', z, z.get_button_index() )
var item = preload( "res://scenes/controls/control_input.tscn" ).instantiate() var item = preload( "res://scenes/controls/control_input.tscn" ).instantiate()
#item.set_label(action, "Joypad Button: " + str(z.get_button_index())) item.set_param(action, "Joypad Button: " + Common.get_string_input_joypad_button(z), action, z)
item.set_param(action, "Joypad Button: " + get_string_input_joypad_button(z), action, z) item.connect( "del_pressed", _on_input_box_del_pressed.bind() )
#item.connect( "del_pressed", self, "_on_input_box_del_pressed" )
$Window/VBox/Input/Control.add_child( item ) $Window/VBox/Input/Control.add_child( item )
for action in InputMap.get_actions(): for action in InputMap.get_actions():
var separator = HSeparator.new() var separator = HSeparator.new()
$Window/VBox/Input/Control.add_child( separator ) $Window/VBox/Input/Control.add_child( separator )
var control_box = preload( "res://scenes/controls/control_function.tscn" ).instantiate() var control_box = preload( "res://scenes/controls/control_function.tscn" ).instantiate()
#control_box.set_label(key)
control_box.set_param(action, action, true) control_box.set_param(action, action, true)
#control_box.connect( "add_pressed", self, "_on_control_box_add_pressed" ) control_box.connect( "add_pressed", _on_control_box_add_pressed.bind() )
$Window/VBox/Input/Control.add_child( control_box ) $Window/VBox/Input/Control.add_child( control_box )
func configure_control_sort_by_categories(): func configure_control_sort_by_categories():
print("configure_control_sort_by_categories") for child in $Window/VBox/Input/Control.get_children():
child.queue_free()
for action in InputMap.get_actions():
var control_box = preload( "res://scenes/controls/control_function.tscn" ).instantiate()
control_box.set_param(action, action, false)
control_box.connect( "add_pressed", _on_control_box_add_pressed.bind() )
$Window/VBox/Input/Control.add_child( control_box )
var a = InputMap.action_get_events(action)
for z in a:
if z is InputEventKey:
var item = preload( "res://scenes/controls/control_input.tscn" ).instantiate()
item.set_param(action, "Key: " + Common.get_string_input_keyboard(z), "", z)
item.connect( "del_pressed", _on_input_box_del_pressed.bind() )
$Window/VBox/Input/Control.add_child( item )
elif z is InputEventMouseButton:
var item = preload( "res://scenes/controls/control_input.tscn" ).instantiate()
item.set_param(action, "Mouse Button: " + Common.get_string_input_mousse_button(z), "", z)
item.connect( "del_pressed", _on_input_box_del_pressed.bind() )
$Window/VBox/Input/Control.add_child( item )
elif z is InputEventJoypadButton:
var item = preload( "res://scenes/controls/control_input.tscn" ).instantiate()
item.set_param(action, "Joypad Button: " + Common.get_string_input_joypad_button(z), "", z)
item.connect( "del_pressed", _on_input_box_del_pressed.bind() )
$Window/VBox/Input/Control.add_child( item )
var separator = HSeparator.new()
$Window/VBox/Input/Control.add_child( separator )
func load_control_system(): func load_control_system():
@ -270,3 +220,15 @@ func _on_quit_pressed():
func _on_sort_by_input_pressed(): func _on_sort_by_input_pressed():
configure_control() configure_control()
func _on_input_box_del_pressed(command, control, inputevent):
InputMap.action_erase_event(command, inputevent)
configure_control()
func _on_control_box_add_pressed(action, command):
$SelectType.set_param(action, "signal_refresh" )
$SelectType/Window.popup_centered()
$SelectType/Window.visible = true

View file

@ -1,6 +1,7 @@
[gd_scene load_steps=2 format=3 uid="uid://cl8xk8w3jmta0"] [gd_scene load_steps=3 format=3 uid="uid://cl8xk8w3jmta0"]
[ext_resource type="Script" path="res://scenes/controls/controls.gd" id="1_2c8s6"] [ext_resource type="Script" path="res://scenes/controls/controls.gd" id="1_2c8s6"]
[ext_resource type="PackedScene" uid="uid://bhidap7eniou8" path="res://scenes/controls/select_type_control.tscn" id="2_ps0mu"]
[node name="Control" type="Control"] [node name="Control" type="Control"]
visible = false visible = false
@ -12,95 +13,67 @@ __meta__ = {
} }
[node name="Window" type="Window" parent="."] [node name="Window" type="Window" parent="."]
title = "Edit control" title = "EDIT_CONTROL/TITLE"
size = Vector2i(400, 500) position = Vector2i(25, 70)
size = Vector2i(800, 500)
visible = false visible = false
content_scale_mode = 1 content_scale_mode = 1
content_scale_aspect = 4 content_scale_aspect = 4
[node name="VBox" type="VBoxContainer" parent="Window"] [node name="VBox" type="VBoxContainer" parent="Window"]
offset_right = 40.0 anchor_right = 1.0
offset_bottom = 40.0 anchor_bottom = 1.0
grow_horizontal = 2
grow_vertical = 2
size_flags_horizontal = 6 size_flags_horizontal = 6
size_flags_vertical = 6 size_flags_vertical = 6
__meta__ = {
"_edit_use_custom_anchors": false
}
[node name="Menu" type="HBoxContainer" parent="Window/VBox"] [node name="Menu" type="HBoxContainer" parent="Window/VBox"]
offset_right = 301.0 offset_right = 1024.0
offset_bottom = 31.0 offset_bottom = 31.0
size_flags_horizontal = 3 size_flags_horizontal = 3
[node name="SortByInput" type="CheckBox" parent="Window/VBox/Menu"] [node name="SortByInput" type="CheckBox" parent="Window/VBox/Menu"]
offset_right = 127.0 offset_right = 510.0
offset_bottom = 31.0 offset_bottom = 31.0
size_flags_horizontal = 7 size_flags_horizontal = 7
text = "Sort by input" text = "EDIT_CONTROL/SORT_BY_INPUT"
[node name="Reload" type="Button" parent="Window/VBox/Menu"] [node name="Reload" type="Button" parent="Window/VBox/Menu"]
offset_left = 131.0 offset_left = 514.0
offset_right = 301.0 offset_right = 1024.0
offset_bottom = 31.0 offset_bottom = 31.0
size_flags_horizontal = 7 size_flags_horizontal = 7
text = "Reload system config" text = "EDIT_CONTROL/RELOAD_SYSTEM_CONFIG"
[node name="Input" type="ScrollContainer" parent="Window/VBox"] [node name="Input" type="ScrollContainer" parent="Window/VBox"]
offset_top = 35.0 offset_top = 35.0
offset_right = 301.0 offset_right = 1024.0
offset_bottom = 35.0 offset_bottom = 565.0
size_flags_horizontal = 3 size_flags_horizontal = 3
size_flags_vertical = 3 size_flags_vertical = 3
[node name="Control" type="VBoxContainer" parent="Window/VBox/Input"] [node name="Control" type="VBoxContainer" parent="Window/VBox/Input"]
offset_right = 301.0 offset_right = 1024.0
offset_bottom = 56.0 offset_bottom = 530.0
size_flags_horizontal = 3 size_flags_horizontal = 3
size_flags_vertical = 3 size_flags_vertical = 3
[node name="Label" type="Label" parent="Window/VBox/Input/Control"]
offset_right = 293.0
offset_bottom = 26.0
size_flags_horizontal = 3
size_flags_vertical = 7
text = "Test"
[node name="Label2" type="Label" parent="Window/VBox/Input/Control"]
offset_top = 30.0
offset_right = 293.0
offset_bottom = 56.0
size_flags_horizontal = 3
size_flags_vertical = 7
text = "Test"
[node name="Test" type="VBoxContainer" parent="Window/VBox"]
offset_top = 39.0
offset_right = 301.0
offset_bottom = 95.0
size_flags_horizontal = 3
size_flags_vertical = 3
[node name="Label3" type="Label" parent="Window/VBox/Test"]
offset_right = 301.0
offset_bottom = 26.0
size_flags_horizontal = 3
size_flags_vertical = 7
text = "Test"
[node name="Label4" type="Label" parent="Window/VBox/Test"]
offset_top = 30.0
offset_right = 301.0
offset_bottom = 56.0
size_flags_horizontal = 3
size_flags_vertical = 7
text = "Test"
[node name="Quit" type="Button" parent="Window/VBox"] [node name="Quit" type="Button" parent="Window/VBox"]
offset_top = 99.0 offset_left = 491.0
offset_right = 301.0 offset_top = 569.0
offset_bottom = 130.0 offset_right = 533.0
offset_bottom = 600.0
size_flags_horizontal = 6 size_flags_horizontal = 6
size_flags_vertical = 10 size_flags_vertical = 8
text = "Quit" text = "EDIT_CONTROL/QUIT"
[node name="SelectType" parent="." instance=ExtResource( "2_ps0mu" )]
[connection signal="close_requested" from="Window" to="." method="_on_quit_pressed"] [connection signal="close_requested" from="Window" to="." method="_on_quit_pressed"]
[connection signal="pressed" from="Window/VBox/Menu/SortByInput" to="." method="_on_sort_by_input_pressed"] [connection signal="pressed" from="Window/VBox/Menu/SortByInput" to="." method="_on_sort_by_input_pressed"]
[connection signal="pressed" from="Window/VBox/Menu/Reload" to="." method="reload_system_config"] [connection signal="pressed" from="Window/VBox/Menu/Reload" to="." method="reload_control_system"]
[connection signal="pressed" from="Window/VBox/Quit" to="." method="_on_quit_pressed"] [connection signal="pressed" from="Window/VBox/Quit" to="." method="_on_quit_pressed"]

View file

@ -0,0 +1,57 @@
extends Control
signal refresh_control_define_input
var type_event:int
var action = null
var last_event = null
func _ready():
type_event = 0
func set_disabled(state:bool):
$Window/v/h/Ok.disabled = state
func set_param(typeevent:int, _action):
var comment = ""
if typeevent == 1:
comment = "OPTION_DEFINE_INPUT/MESSAGE_KEY"
elif typeevent == 2:
comment = "OPTION_DEFINE_INPUT/MESSAGE_MOUSE"
else:
comment = "OPTION_DEFINE_INPUT/MESSAGE_JOYPAD"
type_event = typeevent
action = _action
last_event = null
$Window/v/result.set_text("")
$Window/v/label.set_text(comment)
set_disabled(true)
func _on_cancel_pressed():
$Window.hide()
func _on_ok_pressed():
$Window.hide()
InputMap.action_add_event(action, last_event)
emit_signal("refresh_control_define_input")
func _on_window_window_input(event):
if event.is_pressed() == false:
return
if (event is InputEventKey) && (self.type_event == 1):
last_event = event
$Window/v/result.set_text( Common.get_string_input(event) )
elif event is InputEventMouseButton and self.type_event == 2:
last_event = event
$Window/v/result.set_text( Common.get_string_input(event) )
elif event is InputEventJoypadButton and self.type_event == 3:
last_event = event
$Window/v/result.set_text( Common.get_string_input(event) )
if last_event != null:
set_disabled(false)

View file

@ -0,0 +1,55 @@
[gd_scene load_steps=2 format=3 uid="uid://cvmel2sx7qfvy"]
[ext_resource type="Script" path="res://scenes/controls/option_define_input.gd" id="1_pgm2r"]
[node name="Control" type="Control"]
anchor_right = 1.0
anchor_bottom = 1.0
script = ExtResource( "1_pgm2r" )
[node name="Window" type="Window" parent="."]
title = "OPTION_DEFINE_INPUT/TITLE"
position = Vector2i(30, 70)
visible = false
[node name="v" type="VBoxContainer" parent="Window"]
anchor_right = 1.0
anchor_bottom = 1.0
grow_horizontal = 2
grow_vertical = 2
__meta__ = {
"_edit_use_custom_anchors": false
}
[node name="label" type="Label" parent="Window/v"]
offset_right = 1024.0
offset_bottom = 26.0
text = "OPTION_DEFINE_INPUT/MESSAGE_KEY"
[node name="result" type="Label" parent="Window/v"]
offset_top = 30.0
offset_right = 1024.0
offset_bottom = 53.0
[node name="h" type="HBoxContainer" parent="Window/v"]
offset_top = 57.0
offset_right = 1024.0
offset_bottom = 88.0
size_flags_vertical = 3
[node name="Cancel" type="Button" parent="Window/v/h"]
offset_right = 255.0
offset_bottom = 31.0
size_flags_horizontal = 6
text = "OPTION_DEFINE_INPUT/CANCEL"
[node name="Ok" type="Button" parent="Window/v/h"]
offset_left = 259.0
offset_right = 476.0
offset_bottom = 31.0
size_flags_horizontal = 6
text = "OPTION_DEFINE_INPUT/OK"
[connection signal="window_input" from="Window" to="." method="_on_window_window_input"]
[connection signal="pressed" from="Window/v/h/Cancel" to="." method="_on_cancel_pressed"]
[connection signal="pressed" from="Window/v/h/Ok" to="." method="_on_ok_pressed"]

View file

@ -0,0 +1,47 @@
extends Control
signal refresh_select_type_control
var action = null
var signalrefresh = null
func _ready():
$DefineInput.connect("refresh_control_define_input", refresh.bind() )
func refresh():
emit_signal("refresh_select_type_control")
func set_param(_action, _signalrefresh):
self.action = _action
self.signalrefresh = _signalrefresh
func _on_quit_pressed():
$Window.visible = false
func get_input(typevent) -> void:
$Window.visible = false
if typevent == 1:
$DefineInput.set_param(typevent, self.action)
elif typevent == 2:
$DefineInput.set_param(typevent, self.action)
else:
$DefineInput.set_param(typevent, self.action)
$DefineInput/Window.popup_centered()
$DefineInput/Window.visible = true
func _on_key_pressed():
get_input(1)
func _on_mouse_pressed():
get_input(2)
func _on_joypad_pressed():
get_input(3)

View file

@ -0,0 +1,55 @@
[gd_scene load_steps=3 format=3 uid="uid://bhidap7eniou8"]
[ext_resource type="Script" path="res://scenes/controls/select_type_control.gd" id="1_7tgwh"]
[ext_resource type="PackedScene" uid="uid://cvmel2sx7qfvy" path="res://scenes/controls/option_define_input.tscn" id="2_44t37"]
[node name="Control" type="Control"]
anchor_right = 1.0
anchor_bottom = 1.0
script = ExtResource( "1_7tgwh" )
[node name="Window" type="Window" parent="."]
title = "CONTROL_SELECT_TYPE/TITLE"
position = Vector2i(30, 70)
size = Vector2i(300, 100)
visible = false
[node name="VBoxContainer" type="VBoxContainer" parent="Window"]
anchor_right = 1.0
anchor_bottom = 1.0
grow_horizontal = 2
grow_vertical = 2
__meta__ = {
"_edit_use_custom_anchors": false
}
[node name="Key" type="Button" parent="Window/VBoxContainer"]
offset_right = 1024.0
offset_bottom = 31.0
text = "CONTROL_SELECT_TYPE/KEY"
[node name="Mouse" type="Button" parent="Window/VBoxContainer"]
offset_top = 41.0
offset_right = 1024.0
offset_bottom = 72.0
text = "CONTROL_SELECT_TYPE/MOUSE"
[node name="Joypad" type="Button" parent="Window/VBoxContainer"]
offset_top = 82.0
offset_right = 1024.0
offset_bottom = 113.0
text = "CONTROL_SELECT_TYPE/JOYPAD"
[node name="Quit" type="Button" parent="Window/VBoxContainer"]
offset_top = 123.0
offset_right = 1024.0
offset_bottom = 154.0
text = "CONTROL_SELECT_TYPE/QUIT"
[node name="DefineInput" parent="." instance=ExtResource( "2_44t37" )]
[connection signal="close_requested" from="Window" to="." method="_on_quit_pressed"]
[connection signal="pressed" from="Window/VBoxContainer/Key" to="." method="_on_key_pressed"]
[connection signal="pressed" from="Window/VBoxContainer/Mouse" to="." method="_on_mouse_pressed"]
[connection signal="pressed" from="Window/VBoxContainer/Joypad" to="." method="_on_joypad_pressed"]
[connection signal="pressed" from="Window/VBoxContainer/Quit" to="." method="_on_quit_pressed"]

View file

@ -29,6 +29,6 @@ roughness/src_normal=""
process/fix_alpha_border=true process/fix_alpha_border=true
process/premult_alpha=false process/premult_alpha=false
process/normal_map_invert_y=false process/normal_map_invert_y=false
process/HDR_as_SRGB=false process/hdr_as_srgb=false
process/size_limit=0 process/size_limit=0
detect_3d/compress_to=1 detect_3d/compress_to=1

View file

@ -29,7 +29,7 @@ roughness/src_normal=""
process/fix_alpha_border=true process/fix_alpha_border=true
process/premult_alpha=false process/premult_alpha=false
process/normal_map_invert_y=false process/normal_map_invert_y=false
process/HDR_as_SRGB=false process/hdr_as_srgb=false
process/size_limit=0 process/size_limit=0
detect_3d/compress_to=1 detect_3d/compress_to=1
svg/scale=1.0 svg/scale=1.0

View file

@ -25,7 +25,6 @@ func _on_timer_timeout():
func _on_quit_pressed(): func _on_quit_pressed():
$ConfirmQuit.popup_centered() $ConfirmQuit.popup_centered()
$ConfirmQuit.visible = true $ConfirmQuit.visible = true
pass
func _on_confirmation_dialog_confirmed(): func _on_confirmation_dialog_confirmed():
@ -38,9 +37,8 @@ func _on_languages_pressed():
func _on_keys_pressed(): func _on_keys_pressed():
#$MenuControl/Window.popup_centered() $MenuControl.configure_control()
#$MenuControl/Window.visible = true $MenuControl/Window.visible = true
pass
func _on_themes_pressed(): func _on_themes_pressed():

View file

@ -1,6 +1,6 @@
[gd_scene load_steps=6 format=3 uid="uid://cdyi1a858p7em"] [gd_scene load_steps=6 format=3 uid="uid://cdyi1a858p7em"]
[ext_resource type="Theme" uid="uid://bi1js53ni6ehd" path="res://UI/themes/khanat/khanat.theme" id="1_iq3fo"] [ext_resource type="Theme" uid="uid://bi1js53ni6ehd" path="res://UI/themes/zbasu/zbasu.theme" id="1_iq3fo"]
[ext_resource type="Script" path="res://scenes/hud/hud.gd" id="1_s6f6d"] [ext_resource type="Script" path="res://scenes/hud/hud.gd" id="1_s6f6d"]
[ext_resource type="PackedScene" uid="uid://dpvequp5fv27k" path="res://scenes/languages/languages.tscn" id="2_um8fw"] [ext_resource type="PackedScene" uid="uid://dpvequp5fv27k" path="res://scenes/languages/languages.tscn" id="2_um8fw"]
[ext_resource type="PackedScene" uid="uid://cl8xk8w3jmta0" path="res://scenes/controls/controls.tscn" id="3_08xl7"] [ext_resource type="PackedScene" uid="uid://cl8xk8w3jmta0" path="res://scenes/controls/controls.tscn" id="3_08xl7"]
@ -11,9 +11,6 @@ anchor_right = 1.0
anchor_bottom = 1.0 anchor_bottom = 1.0
theme = ExtResource( "1_iq3fo" ) theme = ExtResource( "1_iq3fo" )
script = ExtResource( "1_s6f6d" ) script = ExtResource( "1_s6f6d" )
__meta__ = {
"_edit_use_anchors_": false
}
[node name="Message" type="HBoxContainer" parent="."] [node name="Message" type="HBoxContainer" parent="."]
anchor_right = 1.0 anchor_right = 1.0
@ -25,7 +22,7 @@ __meta__ = {
} }
[node name="Label" type="Label" parent="Message"] [node name="Label" type="Label" parent="Message"]
offset_left = 918.0 offset_left = 917.0
offset_right = 1024.0 offset_right = 1024.0
offset_bottom = 27.0 offset_bottom = 27.0
size_flags_vertical = 1 size_flags_vertical = 1
@ -48,24 +45,24 @@ __meta__ = {
offset_left = 510.0 offset_left = 510.0
offset_right = 554.0 offset_right = 554.0
offset_bottom = 40.0 offset_bottom = 40.0
text = "Keys" text = "HUD/KEYS"
[node name="Themes" type="Button" parent="Menu"] [node name="Themes" type="Button" parent="Menu"]
offset_right = 8.0 offset_right = 8.0
offset_bottom = 31.0 offset_bottom = 31.0
text = "Themes" text = "HUD/THEMES"
[node name="Languages" type="Button" parent="Menu"] [node name="Languages" type="Button" parent="Menu"]
offset_left = 492.0 offset_left = 492.0
offset_right = 574.0 offset_right = 574.0
offset_bottom = 40.0 offset_bottom = 40.0
text = "Languages" text = "HUD/LANGUAGES"
[node name="Quit" type="Button" parent="Menu"] [node name="Quit" type="Button" parent="Menu"]
offset_left = 578.0 offset_left = 578.0
offset_right = 619.0 offset_right = 619.0
offset_bottom = 40.0 offset_bottom = 40.0
text = "Quit" text = "HUD/QUIT"
[node name="Timer" type="Timer" parent="."] [node name="Timer" type="Timer" parent="."]
wait_time = 10.0 wait_time = 10.0
@ -73,7 +70,8 @@ one_shot = true
autostart = true autostart = true
[node name="ConfirmQuit" type="ConfirmationDialog" parent="."] [node name="ConfirmQuit" type="ConfirmationDialog" parent="."]
dialog_text = "Do you want quit?" title = "POPUP_CONFIRM_QUIT/TITLE"
dialog_text = "POPUP_CONFIRM_QUIT/MESSAGE"
[node name="MenuOption" parent="." instance=ExtResource( "2_um8fw" )] [node name="MenuOption" parent="." instance=ExtResource( "2_um8fw" )]
visible = false visible = false

View file

@ -52,7 +52,3 @@ func switch_to_ship(near_boat):
# $player.hide() # $player.hide()
# $player_ship.show() # $player_ship.show()
# $player_ship.set_process(true) # $player_ship.set_process(true)
# Called every frame. 'delta' is the elapsed time since the previous frame.
func _process(delta):
pass

View file

@ -39,7 +39,7 @@ func _on_quit_pressed():
$Window.visible = false $Window.visible = false
func _on_select_item_selected(index): func _on_select_item_selected(_index):
var pos = 0 var pos = 0
for key in Themes.THEMES_CONTROL: for key in Themes.THEMES_CONTROL:
if pos == $Window/VBoxContainer/Select.get_selected(): if pos == $Window/VBoxContainer/Select.get_selected():

96
scripts/common.gd Normal file
View file

@ -0,0 +1,96 @@
extends Node
func get_string_input_mousse_button(event:InputEventMouseButton) -> String:
match event.get_button_index():
1:
return "BUTTON_LEFT"
3:
return "BUTTON_MIDDLE"
2:
return "BUTTON_RIGHT"
4:
return "BUTTON_WHEEL_UP"
5:
return "BUTTON_WHEEL_DOWN"
6:
return "BUTTON_WHEEL_LEFT"
7:
return "BUTTON_WHEEL_RIGHT"
8:
return "BUTTON_XBUTTON1"
9:
return "BUTTON_XBUTTON2"
_:
return "MOUSSE BUTTON: " + str(event.get_button_index())
func get_string_input_joypad_button(event:InputEventJoypadButton) -> String:
match event.get_button_index():
0:
return "JOY_BUTTON_A"
1:
return "JOY_BUTTON_B"
2:
return "JOY_BUTTON_X"
3:
return "JOY_BUTTON_Y"
4:
return "JOY_BUTTON_BACK"
5:
return "JOY_BUTTON_GUIDE"
6:
return "JOY_BUTTON_START"
7:
return "JOY_BUTTON_LEFT_STICK"
8:
return "JOY_BUTTON_RIGHT_STICK"
9:
return "JOY_BUTTON_LEFT_SHOULDER"
10:
return "JOY_BUTTON_RIGHT_SHOULDER"
11:
return "JOY_BUTTON_DPAD_UP"
12:
return "JOY_BUTTON_DPAD_DOWN"
13:
return "JOY_BUTTON_DPAD_LEFT"
14:
return "JOY_BUTTON_DPAD_RIGHT"
_:
return "JOYPAD BUTTON: " + str(event.get_button_index())
func get_string_input_keyboard(event:InputEventKey) -> String:
var option:String = ""
if event.is_ctrl_pressed():
option += "Control+"
if event.is_shift_pressed():
option += "Shift+"
if event.is_alt_pressed():
option += "Alt+"
if event.is_meta_pressed():
option += "MetaKey+"
# if event.is_command_pressed():
# option += "Command+"
if event.keycode == 0:
if event.physical_keycode > 0:
return option + OS.get_keycode_string(event.physical_keycode)
else:
print("Error Event unknown keycode:" , event.keycode, ", physical_keycode:", event.physical_keycode)
return option + OS.get_keycode_string(event.keycode)
func get_string_input(event) -> String:
if event is InputEventKey:
return get_string_input_keyboard(event) # OS.get_scancode_string(event.get_scancode_with_modifiers())
elif event is InputEventMouseButton:
return get_string_input_mousse_button(event)
elif event is InputEventJoypadButton:
return get_string_input_joypad_button(event)
else:
return str(event)

View file

@ -5,7 +5,7 @@ declare HELP=0
declare EDITOR=0 declare EDITOR=0
declare FORCE=0 declare FORCE=0
declare WORKDIR="$(dirname $(readlink -f $0))" declare WORKDIR="$(dirname $(readlink -f $0))"
declare GODOT_SRC="https://downloads.tuxfamily.org/godotengine/4.0/alpha2/Godot_v4.0-alpha2_linux.64.zip" declare GODOT_SRC="https://downloads.tuxfamily.org/godotengine/4.0/alpha3/Godot_v4.0-alpha3_linux.64.zip"
declare OUTZIP="$WORKDIR/$(basename $GODOT_SRC)" declare OUTZIP="$WORKDIR/$(basename $GODOT_SRC)"
declare OPTION="" declare OPTION=""