fix android export

characters/Jean-Michel/Jean-Mechant.png.import

@@ -2,15 +2,15 @@
 
 importer="texture"
 type="StreamTexture"
-path="res://.import/Jean-Méchant.png-3130f56bcf194ab1e1085306a6af4c5f.stex"
+path="res://.import/Jean-Mechant.png-710f7eee4392d546699f140ede373d09.stex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://characters/Jean-Michel/Jean-Méchant.png"
+source_file="res://characters/Jean-Michel/Jean-Mechant.png"
-dest_files=[ "res://.import/Jean-Méchant.png-3130f56bcf194ab1e1085306a6af4c5f.stex" ]
+dest_files=[ "res://.import/Jean-Mechant.png-710f7eee4392d546699f140ede373d09.stex" ]
 
 [params]
 

dialogic/characters/character-1616658403.json

@@ -12,7 +12,7 @@
 	"portraits": [
 		{
 			"name": "Default",
-			"path": "res://characters/Jean-Michel/Jean-Méchant.png"
+			"path": "res://characters/Jean-Michel/Jean-Mechant.png"
 		},
 		{
 			"name": "Jean-Michel_batard",

export_presets.cfg

@@ -8,21 +8,20 @@ export_filter="all_resources"
 include_filter="*.json, *.cfg"
 exclude_filter=""
 export_path="build/linux/Serious-game-ethics.x86_64"
-patch_list=PoolStringArray(  )
 script_export_mode=1
 script_encryption_key=""
 
 [preset.0.options]
 
+custom_template/debug=""
+custom_template/release=""
+binary_format/64_bits=true
+binary_format/embed_pck=true
 texture_format/bptc=false
 texture_format/s3tc=true
 texture_format/etc=false
 texture_format/etc2=false
 texture_format/no_bptc_fallbacks=true
-binary_format/64_bits=true
-binary_format/embed_pck=true
-custom_template/release=""
-custom_template/debug=""
 
 [preset.1]
 
@@ -34,21 +33,96 @@ export_filter="all_resources"
 include_filter="*.json, *.cfg"
 exclude_filter=""
 export_path="../../Web/dialogic/index.html"
-patch_list=PoolStringArray(  )
 script_export_mode=1
 script_encryption_key=""
 
 [preset.1.options]
 
+custom_template/debug=""
+custom_template/release=""
+variant/export_type=0
 vram_texture_compression/for_desktop=true
 vram_texture_compression/for_mobile=false
 html/custom_html_shell=""
 html/head_include=""
-custom_template/release=""
+html/canvas_resize_policy=2
-custom_template/debug=""
+html/experimental_virtual_keyboard=false
 
 [preset.2]
 
+name="Windows Desktop"
+platform="Windows Desktop"
+runnable=true
+custom_features=""
+export_filter="all_resources"
+include_filter="*.json, *.cfg"
+exclude_filter=""
+export_path="build/windows/Serious-game-ethics.exe"
+script_export_mode=1
+script_encryption_key=""
+
+[preset.2.options]
+
+custom_template/debug=""
+custom_template/release=""
+binary_format/64_bits=true
+binary_format/embed_pck=true
+texture_format/bptc=false
+texture_format/s3tc=true
+texture_format/etc=false
+texture_format/etc2=false
+texture_format/no_bptc_fallbacks=true
+codesign/enable=false
+codesign/identity=""
+codesign/password=""
+codesign/timestamp=true
+codesign/timestamp_server_url=""
+codesign/digest_algorithm=1
+codesign/description=""
+codesign/custom_options=PoolStringArray(  )
+application/icon=""
+application/file_version=""
+application/product_version=""
+application/company_name=""
+application/product_name=""
+application/file_description=""
+application/copyright=""
+application/trademarks=""
+
+[preset.3]
+
+name="Mac OSX"
+platform="Mac OSX"
+runnable=true
+custom_features=""
+export_filter="all_resources"
+include_filter="*.json, *.cfg"
+exclude_filter=""
+export_path="build/macos/Serious-game-ethics.zip"
+script_export_mode=1
+script_encryption_key=""
+
+[preset.3.options]
+
+custom_template/debug=""
+custom_template/release=""
+application/name=""
+application/info="Made with Godot Engine"
+application/icon=""
+application/identifier=""
+application/signature=""
+application/short_version="1.0"
+application/version="1.0"
+application/copyright=""
+display/high_res=false
+privacy/camera_usage_description=""
+privacy/microphone_usage_description=""
+texture_format/s3tc=true
+texture_format/etc=false
+texture_format/etc2=false
+
+[preset.4]
+
 name="Android"
 platform="Android"
 runnable=true
@@ -56,51 +130,50 @@ custom_features=""
 export_filter="all_resources"
 include_filter="*.json, *.cfg"
 exclude_filter=""
-export_path="build/android/Serious-game-ethics.apk"
+export_path=""
-patch_list=PoolStringArray(  )
 script_export_mode=1
 script_encryption_key=""
 
-[preset.2.options]
+[preset.4.options]
 
-graphics/32_bits_framebuffer=true
-xr_features/xr_mode=0
-xr_features/degrees_of_freedom=0
-xr_features/hand_tracking=0
-xr_features/focus_awareness=false
-one_click_deploy/clear_previous_install=false
 custom_template/debug=""
 custom_template/release=""
 custom_template/use_custom_build=false
-command_line/extra_args=""
+custom_template/export_format=0
-version/code=1
+architectures/armeabi-v7a=true
-version/name="1.0"
+architectures/arm64-v8a=true
-package/unique_name="fr.insat.pirseriousgame"
+architectures/x86=false
-package/name=""
+architectures/x86_64=false
-package/signed=true
-screen/immersive_mode=true
-screen/orientation=0
-screen/support_small=true
-screen/support_normal=true
-screen/support_large=true
-screen/support_xlarge=true
-screen/opengl_debug=false
-launcher_icons/main_192x192=""
-launcher_icons/adaptive_foreground_432x432=""
-launcher_icons/adaptive_background_432x432=""
 keystore/debug="/home/vergnet/Godot/pir-serious-game-ethics/debug.keystore"
 keystore/debug_user="androiddebugkey"
 keystore/debug_password="android"
 keystore/release=""
 keystore/release_user=""
 keystore/release_password=""
+one_click_deploy/clear_previous_install=false
+version/code=1
+version/name="1.0"
+package/unique_name="org.godotengine.$genname"
+package/name=""
+package/signed=true
+launcher_icons/main_192x192=""
+launcher_icons/adaptive_foreground_432x432=""
+launcher_icons/adaptive_background_432x432=""
+graphics/32_bits_framebuffer=true
+graphics/opengl_debug=false
+xr_features/xr_mode=0
+xr_features/degrees_of_freedom=0
+xr_features/hand_tracking=0
+xr_features/focus_awareness=false
+screen/immersive_mode=true
+screen/support_small=true
+screen/support_normal=true
+screen/support_large=true
+screen/support_xlarge=true
+command_line/extra_args=""
 apk_expansion/enable=false
 apk_expansion/SALT=""
 apk_expansion/public_key=""
-architectures/armeabi-v7a=true
-architectures/arm64-v8a=true
-architectures/x86=true
-architectures/x86_64=true
 permissions/custom_permissions=PoolStringArray(  )
 permissions/access_checkin_properties=false
 permissions/access_coarse_location=false
@@ -247,78 +320,3 @@ permissions/write_sms=false
 permissions/write_social_stream=false
 permissions/write_sync_settings=false
 permissions/write_user_dictionary=false
-
-[preset.3]
-
-name="Windows Desktop"
-platform="Windows Desktop"
-runnable=true
-custom_features=""
-export_filter="all_resources"
-include_filter="*.json, *.cfg"
-exclude_filter=""
-export_path="build/windows/Serious-game-ethics.exe"
-patch_list=PoolStringArray(  )
-script_export_mode=1
-script_encryption_key=""
-
-[preset.3.options]
-
-texture_format/bptc=false
-texture_format/s3tc=true
-texture_format/etc=false
-texture_format/etc2=false
-texture_format/no_bptc_fallbacks=true
-binary_format/64_bits=true
-binary_format/embed_pck=true
-custom_template/release=""
-custom_template/debug=""
-codesign/enable=false
-codesign/identity=""
-codesign/password=""
-codesign/timestamp=true
-codesign/timestamp_server_url=""
-codesign/digest_algorithm=1
-codesign/description=""
-codesign/custom_options=PoolStringArray(  )
-application/icon=""
-application/file_version=""
-application/product_version=""
-application/company_name=""
-application/product_name=""
-application/file_description=""
-application/copyright=""
-application/trademarks=""
-
-[preset.4]
-
-name="Mac OSX"
-platform="Mac OSX"
-runnable=true
-custom_features=""
-export_filter="all_resources"
-include_filter="*.json, *.cfg"
-exclude_filter=""
-export_path="build/macos/Serious-game-ethics.zip"
-patch_list=PoolStringArray(  )
-script_export_mode=1
-script_encryption_key=""
-
-[preset.4.options]
-
-custom_template/debug=""
-custom_template/release=""
-application/name=""
-application/info="Made with Godot Engine"
-application/icon=""
-application/identifier=""
-application/signature=""
-application/short_version="1.0"
-application/version="1.0"
-application/copyright=""
-display/high_res=false
-privacy/camera_usage_description=""
-privacy/microphone_usage_description=""
-texture_format/s3tc=true
-texture_format/etc=false
-texture_format/etc2=false

mini-game/MiniGame.gd

@@ -2,7 +2,6 @@ extends Node
 
 signal game_over
 
-onready var background := $background
 onready var foreground := $foreground
 onready var spawner := $spawner
 onready var player := $player2

mini-game/ressources/sprites/obstacle/telephoneconference.png.import

@@ -2,15 +2,15 @@
 
 importer="texture"
 type="StreamTexture"
-path="res://.import/telephoneconférence.png-d66222ccce62dddf3b35154365531d21.stex"
+path="res://.import/telephoneconference.png-4897f00433c03eb9be8819b4c1e2a950.stex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://mini-game/ressources/sprites/obstacle/telephoneconférence.png"
+source_file="res://mini-game/ressources/sprites/obstacle/telephoneconference.png"
-dest_files=[ "res://.import/telephoneconférence.png-d66222ccce62dddf3b35154365531d21.stex" ]
+dest_files=[ "res://.import/telephoneconference.png-4897f00433c03eb9be8819b4c1e2a950.stex" ]
 
 [params]
 

mini-game/scenes/bonuses/bonus1.tscn

@@ -20,4 +20,5 @@ texture = ExtResource( 2 )
 shape = SubResource( 1 )
 
 [node name="notifier" type="VisibilityNotifier2D" parent="."]
+
 [connection signal="body_entered" from="pick_bonus" to="." method="_on_pick_bonus_body_entered"]

mini-game/scenes/obstacles/obstacle1.tscn

@@ -20,4 +20,5 @@ texture = ExtResource( 2 )
 shape = SubResource( 1 )
 
 [node name="notifier" type="VisibilityNotifier2D" parent="."]
+
 [connection signal="body_entered" from="collision_obstacle" to="." method="_on_collision_obstacle_body_entered"]

mini-game/scenes/obstacles/obstacle3.tscn

@@ -1,7 +1,7 @@
 [gd_scene load_steps=5 format=2]
 
 [ext_resource path="res://mini-game/scripts/obstacle1.gd" type="Script" id=1]
-[ext_resource path="res://mini-game/ressources/sprites/obstacle/telephoneconférence.png" type="Texture" id=2]
+[ext_resource path="res://mini-game/ressources/sprites/obstacle/telephoneconference.png" type="Texture" id=2]
 [ext_resource path="res://mini-game/scenes/effets/collision_obstacle.tscn" type="PackedScene" id=3]
 
 [sub_resource type="RectangleShape2D" id=1]

mini-game/scenes/spawner/spawner.tscn

@@ -21,4 +21,5 @@ wait_time = 2.094
 autostart = true
 
 [node name="items" type="Node2D" parent="."]
+
 [connection signal="timeout" from="Timer" to="." method="_on_Timer_timeout"]

project.godot

@@ -52,8 +52,6 @@ _global_script_class_icons={
 
 config/name="Serious Game on Ethics"
 run/main_scene="res://scenes/MainMenu.tscn"
-run/disable_stdout=true
-boot_splash/image="res://splashscreen/splashscreen.png"
 config/icon="res://icon/icon.png"
 
 [autoload]
@@ -73,7 +71,7 @@ window/stretch/aspect="keep"
 
 [editor_plugins]
 
-enabled=PoolStringArray( "Todo_Manager", "dialogic" )
+enabled=PoolStringArray( "res://addons/Todo_Manager/plugin.cfg", "res://addons/dialogic/plugin.cfg" )
 
 [gdnative]
 
@@ -91,13 +89,12 @@ ui_accept={
 dialogic_next={
 "deadzone": 0.5,
 "events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":32,"unicode":0,"echo":false,"script":null)
-, Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"button_mask":0,"position":Vector2( 0, 0 ),"global_position":Vector2( 0, 0 ),"factor":1.0,"button_index":1,"pressed":false,"doubleclick":false,"script":null)
+, Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"button_mask":0,"position":Vector2( 0, 0 ),"global_position":Vector2( 0, 0 ),"factor":1.0,"button_index":1,"pressed":false,"doubleclick":false,"script":null)
  ]
 }
 
 [rendering]
 
-quality/intended_usage/framebuffer_allocation=0
+quality/intended_usage/framebuffer_allocation=1
-quality/intended_usage/framebuffer_allocation.mobile=0
+quality/intended_usage/framebuffer_allocation.mobile=1
-quality/filters/msaa=1
 environment/default_environment="res://default_env.tres"

scenes/Main.gd

@@ -10,7 +10,7 @@ var USER_MUSIC = "res://music/utilisateur.ogg"
 
 func _ready():
 	dialogic_node = Dialogic.start_from_save('00_start')
-	add_child_below_node($MiniGame, dialogic_node)
+	add_child_below_node(mini_game, dialogic_node)
 	dialogic_node.connect('dialogic_signal', self, "_on_Dialogic_signal_received")
 	play_music()
 
@@ -59,4 +59,4 @@ func start_minigame():
 func _on_MiniGame_game_over(next_timeline: String):
 	dialogic_node = Dialogic.start(next_timeline, false)
 	dialogic_node.connect('dialogic_signal', self, "_on_Dialogic_signal_received")
-	add_child_below_node($MiniGame, dialogic_node)
+	add_child_below_node(mini_game, dialogic_node)

scenes/Main.tscn

@@ -10,4 +10,5 @@ script = ExtResource( 1 )
 [node name="MiniGame" parent="." instance=ExtResource( 3 )]
 
 [node name="UI" parent="." instance=ExtResource( 2 )]
+
 [connection signal="game_over" from="MiniGame" to="." method="_on_MiniGame_game_over"]

scenes/MainMenu.tscn

@@ -2,7 +2,7 @@
 
 [ext_resource path="res://characters/Evelyne/evelyne_satisfaite.png" type="Texture" id=1]
 [ext_resource path="res://characters/Patrick/Patrick sans Barbe/Pat_cool.png" type="Texture" id=2]
-[ext_resource path="res://characters/Jean-Michel/Jean-Méchant.png" type="Texture" id=3]
+[ext_resource path="res://characters/Jean-Michel/Jean-Mechant.png" type="Texture" id=3]
 [ext_resource path="res://backgrounds/bureauGroupe-1.jpg" type="Texture" id=4]
 [ext_resource path="res://styles/Panel.tres" type="StyleBox" id=5]
 [ext_resource path="res://scenes/typo/GameTitle.tscn" type="PackedScene" id=6]
@@ -195,6 +195,7 @@ margin_right = 1720.0
 margin_bottom = 1060.0
 text = "Serious Game on Ethics v0.1"
 align = 2
+
 [connection signal="pressed" from="MarginContainer/VBoxContainer/HBoxContainer/CenterContainer/Panel/MarginContainer/CenterContainer/VBoxContainer/NewGameButton" to="." method="_on_NewGameButton_pressed"]
 [connection signal="pressed" from="MarginContainer/VBoxContainer/HBoxContainer/CenterContainer/Panel/MarginContainer/CenterContainer/VBoxContainer/ContinueButton" to="." method="_on_ContinueButton_pressed"]
 [connection signal="pressed" from="MarginContainer/VBoxContainer/HBoxContainer/CenterContainer/Panel/MarginContainer/CenterContainer/VBoxContainer/MarginContainer/CreditsButton" to="." method="_on_CreditsButton_pressed"]

scenes/end-screen/EndRecap.tscn

@@ -15,7 +15,7 @@
 [ext_resource path="res://characters/Evelyne/evelyne_angry.png" type="Texture" id=13]
 [ext_resource path="res://styles/Panel.tres" type="StyleBox" id=14]
 [ext_resource path="res://characters/Jean-Michel/Jean-Michel_haineux3.png" type="Texture" id=15]
-[ext_resource path="res://characters/Jean-Michel/Jean-Méchant.png" type="Texture" id=16]
+[ext_resource path="res://characters/Jean-Michel/Jean-Mechant.png" type="Texture" id=16]
 [ext_resource path="res://images/end-circle-clock.png" type="Texture" id=17]
 [ext_resource path="res://images/end-circle-phone.png" type="Texture" id=18]
 [ext_resource path="res://images/end-circle-magnify.png" type="Texture" id=19]