From 941e2f6f28ac92d614a4398dc0ec3d5714151cc3 Mon Sep 17 00:00:00 2001 From: Mylloon Date: Wed, 7 Apr 2021 18:47:39 +0200 Subject: [PATCH 1/5] moving to assets folder --- {images => assets/images}/Batiment.png | 0 {images => assets/images}/Fond.png | 0 {images => assets/images}/Lumière.png | 0 {images => assets/images}/balle.png | 0 {images => assets/images}/joueur.png | 0 {images => assets/images}/mechant.png | 0 scenes/Ennemi.tscn | 2 +- scenes/Monde.tscn | 9 ++++++--- scenes/mur.tres | 2 +- 9 files changed, 8 insertions(+), 5 deletions(-) rename {images => assets/images}/Batiment.png (100%) rename {images => assets/images}/Fond.png (100%) rename {images => assets/images}/Lumière.png (100%) rename {images => assets/images}/balle.png (100%) rename {images => assets/images}/joueur.png (100%) rename {images => assets/images}/mechant.png (100%) diff --git a/images/Batiment.png b/assets/images/Batiment.png similarity index 100% rename from images/Batiment.png rename to assets/images/Batiment.png diff --git a/images/Fond.png b/assets/images/Fond.png similarity index 100% rename from images/Fond.png rename to assets/images/Fond.png diff --git a/images/Lumière.png b/assets/images/Lumière.png similarity index 100% rename from images/Lumière.png rename to assets/images/Lumière.png diff --git a/images/balle.png b/assets/images/balle.png similarity index 100% rename from images/balle.png rename to assets/images/balle.png diff --git a/images/joueur.png b/assets/images/joueur.png similarity index 100% rename from images/joueur.png rename to assets/images/joueur.png diff --git a/images/mechant.png b/assets/images/mechant.png similarity index 100% rename from images/mechant.png rename to assets/images/mechant.png diff --git a/scenes/Ennemi.tscn b/scenes/Ennemi.tscn index 9440357..519ad22 100644 --- a/scenes/Ennemi.tscn +++ b/scenes/Ennemi.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=5 format=2] -[ext_resource path="res://images/mechant.png" type="Texture" id=1] +[ext_resource path="res://assets/images/mechant.png" type="Texture" id=1] [ext_resource path="res://scripts/Ennemi.gd" type="Script" id=2] [sub_resource type="RectangleShape2D" id=1] diff --git a/scenes/Monde.tscn b/scenes/Monde.tscn index 496e22c..d3235ff 100644 --- a/scenes/Monde.tscn +++ b/scenes/Monde.tscn @@ -1,11 +1,14 @@ [gd_scene load_steps=10 format=2] -[ext_resource path="res://images/joueur.png" type="Texture" id=1] +[ext_resource path="res://assets/images/joueur.png" type="Texture" id=1] [ext_resource path="res://scripts/Joueur.gd" type="Script" id=2] [ext_resource path="res://scenes/Ennemi.tscn" type="PackedScene" id=3] -[ext_resource path="res://images/Fond.png" type="Texture" id=4] +[ext_resource path="res://assets/images/Fond.png" type="Texture" id=4] [ext_resource path="res://scenes/mur.tres" type="TileSet" id=5] -[ext_resource path="res://images/Lumière.png" type="Texture" id=6] +[ext_resource path="res://assets/images/Lumière.png" type="Texture" id=6] + + + [sub_resource type="RectangleShape2D" id=1] extents = Vector2( 8, 8 ) diff --git a/scenes/mur.tres b/scenes/mur.tres index 020b420..defa5c8 100644 --- a/scenes/mur.tres +++ b/scenes/mur.tres @@ -1,6 +1,6 @@ [gd_resource type="TileSet" load_steps=4 format=2] -[ext_resource path="res://images/Batiment.png" type="Texture" id=1] +[ext_resource path="res://assets/images/Batiment.png" type="Texture" id=1] [sub_resource type="OccluderPolygon2D" id=1] polygon = PoolVector2Array( -8.00226, -7.97379, -7.99188, 7.99426, 8.00321, 7.99426, 8.01305, -8.00083 ) From 322035d047f45bb245d97e98f22f3e95a6c00ba3 Mon Sep 17 00:00:00 2001 From: Mylloon Date: Wed, 7 Apr 2021 18:52:42 +0200 Subject: [PATCH 2/5] moving to assets folder --- {images => assets/images}/Batiment.png | 0 {images => assets/images}/Fond.png | 0 {images => assets/images}/Lumière.png | 0 {images => assets/images}/balle.png | 0 {images => assets/images}/joueur.png | 0 {images => assets/images}/mechant.png | 0 scenes/Balle.tscn | 2 +- scenes/Ennemi.tscn | 2 +- scenes/Monde.tscn | 13 +++++++++---- scenes/mur.tres | 2 +- scenes/mur.tscn | 2 +- 11 files changed, 13 insertions(+), 8 deletions(-) rename {images => assets/images}/Batiment.png (100%) rename {images => assets/images}/Fond.png (100%) rename {images => assets/images}/Lumière.png (100%) rename {images => assets/images}/balle.png (100%) rename {images => assets/images}/joueur.png (100%) rename {images => assets/images}/mechant.png (100%) diff --git a/images/Batiment.png b/assets/images/Batiment.png similarity index 100% rename from images/Batiment.png rename to assets/images/Batiment.png diff --git a/images/Fond.png b/assets/images/Fond.png similarity index 100% rename from images/Fond.png rename to assets/images/Fond.png diff --git a/images/Lumière.png b/assets/images/Lumière.png similarity index 100% rename from images/Lumière.png rename to assets/images/Lumière.png diff --git a/images/balle.png b/assets/images/balle.png similarity index 100% rename from images/balle.png rename to assets/images/balle.png diff --git a/images/joueur.png b/assets/images/joueur.png similarity index 100% rename from images/joueur.png rename to assets/images/joueur.png diff --git a/images/mechant.png b/assets/images/mechant.png similarity index 100% rename from images/mechant.png rename to assets/images/mechant.png diff --git a/scenes/Balle.tscn b/scenes/Balle.tscn index 2d50348..16f768f 100644 --- a/scenes/Balle.tscn +++ b/scenes/Balle.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=4 format=2] -[ext_resource path="res://images/balle.png" type="Texture" id=1] +[ext_resource path="res://assets/images/balle.png" type="Texture" id=1] [ext_resource path="res://scripts/Balle.gd" type="Script" id=2] [sub_resource type="RectangleShape2D" id=2] diff --git a/scenes/Ennemi.tscn b/scenes/Ennemi.tscn index 9440357..519ad22 100644 --- a/scenes/Ennemi.tscn +++ b/scenes/Ennemi.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=5 format=2] -[ext_resource path="res://images/mechant.png" type="Texture" id=1] +[ext_resource path="res://assets/images/mechant.png" type="Texture" id=1] [ext_resource path="res://scripts/Ennemi.gd" type="Script" id=2] [sub_resource type="RectangleShape2D" id=1] diff --git a/scenes/Monde.tscn b/scenes/Monde.tscn index 496e22c..6179b7e 100644 --- a/scenes/Monde.tscn +++ b/scenes/Monde.tscn @@ -1,11 +1,12 @@ -[gd_scene load_steps=10 format=2] +[gd_scene load_steps=11 format=2] -[ext_resource path="res://images/joueur.png" type="Texture" id=1] +[ext_resource path="res://assets/images/joueur.png" type="Texture" id=1] [ext_resource path="res://scripts/Joueur.gd" type="Script" id=2] [ext_resource path="res://scenes/Ennemi.tscn" type="PackedScene" id=3] -[ext_resource path="res://images/Fond.png" type="Texture" id=4] +[ext_resource path="res://assets/images/Fond.png" type="Texture" id=4] [ext_resource path="res://scenes/mur.tres" type="TileSet" id=5] -[ext_resource path="res://images/Lumière.png" type="Texture" id=6] +[ext_resource path="res://assets/images/Lumière.png" type="Texture" id=6] +[ext_resource path="res://assets/sounds/background.wav" type="AudioStream" id=7] [sub_resource type="RectangleShape2D" id=1] extents = Vector2( 8, 8 ) @@ -163,4 +164,8 @@ tile_data = PoolIntArray( -1376258, 0, 0, -1376257, 0, 0, -1441792, 0, 0, -14417 [node name="CanvasModulate" type="CanvasModulate" parent="."] color = Color( 0.27451, 0.27451, 0.27451, 1 ) + +[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."] +stream = ExtResource( 7 ) +autoplay = true [connection signal="body_entered" from="Joueur/Area2D" to="Joueur" method="_on_Area2D_body_entered"] diff --git a/scenes/mur.tres b/scenes/mur.tres index 020b420..defa5c8 100644 --- a/scenes/mur.tres +++ b/scenes/mur.tres @@ -1,6 +1,6 @@ [gd_resource type="TileSet" load_steps=4 format=2] -[ext_resource path="res://images/Batiment.png" type="Texture" id=1] +[ext_resource path="res://assets/images/Batiment.png" type="Texture" id=1] [sub_resource type="OccluderPolygon2D" id=1] polygon = PoolVector2Array( -8.00226, -7.97379, -7.99188, 7.99426, 8.00321, 7.99426, 8.01305, -8.00083 ) diff --git a/scenes/mur.tscn b/scenes/mur.tscn index 9ff6f60..5df15c8 100644 --- a/scenes/mur.tscn +++ b/scenes/mur.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=4 format=2] -[ext_resource path="res://images/Batiment.png" type="Texture" id=1] +[ext_resource path="res://assets/images/Batiment.png" type="Texture" id=1] [sub_resource type="RectangleShape2D" id=2] extents = Vector2( 8, 8 ) From abf1f219998f950cc9833f608064a65fa75ace14 Mon Sep 17 00:00:00 2001 From: Mylloon Date: Wed, 7 Apr 2021 18:54:00 +0200 Subject: [PATCH 3/5] Merge branch 'master' of code.up8.edu:Anri/godot-2e-semestre --- scenes/Monde.tscn | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scenes/Monde.tscn b/scenes/Monde.tscn index 6179b7e..87b7eb8 100644 --- a/scenes/Monde.tscn +++ b/scenes/Monde.tscn @@ -6,7 +6,9 @@ [ext_resource path="res://assets/images/Fond.png" type="Texture" id=4] [ext_resource path="res://scenes/mur.tres" type="TileSet" id=5] [ext_resource path="res://assets/images/Lumière.png" type="Texture" id=6] -[ext_resource path="res://assets/sounds/background.wav" type="AudioStream" id=7] + + + [sub_resource type="RectangleShape2D" id=1] extents = Vector2( 8, 8 ) From b3fb09f52f544e83bc3a5bcc4add8e447dd1c2f8 Mon Sep 17 00:00:00 2001 From: Anri Kennel Date: Wed, 7 Apr 2021 16:57:32 +0000 Subject: [PATCH 4/5] Revert "adding .wav to lfs track" This reverts commit 291c8ea9a886bf1c22076c967f4eed5269226e00 --- .gitattributes | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitattributes b/.gitattributes index dfa8e5f..24a8e87 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,2 +1 @@ *.png filter=lfs diff=lfs merge=lfs -text -*.wav filter=lfs diff=lfs merge=lfs -text From b00f1e2a23944b5329ecacc9c38e988c71a34fcb Mon Sep 17 00:00:00 2001 From: Anri Kennel Date: Wed, 7 Apr 2021 17:03:11 +0000 Subject: [PATCH 5/5] Revert "Merge branch 'revert-291c8ea9' into 'master'" This reverts merge request !1 --- .gitattributes | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitattributes b/.gitattributes index 24a8e87..dfa8e5f 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1 +1,2 @@ *.png filter=lfs diff=lfs merge=lfs -text +*.wav filter=lfs diff=lfs merge=lfs -text