Browse Source

fix android export

Arnaud Vergnet 5 months ago
parent
commit
17092006a3

characters/Jean-Michel/Jean-Méchant.png → characters/Jean-Michel/Jean-Mechant.png View File


characters/Jean-Michel/Jean-Méchant.png.import → characters/Jean-Michel/Jean-Mechant.png.import View File

@@ -2,15 +2,15 @@
2 2
 
3 3
 importer="texture"
4 4
 type="StreamTexture"
5
-path="res://.import/Jean-Méchant.png-3130f56bcf194ab1e1085306a6af4c5f.stex"
5
+path="res://.import/Jean-Mechant.png-710f7eee4392d546699f140ede373d09.stex"
6 6
 metadata={
7 7
 "vram_texture": false
8 8
 }
9 9
 
10 10
 [deps]
11 11
 
12
-source_file="res://characters/Jean-Michel/Jean-Méchant.png"
13
-dest_files=[ "res://.import/Jean-Méchant.png-3130f56bcf194ab1e1085306a6af4c5f.stex" ]
12
+source_file="res://characters/Jean-Michel/Jean-Mechant.png"
13
+dest_files=[ "res://.import/Jean-Mechant.png-710f7eee4392d546699f140ede373d09.stex" ]
14 14
 
15 15
 [params]
16 16
 

+ 1
- 1
dialogic/characters/character-1616658403.json View File

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

+ 106
- 108
export_presets.cfg View File

@@ -8,21 +8,20 @@ export_filter="all_resources"
8 8
 include_filter="*.json, *.cfg"
9 9
 exclude_filter=""
10 10
 export_path="build/linux/Serious-game-ethics.x86_64"
11
-patch_list=PoolStringArray(  )
12 11
 script_export_mode=1
13 12
 script_encryption_key=""
14 13
 
15 14
 [preset.0.options]
16 15
 
16
+custom_template/debug=""
17
+custom_template/release=""
18
+binary_format/64_bits=true
19
+binary_format/embed_pck=true
17 20
 texture_format/bptc=false
18 21
 texture_format/s3tc=true
19 22
 texture_format/etc=false
20 23
 texture_format/etc2=false
21 24
 texture_format/no_bptc_fallbacks=true
22
-binary_format/64_bits=true
23
-binary_format/embed_pck=true
24
-custom_template/release=""
25
-custom_template/debug=""
26 25
 
27 26
 [preset.1]
28 27
 
@@ -34,20 +33,95 @@ export_filter="all_resources"
34 33
 include_filter="*.json, *.cfg"
35 34
 exclude_filter=""
36 35
 export_path="../../Web/dialogic/index.html"
37
-patch_list=PoolStringArray(  )
38 36
 script_export_mode=1
39 37
 script_encryption_key=""
40 38
 
41 39
 [preset.1.options]
42 40
 
41
+custom_template/debug=""
42
+custom_template/release=""
43
+variant/export_type=0
43 44
 vram_texture_compression/for_desktop=true
44 45
 vram_texture_compression/for_mobile=false
45 46
 html/custom_html_shell=""
46 47
 html/head_include=""
48
+html/canvas_resize_policy=2
49
+html/experimental_virtual_keyboard=false
50
+
51
+[preset.2]
52
+
53
+name="Windows Desktop"
54
+platform="Windows Desktop"
55
+runnable=true
56
+custom_features=""
57
+export_filter="all_resources"
58
+include_filter="*.json, *.cfg"
59
+exclude_filter=""
60
+export_path="build/windows/Serious-game-ethics.exe"
61
+script_export_mode=1
62
+script_encryption_key=""
63
+
64
+[preset.2.options]
65
+
66
+custom_template/debug=""
47 67
 custom_template/release=""
68
+binary_format/64_bits=true
69
+binary_format/embed_pck=true
70
+texture_format/bptc=false
71
+texture_format/s3tc=true
72
+texture_format/etc=false
73
+texture_format/etc2=false
74
+texture_format/no_bptc_fallbacks=true
75
+codesign/enable=false
76
+codesign/identity=""
77
+codesign/password=""
78
+codesign/timestamp=true
79
+codesign/timestamp_server_url=""
80
+codesign/digest_algorithm=1
81
+codesign/description=""
82
+codesign/custom_options=PoolStringArray(  )
83
+application/icon=""
84
+application/file_version=""
85
+application/product_version=""
86
+application/company_name=""
87
+application/product_name=""
88
+application/file_description=""
89
+application/copyright=""
90
+application/trademarks=""
91
+
92
+[preset.3]
93
+
94
+name="Mac OSX"
95
+platform="Mac OSX"
96
+runnable=true
97
+custom_features=""
98
+export_filter="all_resources"
99
+include_filter="*.json, *.cfg"
100
+exclude_filter=""
101
+export_path="build/macos/Serious-game-ethics.zip"
102
+script_export_mode=1
103
+script_encryption_key=""
104
+
105
+[preset.3.options]
106
+
48 107
 custom_template/debug=""
108
+custom_template/release=""
109
+application/name=""
110
+application/info="Made with Godot Engine"
111
+application/icon=""
112
+application/identifier=""
113
+application/signature=""
114
+application/short_version="1.0"
115
+application/version="1.0"
116
+application/copyright=""
117
+display/high_res=false
118
+privacy/camera_usage_description=""
119
+privacy/microphone_usage_description=""
120
+texture_format/s3tc=true
121
+texture_format/etc=false
122
+texture_format/etc2=false
49 123
 
50
-[preset.2]
124
+[preset.4]
51 125
 
52 126
 name="Android"
53 127
 platform="Android"
@@ -56,51 +130,50 @@ custom_features=""
56 130
 export_filter="all_resources"
57 131
 include_filter="*.json, *.cfg"
58 132
 exclude_filter=""
59
-export_path="build/android/Serious-game-ethics.apk"
60
-patch_list=PoolStringArray(  )
133
+export_path=""
61 134
 script_export_mode=1
62 135
 script_encryption_key=""
63 136
 
64
-[preset.2.options]
137
+[preset.4.options]
65 138
 
66
-graphics/32_bits_framebuffer=true
67
-xr_features/xr_mode=0
68
-xr_features/degrees_of_freedom=0
69
-xr_features/hand_tracking=0
70
-xr_features/focus_awareness=false
71
-one_click_deploy/clear_previous_install=false
72 139
 custom_template/debug=""
73 140
 custom_template/release=""
74 141
 custom_template/use_custom_build=false
75
-command_line/extra_args=""
142
+custom_template/export_format=0
143
+architectures/armeabi-v7a=true
144
+architectures/arm64-v8a=true
145
+architectures/x86=false
146
+architectures/x86_64=false
147
+keystore/debug="/home/vergnet/Godot/pir-serious-game-ethics/debug.keystore"
148
+keystore/debug_user="androiddebugkey"
149
+keystore/debug_password="android"
150
+keystore/release=""
151
+keystore/release_user=""
152
+keystore/release_password=""
153
+one_click_deploy/clear_previous_install=false
76 154
 version/code=1
77 155
 version/name="1.0"
78
-package/unique_name="fr.insat.pirseriousgame"
156
+package/unique_name="org.godotengine.$genname"
79 157
 package/name=""
80 158
 package/signed=true
159
+launcher_icons/main_192x192=""
160
+launcher_icons/adaptive_foreground_432x432=""
161
+launcher_icons/adaptive_background_432x432=""
162
+graphics/32_bits_framebuffer=true
163
+graphics/opengl_debug=false
164
+xr_features/xr_mode=0
165
+xr_features/degrees_of_freedom=0
166
+xr_features/hand_tracking=0
167
+xr_features/focus_awareness=false
81 168
 screen/immersive_mode=true
82
-screen/orientation=0
83 169
 screen/support_small=true
84 170
 screen/support_normal=true
85 171
 screen/support_large=true
86 172
 screen/support_xlarge=true
87
-screen/opengl_debug=false
88
-launcher_icons/main_192x192=""
89
-launcher_icons/adaptive_foreground_432x432=""
90
-launcher_icons/adaptive_background_432x432=""
91
-keystore/debug="/home/vergnet/Godot/pir-serious-game-ethics/debug.keystore"
92
-keystore/debug_user="androiddebugkey"
93
-keystore/debug_password="android"
94
-keystore/release=""
95
-keystore/release_user=""
96
-keystore/release_password=""
173
+command_line/extra_args=""
97 174
 apk_expansion/enable=false
98 175
 apk_expansion/SALT=""
99 176
 apk_expansion/public_key=""
100
-architectures/armeabi-v7a=true
101
-architectures/arm64-v8a=true
102
-architectures/x86=true
103
-architectures/x86_64=true
104 177
 permissions/custom_permissions=PoolStringArray(  )
105 178
 permissions/access_checkin_properties=false
106 179
 permissions/access_coarse_location=false
@@ -247,78 +320,3 @@ permissions/write_sms=false
247 320
 permissions/write_social_stream=false
248 321
 permissions/write_sync_settings=false
249 322
 permissions/write_user_dictionary=false
250
-
251
-[preset.3]
252
-
253
-name="Windows Desktop"
254
-platform="Windows Desktop"
255
-runnable=true
256
-custom_features=""
257
-export_filter="all_resources"
258
-include_filter="*.json, *.cfg"
259
-exclude_filter=""
260
-export_path="build/windows/Serious-game-ethics.exe"
261
-patch_list=PoolStringArray(  )
262
-script_export_mode=1
263
-script_encryption_key=""
264
-
265
-[preset.3.options]
266
-
267
-texture_format/bptc=false
268
-texture_format/s3tc=true
269
-texture_format/etc=false
270
-texture_format/etc2=false
271
-texture_format/no_bptc_fallbacks=true
272
-binary_format/64_bits=true
273
-binary_format/embed_pck=true
274
-custom_template/release=""
275
-custom_template/debug=""
276
-codesign/enable=false
277
-codesign/identity=""
278
-codesign/password=""
279
-codesign/timestamp=true
280
-codesign/timestamp_server_url=""
281
-codesign/digest_algorithm=1
282
-codesign/description=""
283
-codesign/custom_options=PoolStringArray(  )
284
-application/icon=""
285
-application/file_version=""
286
-application/product_version=""
287
-application/company_name=""
288
-application/product_name=""
289
-application/file_description=""
290
-application/copyright=""
291
-application/trademarks=""
292
-
293
-[preset.4]
294
-
295
-name="Mac OSX"
296
-platform="Mac OSX"
297
-runnable=true
298
-custom_features=""
299
-export_filter="all_resources"
300
-include_filter="*.json, *.cfg"
301
-exclude_filter=""
302
-export_path="build/macos/Serious-game-ethics.zip"
303
-patch_list=PoolStringArray(  )
304
-script_export_mode=1
305
-script_encryption_key=""
306
-
307
-[preset.4.options]
308
-
309
-custom_template/debug=""
310
-custom_template/release=""
311
-application/name=""
312
-application/info="Made with Godot Engine"
313
-application/icon=""
314
-application/identifier=""
315
-application/signature=""
316
-application/short_version="1.0"
317
-application/version="1.0"
318
-application/copyright=""
319
-display/high_res=false
320
-privacy/camera_usage_description=""
321
-privacy/microphone_usage_description=""
322
-texture_format/s3tc=true
323
-texture_format/etc=false
324
-texture_format/etc2=false

+ 0
- 1
mini-game/MiniGame.gd View File

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

mini-game/ressources/sprites/obstacle/telephoneconférence.png → mini-game/ressources/sprites/obstacle/telephoneconference.png View File


mini-game/ressources/sprites/obstacle/telephoneconférence.png.import → mini-game/ressources/sprites/obstacle/telephoneconference.png.import View File

@@ -2,15 +2,15 @@
2 2
 
3 3
 importer="texture"
4 4
 type="StreamTexture"
5
-path="res://.import/telephoneconférence.png-d66222ccce62dddf3b35154365531d21.stex"
5
+path="res://.import/telephoneconference.png-4897f00433c03eb9be8819b4c1e2a950.stex"
6 6
 metadata={
7 7
 "vram_texture": false
8 8
 }
9 9
 
10 10
 [deps]
11 11
 
12
-source_file="res://mini-game/ressources/sprites/obstacle/telephoneconférence.png"
13
-dest_files=[ "res://.import/telephoneconférence.png-d66222ccce62dddf3b35154365531d21.stex" ]
12
+source_file="res://mini-game/ressources/sprites/obstacle/telephoneconference.png"
13
+dest_files=[ "res://.import/telephoneconference.png-4897f00433c03eb9be8819b4c1e2a950.stex" ]
14 14
 
15 15
 [params]
16 16
 

+ 1
- 0
mini-game/scenes/bonuses/bonus1.tscn View File

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

+ 1
- 0
mini-game/scenes/obstacles/obstacle1.tscn View File

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

+ 1
- 1
mini-game/scenes/obstacles/obstacle3.tscn View File

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

+ 1
- 0
mini-game/scenes/spawner/spawner.tscn View File

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

+ 4
- 7
project.godot View File

@@ -52,8 +52,6 @@ _global_script_class_icons={
52 52
 
53 53
 config/name="Serious Game on Ethics"
54 54
 run/main_scene="res://scenes/MainMenu.tscn"
55
-run/disable_stdout=true
56
-boot_splash/image="res://splashscreen/splashscreen.png"
57 55
 config/icon="res://icon/icon.png"
58 56
 
59 57
 [autoload]
@@ -73,7 +71,7 @@ window/stretch/aspect="keep"
73 71
 
74 72
 [editor_plugins]
75 73
 
76
-enabled=PoolStringArray( "Todo_Manager", "dialogic" )
74
+enabled=PoolStringArray( "res://addons/Todo_Manager/plugin.cfg", "res://addons/dialogic/plugin.cfg" )
77 75
 
78 76
 [gdnative]
79 77
 
@@ -91,13 +89,12 @@ ui_accept={
91 89
 dialogic_next={
92 90
 "deadzone": 0.5,
93 91
 "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)
94
-, 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)
92
+, 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)
95 93
  ]
96 94
 }
97 95
 
98 96
 [rendering]
99 97
 
100
-quality/intended_usage/framebuffer_allocation=0
101
-quality/intended_usage/framebuffer_allocation.mobile=0
102
-quality/filters/msaa=1
98
+quality/intended_usage/framebuffer_allocation=1
99
+quality/intended_usage/framebuffer_allocation.mobile=1
103 100
 environment/default_environment="res://default_env.tres"

+ 2
- 2
scenes/Main.gd View File

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

+ 1
- 0
scenes/Main.tscn View File

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

+ 2
- 1
scenes/MainMenu.tscn View File

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

+ 1
- 1
scenes/end-screen/EndRecap.tscn View File

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

Loading…
Cancel
Save