godot 4.2

This commit is contained in:
BimDav
2023-11-20 11:36:06 +01:00
parent 7766dcb524
commit 6071c2253d
10 changed files with 61 additions and 48 deletions
+9
View File
@@ -1,6 +1,7 @@
[configuration]
entry_symbol = "sqlite_library_init"
compatibility_minimum = 4.1
[libraries]
@@ -10,6 +11,10 @@ windows.x86_64 = "res://addons/godot-sqlite/bin/libgdsqlite.windows.template_deb
windows.template_release.x86_64 = "res://addons/godot-sqlite/bin/libgdsqlite.windows.template_release.x86_64.dll"
linux.x86_64 = "res://addons/godot-sqlite/bin/libgdsqlite.linux.template_debug.x86_64.so"
linux.template_release.x86_64 = "res://addons/godot-sqlite/bin/libgdsqlite.linux.template_release.x86_64.so"
android.arm64 = "res://addons/godot-sqlite/bin/libgdsqlite.android.template_debug.arm64.so"
android.template_release.arm64 = "res://addons/godot-sqlite/bin/libgdsqlite.android.template_release.arm64.so"
android.x86_64 = "res://addons/godot-sqlite/bin/libgdsqlite.android.template_debug.x86_64.so"
android.template_release.x86_64 = "res://addons/godot-sqlite/bin/libgdsqlite.android.template_release.x86_64.so"
[dependencies]
@@ -19,3 +24,7 @@ windows.x86_64 = {}
windows.template_release.x86_64 = {}
linux.x86_64 = {}
linux.template_release.x86_64 = {}
android.arm64 = {}
android.template_release.arm64 = {}
android.x86_64 = {}
android.template_release.x86_64 = {}
+1 -1
View File
@@ -3,5 +3,5 @@
name="Godot SQLite"
description="GDNative wrapper for SQLite (Godot 4.X+), making it possible to use SQLite databases as data storage in all your future games."
author="Piet Bronders & Jeroen De Geeter"
version="4.0-rc1"
version="4.2"
script="godot-sqlite.gd"
Binary file not shown.
@@ -0,0 +1 @@
<?xml version="1.0" encoding="UTF-8"?><sqlb_project><db path="/Users/daviddehaene/Developer/Kalulu/language_resources/french/language.db" readonly="0" foreign_keys="1" case_sensitive_like="0" temp_store="0" wal_autocheckpoint="1000" synchronous="2"/><attached/><window><main_tabs open="structure browser pragmas query" current="3"/></window><tab_structure><column_width id="0" width="300"/><column_width id="1" width="0"/><column_width id="2" width="100"/><column_width id="3" width="1917"/><column_width id="4" width="0"/><expanded_item id="0" parent="1"/><expanded_item id="1" parent="1"/><expanded_item id="2" parent="1"/><expanded_item id="3" parent="1"/></tab_structure><tab_browse><current_table name="4,3:mainGPs"/><default_encoding codec=""/><browse_table_settings><table schema="main" name="GPs" show_row_id="0" encoding="" plot_x_axis="" unlock_view_pk="_rowid_"><sort/><column_widths><column index="1" value="29"/><column index="2" value="61"/><column index="3" value="56"/><column index="4" value="34"/></column_widths><filter_values/><conditional_formats/><row_id_formats/><display_formats/><hidden_columns/><plot_y_axes/><global_filter/></table></browse_table_settings></tab_browse><tab_sql><sql name="SQL 1">DELETE FROM Lessons</sql><current_tab id="0"/></tab_sql></sqlb_project>
+1 -1
View File
@@ -12,7 +12,7 @@ config_version=5
config/name="Kalulu"
run/main_scene="res://sources/menus/language_selection/package_checker.tscn"
config/features=PackedStringArray("4.0", "Forward Plus")
config/features=PackedStringArray("4.2", "Forward Plus")
config/icon="res://icon.svg"
[audio]
@@ -28,7 +28,7 @@ func _on_button_pressed(button_id: int) -> void:
var package_path: = "user://" + package_name
if not FileAccess.file_exists(package_path):
print("Package not found, download it from the server")
var downloader: Control = load(downloader_scene_path).instance()
var downloader: Control = load(downloader_scene_path).instantiate()
add_child(downloader)
downloader.download_package(package_name)
await downloader.completed
@@ -8,6 +8,8 @@ layout_mode = 3
anchors_preset = 15
anchor_right = 1.0
anchor_bottom = 1.0
grow_horizontal = 2
grow_vertical = 2
script = ExtResource("1")
[node name="MarginContainer" type="MarginContainer" parent="."]
+43 -43
View File
@@ -31,6 +31,45 @@
[ext_resource type="Texture2D" uid="uid://c3okdxpi317x5" path="res://assets/minigames/monkeys/graphic/gauge_icon_monkey_full.png" id="27_eee4l"]
[ext_resource type="Texture2D" uid="uid://bsmq426v8148w" path="res://assets/minigames/minigame_ui/graphic/button_next_disabled.png" id="27_wdcsn"]
[sub_resource type="Animation" id="Animation_qwriy"]
length = 0.001
tracks/0/type = "value"
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/path = NodePath("MainControl/Interface/StimulusTexture:size")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 0,
"values": [Vector2(250, 386)]
}
tracks/1/type = "value"
tracks/1/imported = false
tracks/1/enabled = true
tracks/1/path = NodePath("MainControl/Interface/StimulusTexture:position")
tracks/1/interp = 1
tracks/1/loop_wrap = true
tracks/1/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 0,
"values": [Vector2(101, 440)]
}
tracks/2/type = "value"
tracks/2/imported = false
tracks/2/enabled = true
tracks/2/path = NodePath("MainControl/Interface/StimulusTexture:modulate")
tracks/2/interp = 1
tracks/2/loop_wrap = true
tracks/2/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 0,
"values": [Color(1, 1, 1, 0)]
}
[sub_resource type="Animation" id="Animation_fr0k4"]
resource_name = "repeat_stimulus"
length = 0.5
@@ -83,45 +122,6 @@ tracks/3/keys = {
"values": [Color(1, 1, 1, 0), Color(1, 1, 1, 1)]
}
[sub_resource type="Animation" id="Animation_qwriy"]
length = 0.001
tracks/0/type = "value"
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/path = NodePath("MainControl/Interface/StimulusTexture:size")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 0,
"values": [Vector2(250, 386)]
}
tracks/1/type = "value"
tracks/1/imported = false
tracks/1/enabled = true
tracks/1/path = NodePath("MainControl/Interface/StimulusTexture:position")
tracks/1/interp = 1
tracks/1/loop_wrap = true
tracks/1/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 0,
"values": [Vector2(101, 440)]
}
tracks/2/type = "value"
tracks/2/imported = false
tracks/2/enabled = true
tracks/2/path = NodePath("MainControl/Interface/StimulusTexture:modulate")
tracks/2/interp = 1
tracks/2/loop_wrap = true
tracks/2/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 0,
"values": [Color(1, 1, 1, 0)]
}
[sub_resource type="AnimationLibrary" id="AnimationLibrary_umrx4"]
_data = {
"RESET": SubResource("Animation_qwriy"),
@@ -160,10 +160,10 @@ anchor_left = 0.5
anchor_top = 0.5
anchor_right = 0.5
anchor_bottom = 0.5
offset_left = 101.0
offset_top = 440.0
offset_right = 351.0
offset_bottom = 826.0
offset_left = 2661.0
offset_top = 2240.0
offset_right = 2911.0
offset_bottom = 2626.0
grow_horizontal = 2
grow_vertical = 2
texture = ExtResource("5_d6rvg")
+2 -1
View File
@@ -24,6 +24,7 @@ var words_path: = base_path + language + "/words/"
func _ready() -> void:
db.path = db_path
db.open_db()
_import_lessons()
func _exit_tree() -> void:
@@ -154,7 +155,7 @@ func _import_words() -> void:
func _import_lessons() -> void:
var file = FileAccess.open("res://data3/gp_list.json", FileAccess.READ)
var file = FileAccess.open("res://new_gp_list.json", FileAccess.READ)
var dict = JSON.parse_string(file.get_line())
for e in dict.values():
var g = e.GRAPHEME
+1 -1
View File
@@ -11,7 +11,7 @@ func save_logs(logs: Dictionary, folder_path: String, minigame_name: String, les
var file_path: = folder_path + minigame_name + ".tres"
if not ResourceLoader.exists(file_path):
var log_resource: LogResource = log_resource_class.instance()
var log_resource: LogResource = log_resource_class.new()
ResourceSaver.save(log_resource, file_path, ResourceSaver.FLAG_COMPRESS)
if not file_path in log_resources: