diff --git a/DungeonAndDeamon/Background/background1.png b/DungeonAndDeamon/Background/background1.png deleted file mode 100644 index 3278f93..0000000 Binary files a/DungeonAndDeamon/Background/background1.png and /dev/null differ diff --git a/DungeonAndDeamon/Background/background1.png.import b/DungeonAndDeamon/Background/background1.png.import deleted file mode 100644 index 95722ba..0000000 --- a/DungeonAndDeamon/Background/background1.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/background1.png-890eea13365623d07388fca3d21687d8.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://Background/background1.png" -dest_files=[ "res://.import/background1.png-890eea13365623d07388fca3d21687d8.stex" ] - -[params] - -compress/mode=0 -compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 -compress/normal_map=0 -flags/repeat=0 -flags/filter=true -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 -process/fix_alpha_border=true -process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -stream=false -size_limit=0 -detect_3d=true -svg/scale=1.0 diff --git a/DungeonAndDeamon/Background/background2.png b/DungeonAndDeamon/Background/background2.png deleted file mode 100644 index d845841..0000000 Binary files a/DungeonAndDeamon/Background/background2.png and /dev/null differ diff --git a/DungeonAndDeamon/Background/background2.png.import b/DungeonAndDeamon/Background/background2.png.import deleted file mode 100644 index ec2dc84..0000000 --- a/DungeonAndDeamon/Background/background2.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/background2.png-ef1d6fd8f1409ca33c175dd1ff8c1811.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://Background/background2.png" -dest_files=[ "res://.import/background2.png-ef1d6fd8f1409ca33c175dd1ff8c1811.stex" ] - -[params] - -compress/mode=0 -compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 -compress/normal_map=0 -flags/repeat=0 -flags/filter=false -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 -process/fix_alpha_border=true -process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -stream=false -size_limit=0 -detect_3d=false -svg/scale=1.0 diff --git a/DungeonAndDeamon/Background/background3.png b/DungeonAndDeamon/Background/background3.png deleted file mode 100644 index 397ada4..0000000 Binary files a/DungeonAndDeamon/Background/background3.png and /dev/null differ diff --git a/DungeonAndDeamon/Background/background3.png.import b/DungeonAndDeamon/Background/background3.png.import deleted file mode 100644 index 9a934b2..0000000 --- a/DungeonAndDeamon/Background/background3.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/background3.png-dbbb1ba47a361636a53656f6a10c7a5c.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://Background/background3.png" -dest_files=[ "res://.import/background3.png-dbbb1ba47a361636a53656f6a10c7a5c.stex" ] - -[params] - -compress/mode=0 -compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 -compress/normal_map=0 -flags/repeat=0 -flags/filter=true -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 -process/fix_alpha_border=true -process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -stream=false -size_limit=0 -detect_3d=true -svg/scale=1.0 diff --git a/DungeonAndDeamon/Background/background4.png b/DungeonAndDeamon/Background/background4.png deleted file mode 100644 index e41cf5d..0000000 Binary files a/DungeonAndDeamon/Background/background4.png and /dev/null differ diff --git a/DungeonAndDeamon/Background/background4.png.import b/DungeonAndDeamon/Background/background4.png.import deleted file mode 100644 index 0953503..0000000 --- a/DungeonAndDeamon/Background/background4.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/background4.png-acb2598f2dda4e3868efa684a64cd92b.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://Background/background4.png" -dest_files=[ "res://.import/background4.png-acb2598f2dda4e3868efa684a64cd92b.stex" ] - -[params] - -compress/mode=0 -compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 -compress/normal_map=0 -flags/repeat=0 -flags/filter=true -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 -process/fix_alpha_border=true -process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -stream=false -size_limit=0 -detect_3d=true -svg/scale=1.0 diff --git a/DungeonAndDeamon/Background/background5.png b/DungeonAndDeamon/Background/background5.png deleted file mode 100644 index aa3c26d..0000000 Binary files a/DungeonAndDeamon/Background/background5.png and /dev/null differ diff --git a/DungeonAndDeamon/Background/background5.png.import b/DungeonAndDeamon/Background/background5.png.import deleted file mode 100644 index cdef253..0000000 --- a/DungeonAndDeamon/Background/background5.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/background5.png-c99fb6892a3d70fb8f28400de4c65740.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://Background/background5.png" -dest_files=[ "res://.import/background5.png-c99fb6892a3d70fb8f28400de4c65740.stex" ] - -[params] - -compress/mode=0 -compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 -compress/normal_map=0 -flags/repeat=0 -flags/filter=true -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 -process/fix_alpha_border=true -process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -stream=false -size_limit=0 -detect_3d=true -svg/scale=1.0 diff --git a/DungeonAndDeamon/Background/background6.png b/DungeonAndDeamon/Background/background6.png deleted file mode 100644 index cde600a..0000000 Binary files a/DungeonAndDeamon/Background/background6.png and /dev/null differ diff --git a/DungeonAndDeamon/Background/background6.png.import b/DungeonAndDeamon/Background/background6.png.import deleted file mode 100644 index 6e53899..0000000 --- a/DungeonAndDeamon/Background/background6.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/background6.png-7e1deeae0bbec6d683a75f0ff9f79d6b.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://Background/background6.png" -dest_files=[ "res://.import/background6.png-7e1deeae0bbec6d683a75f0ff9f79d6b.stex" ] - -[params] - -compress/mode=0 -compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 -compress/normal_map=0 -flags/repeat=0 -flags/filter=true -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 -process/fix_alpha_border=true -process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -stream=false -size_limit=0 -detect_3d=true -svg/scale=1.0 diff --git a/DungeonAndDeamon/Background/main_lev_buildA.png b/DungeonAndDeamon/Background/main_lev_buildA.png deleted file mode 100644 index 0f09f02..0000000 Binary files a/DungeonAndDeamon/Background/main_lev_buildA.png and /dev/null differ diff --git a/DungeonAndDeamon/Background/main_lev_buildA.png.import b/DungeonAndDeamon/Background/main_lev_buildA.png.import deleted file mode 100644 index fd420ca..0000000 --- a/DungeonAndDeamon/Background/main_lev_buildA.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/main_lev_buildA.png-2344441f48fab5bce15ad608d2b62dfb.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://Background/main_lev_buildA.png" -dest_files=[ "res://.import/main_lev_buildA.png-2344441f48fab5bce15ad608d2b62dfb.stex" ] - -[params] - -compress/mode=0 -compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 -compress/normal_map=0 -flags/repeat=0 -flags/filter=true -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 -process/fix_alpha_border=true -process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -stream=false -size_limit=0 -detect_3d=true -svg/scale=1.0 diff --git a/DungeonAndDeamon/Background/main_lev_buildB.png b/DungeonAndDeamon/Background/main_lev_buildB.png deleted file mode 100644 index 1f09d63..0000000 Binary files a/DungeonAndDeamon/Background/main_lev_buildB.png and /dev/null differ diff --git a/DungeonAndDeamon/Background/main_lev_buildB.png.import b/DungeonAndDeamon/Background/main_lev_buildB.png.import deleted file mode 100644 index d4c5b95..0000000 --- a/DungeonAndDeamon/Background/main_lev_buildB.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/main_lev_buildB.png-0225c65de262019e1574fc3137d057cb.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://Background/main_lev_buildB.png" -dest_files=[ "res://.import/main_lev_buildB.png-0225c65de262019e1574fc3137d057cb.stex" ] - -[params] - -compress/mode=0 -compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 -compress/normal_map=0 -flags/repeat=0 -flags/filter=true -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 -process/fix_alpha_border=true -process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -stream=false -size_limit=0 -detect_3d=true -svg/scale=1.0 diff --git a/DungeonAndDeamonScript/DungeonAndDemaonScript/GestionJeu.cpp b/DungeonAndDeamonScript/DungeonAndDemaonScript/GestionJeu.cpp index fda5e0e..2e1b106 100644 --- a/DungeonAndDeamonScript/DungeonAndDemaonScript/GestionJeu.cpp +++ b/DungeonAndDeamonScript/DungeonAndDemaonScript/GestionJeu.cpp @@ -24,8 +24,8 @@ GestionJeu::GestionJeu() GestionJeu::~GestionJeu() { - delete gTerrain; - delete gPlayer; + //delete gTerrain; + //delete gPlayer; delete gMobs; delete gCollision; }