Merge branch 'main' of github.com:maberet/ProjetZZ1 into main

81e51fa6 · Taha Belkhiri · a2f2fdfa · bdf831b6 · a2f2fdfa · a2f2fdfa
Commit 81e51fa6 authored Jun 21, 2022 by Taha Belkhiri
--- a/travail_individuel/Meyer/animation_sprites/assets/PNG/Default (64px)/Items/weapon_longsword.png
+++ b/travail_individuel/Meyer/animation_sprites/assets/PNG/Default (64px)/Items/weapon_longsword.png
--- a/travail_individuel/Meyer/animation_sprites/assets/PNG/Default (64px)/Items/weapon_pole.png
+++ b/travail_individuel/Meyer/animation_sprites/assets/PNG/Default (64px)/Items/weapon_pole.png
--- a/travail_individuel/Meyer/animation_sprites/assets/PNG/Default (64px)/Items/weapon_spear.png
+++ b/travail_individuel/Meyer/animation_sprites/assets/PNG/Default (64px)/Items/weapon_spear.png
--- a/travail_individuel/Meyer/animation_sprites/assets/PNG/Default (64px)/Items/weapon_staff.png
+++ b/travail_individuel/Meyer/animation_sprites/assets/PNG/Default (64px)/Items/weapon_staff.png
--- a/travail_individuel/Meyer/animation_sprites/assets/PNG/Default (64px)/Items/weapon_sword.png
+++ b/travail_individuel/Meyer/animation_sprites/assets/PNG/Default (64px)/Items/weapon_sword.png
--- a/travail_individuel/Meyer/animation_sprites/assets/PNG/Default (64px)/arrow.png
+++ b/travail_individuel/Meyer/animation_sprites/assets/PNG/Default (64px)/arrow.png
--- a/travail_individuel/Meyer/animation_sprites/assets/PNG/Default (64px)/arrow_circle.png
+++ b/travail_individuel/Meyer/animation_sprites/assets/PNG/Default (64px)/arrow_circle.png
--- a/travail_individuel/Meyer/animation_sprites/assets/PNG/Default (64px)/arrow_curve.png
+++ b/travail_individuel/Meyer/animation_sprites/assets/PNG/Default (64px)/arrow_curve.png
--- a/travail_individuel/Meyer/animation_sprites/assets/PNG/Default (64px)/arrow_head.png
+++ b/travail_individuel/Meyer/animation_sprites/assets/PNG/Default (64px)/arrow_head.png
--- a/travail_individuel/Meyer/animation_sprites/assets/PNG/Default (64px)/barrel.png
+++ b/travail_individuel/Meyer/animation_sprites/assets/PNG/Default (64px)/barrel.png
--- a/travail_individuel/Meyer/animation_sprites/assets/PNG/Default (64px)/barrels.png
+++ b/travail_individuel/Meyer/animation_sprites/assets/PNG/Default (64px)/barrels.png
--- a/travail_individuel/Meyer/animation_sprites/assets/PNG/Default (64px)/barrels_stacked.png
+++ b/travail_individuel/Meyer/animation_sprites/assets/PNG/Default (64px)/barrels_stacked.png
--- a/travail_individuel/Meyer/animation_sprites/assets/PNG/Default (64px)/bed.png
+++ b/travail_individuel/Meyer/animation_sprites/assets/PNG/Default (64px)/bed.png
--- a/travail_individuel/Meyer/animation_sprites/assets/PNG/Default (64px)/bed_luxurious.png
+++ b/travail_individuel/Meyer/animation_sprites/assets/PNG/Default (64px)/bed_luxurious.png
--- a/travail_individuel/Meyer/animation_sprites/assets/PNG/Default (64px)/bridge.png
+++ b/travail_individuel/Meyer/animation_sprites/assets/PNG/Default (64px)/bridge.png
--- a/travail_individuel/Meyer/animation_sprites/assets/PNG/Default (64px)/bridge_end.png
+++ b/travail_individuel/Meyer/animation_sprites/assets/PNG/Default (64px)/bridge_end.png
--- a/travail_individuel/Meyer/animation_sprites/assets/PNG/Default (64px)/campfire.png
+++ b/travail_individuel/Meyer/animation_sprites/assets/PNG/Default (64px)/campfire.png
--- a/travail_individuel/Meyer/animation_sprites/assets/PNG/Default (64px)/carpet.png
+++ b/travail_individuel/Meyer/animation_sprites/assets/PNG/Default (64px)/carpet.png
--- a/travail_individuel/Meyer/animation_sprites/assets/PNG/Default (64px)/cart.png
+++ b/travail_individuel/Meyer/animation_sprites/assets/PNG/Default (64px)/cart.png
--- a/travail_individuel/Meyer/animation_sprites/assets/PNG/Default (64px)/chair.png
+++ b/travail_individuel/Meyer/animation_sprites/assets/PNG/Default (64px)/chair.png