diff --git a/ressources/images/cgj_default_tile.svg.import b/ressources/images/cgj_default_tile.svg.import index 458288e..8fb7ddb 100644 --- a/ressources/images/cgj_default_tile.svg.import +++ b/ressources/images/cgj_default_tile.svg.import @@ -2,11 +2,7 @@ importer="texture" type="CompressedTexture2D" -<<<<<<< HEAD -uid="uid://2o4w65so8ahw" -======= -uid="uid://iwrdb61rkpsx" ->>>>>>> 9819eb73e1e97eb41a466d3202753cc9f8b5b0de +uid="uid://cxo6okqvrlmcm" path="res://.godot/imported/cgj_default_tile.svg-6f24db072965547b576ce8b63fbe7ec8.ctex" metadata={ "vram_texture": false diff --git a/ressources/images/cgj_tile_1.svg.import b/ressources/images/cgj_tile_1.svg.import index 725de42..abdbea6 100644 --- a/ressources/images/cgj_tile_1.svg.import +++ b/ressources/images/cgj_tile_1.svg.import @@ -2,11 +2,7 @@ importer="texture" type="CompressedTexture2D" -<<<<<<< HEAD -uid="uid://crl12jj80ttb3" -======= -uid="uid://d1d462gptgad8" ->>>>>>> 9819eb73e1e97eb41a466d3202753cc9f8b5b0de +uid="uid://v80prel4veu7" path="res://.godot/imported/cgj_tile_1.svg-6f1497fb2775a0586cdf5be113ac6ba6.ctex" metadata={ "vram_texture": false diff --git a/ressources/images/cgj_tile_2.svg.import b/ressources/images/cgj_tile_2.svg.import index 0909f8f..ccfbe05 100644 --- a/ressources/images/cgj_tile_2.svg.import +++ b/ressources/images/cgj_tile_2.svg.import @@ -2,11 +2,7 @@ importer="texture" type="CompressedTexture2D" -<<<<<<< HEAD -uid="uid://drnrvixq01dqp" -======= -uid="uid://rey6oul5tla0" ->>>>>>> 9819eb73e1e97eb41a466d3202753cc9f8b5b0de +uid="uid://mk5y67cnnt52" path="res://.godot/imported/cgj_tile_2.svg-1008c878b662a507cf2fef633a6dc4aa.ctex" metadata={ "vram_texture": false diff --git a/ressources/images/melodie.svg.import b/ressources/images/melodie.svg.import new file mode 100644 index 0000000..caad237 --- /dev/null +++ b/ressources/images/melodie.svg.import @@ -0,0 +1,37 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://d2xsoac8aj04t" +path="res://.godot/imported/melodie.svg-ecfd9dcee10605577243b0d1ee7f4d9d.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://ressources/images/melodie.svg" +dest_files=["res://.godot/imported/melodie.svg-ecfd9dcee10605577243b0d1ee7f4d9d.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 +svg/scale=1.0 +editor/scale_with_editor_scale=false +editor/convert_colors_with_editor_theme=false diff --git a/ressources/images/melodie_cote.svg.import b/ressources/images/melodie_cote.svg.import new file mode 100644 index 0000000..f664183 --- /dev/null +++ b/ressources/images/melodie_cote.svg.import @@ -0,0 +1,37 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dq361ap4pr3xd" +path="res://.godot/imported/melodie_cote.svg-56d367299f6b20fcd8d4a4272fc47b49.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://ressources/images/melodie_cote.svg" +dest_files=["res://.godot/imported/melodie_cote.svg-56d367299f6b20fcd8d4a4272fc47b49.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 +svg/scale=1.0 +editor/scale_with_editor_scale=false +editor/convert_colors_with_editor_theme=false diff --git a/ressources/images/melodie_dos.svg.import b/ressources/images/melodie_dos.svg.import new file mode 100644 index 0000000..a129fd1 --- /dev/null +++ b/ressources/images/melodie_dos.svg.import @@ -0,0 +1,37 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://omavnh8rpk5v" +path="res://.godot/imported/melodie_dos.svg-91db9e9be42318b83c3eb0349424d88c.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://ressources/images/melodie_dos.svg" +dest_files=["res://.godot/imported/melodie_dos.svg-91db9e9be42318b83c3eb0349424d88c.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 +svg/scale=1.0 +editor/scale_with_editor_scale=false +editor/convert_colors_with_editor_theme=false diff --git a/ressources/images/mur.svg.import b/ressources/images/mur.svg.import new file mode 100644 index 0000000..77ac1e8 --- /dev/null +++ b/ressources/images/mur.svg.import @@ -0,0 +1,37 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://ct1uc3ia58hu6" +path="res://.godot/imported/mur.svg-22ce837fbd48246b63d8c4e75bb552e8.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://ressources/images/mur.svg" +dest_files=["res://.godot/imported/mur.svg-22ce837fbd48246b63d8c4e75bb552e8.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 +svg/scale=1.0 +editor/scale_with_editor_scale=false +editor/convert_colors_with_editor_theme=false diff --git a/ressources/images/mur_coin.svg.import b/ressources/images/mur_coin.svg.import new file mode 100644 index 0000000..c160012 --- /dev/null +++ b/ressources/images/mur_coin.svg.import @@ -0,0 +1,37 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://csvcsvfqxkjp0" +path="res://.godot/imported/mur_coin.svg-0e46365f81d3cd161149134f550b926c.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://ressources/images/mur_coin.svg" +dest_files=["res://.godot/imported/mur_coin.svg-0e46365f81d3cd161149134f550b926c.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 +svg/scale=1.0 +editor/scale_with_editor_scale=false +editor/convert_colors_with_editor_theme=false diff --git a/ressources/images/notes1.svg.import b/ressources/images/notes1.svg.import new file mode 100644 index 0000000..32d5d31 --- /dev/null +++ b/ressources/images/notes1.svg.import @@ -0,0 +1,37 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://c73frc14qr0w3" +path="res://.godot/imported/notes1.svg-05599ff165daabbc180b820bf26ce696.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://ressources/images/notes1.svg" +dest_files=["res://.godot/imported/notes1.svg-05599ff165daabbc180b820bf26ce696.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 +svg/scale=1.0 +editor/scale_with_editor_scale=false +editor/convert_colors_with_editor_theme=false diff --git a/ressources/images/notes2.svg.import b/ressources/images/notes2.svg.import new file mode 100644 index 0000000..7972857 --- /dev/null +++ b/ressources/images/notes2.svg.import @@ -0,0 +1,37 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://72rnj7n2xues" +path="res://.godot/imported/notes2.svg-9228c0128101bb71b925c7f545a4230d.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://ressources/images/notes2.svg" +dest_files=["res://.godot/imported/notes2.svg-9228c0128101bb71b925c7f545a4230d.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 +svg/scale=1.0 +editor/scale_with_editor_scale=false +editor/convert_colors_with_editor_theme=false diff --git a/ressources/images/notes3.svg.import b/ressources/images/notes3.svg.import new file mode 100644 index 0000000..ddbcd66 --- /dev/null +++ b/ressources/images/notes3.svg.import @@ -0,0 +1,37 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://danes32mi7j73" +path="res://.godot/imported/notes3.svg-14fdb1ee54ee9b28399b35e67fe388e0.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://ressources/images/notes3.svg" +dest_files=["res://.godot/imported/notes3.svg-14fdb1ee54ee9b28399b35e67fe388e0.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 +svg/scale=1.0 +editor/scale_with_editor_scale=false +editor/convert_colors_with_editor_theme=false diff --git a/scenes/Room.tscn b/scenes/Room.tscn index 989978b..c429cd1 100644 --- a/scenes/Room.tscn +++ b/scenes/Room.tscn @@ -1,6 +1,7 @@ -[gd_scene load_steps=6 format=3 uid="uid://durhes43gex7a"] +[gd_scene load_steps=7 format=3 uid="uid://durhes43gex7a"] [ext_resource type="PackedScene" uid="uid://c7bfiw54rvaq2" path="res://scenes/player_melodie.tscn" id="1_cl1wt"] +[ext_resource type="Texture2D" uid="uid://cxo6okqvrlmcm" path="res://ressources/images/cgj_default_tile.svg" id="2_torsx"] [sub_resource type="WorldBoundaryShape2D" id="WorldBoundaryShape2D_1c4te"] normal = Vector2(0, 1) @@ -19,6 +20,15 @@ distance = -640.0 [node name="Room" type="Node2D"] +[node name="TextureRect" type="TextureRect" parent="."] +offset_left = -640.0 +offset_top = -360.0 +offset_right = -480.0 +offset_bottom = -280.0 +scale = Vector2(8, 8) +texture = ExtResource("2_torsx") +stretch_mode = 1 + [node name="Player_Melodie" parent="." instance=ExtResource("1_cl1wt")] [node name="StaticBody2D" type="StaticBody2D" parent="."]