From 9d437dd9c1764d78b327a7d3ef914f6422a5bf08 Mon Sep 17 00:00:00 2001 From: Emre Date: Thu, 9 Feb 2023 21:19:22 +0100 Subject: [PATCH] =?UTF-8?q?R=C3=A8gle=20probl=C3=A8me=20merge?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bowlin_project/assets}/fonts/BowlInFont.ttf | Bin .../assets}/images/Spare_background.png | Bin .../assets}/images/Strike_background.png | Bin .../assets}/images/achievements/0point_locked.png | Bin .../assets}/images/achievements/0point_unlocked.png | Bin .../assets}/images/achievements/10spares_locked.png | Bin .../images/achievements/10spares_unlocked.png | Bin .../images/achievements/10strikes_locked.png | Bin .../images/achievements/10strikes_unlocked.png | Bin .../images/achievements/10x9spins_locked.png | Bin .../images/achievements/10x9spins_unlocked.png | Bin .../images/achievements/150points_locked.png | Bin .../images/achievements/150points_unlocked.png | Bin .../images/achievements/2strikeinarow_locked.png | Bin .../images/achievements/2strikeinarow_unlocked.png | Bin .../assets}/images/achievements/5friends_locked.png | Bin .../images/achievements/5friends_unlocked.png | Bin .../assets}/images/achievements/5games_locked.png | Bin .../assets}/images/achievements/5games_unlocked.png | Bin .../assets}/images/achievements/win_locked.png | Bin .../assets}/images/achievements/win_unlocked.png | Bin .../assets}/images/background_analysis.png | Bin .../assets}/images/background_welcomepage.png | Bin .../bowlin_project/assets}/images/card_game.png | Bin .../assets}/images/congrats_background.png | Bin .../bowlin_project/assets}/images/icon.png | Bin .../bowlin_project/assets}/images/icon_bowl_in.png | Bin .../assets}/images/image_achievement_card.png | Bin .../assets}/images/image_achievement_table.png | Bin .../assets}/images/image_achievement_unlocked.png | Bin .../assets}/images/image_analysis.png | Bin .../assets}/images/image_game_card.png | Bin .../assets}/images/image_newgame_modal(1).png | Bin .../assets}/images/image_newgame_modal.png | Bin .../assets}/images/image_podium(1).png | Bin .../bowlin_project/assets}/images/image_podium.png | Bin .../bowlin_project/assets}/images/image_profile.png | Bin .../bowlin_project/assets}/images/image_ranking.png | Bin .../bowlin_project/assets}/images/image_score.png | Bin .../assets}/images/image_spare_card.png | Bin .../assets}/images/image_strike_card.png | Bin .../bowlin_project/assets}/images/image_trophee.png | Bin .../assets}/images/image_user_cyan.png | Bin .../assets}/images/image_user_green.png | Bin .../assets}/images/image_user_orange.png | Bin .../assets}/images/image_user_pink.png | Bin .../assets}/images/image_user_purple.png | Bin .../assets}/images/image_user_red.png | Bin .../assets}/images/image_user_yellow.png | Bin .../assets}/images/ingame_cardgame.png | Bin .../assets}/images/sentence_joingame.png | Bin .../assets}/images/start_sentence.png | Bin 52 files changed, 0 insertions(+), 0 deletions(-) rename {assets => Sources/bowlin_project/assets}/fonts/BowlInFont.ttf (100%) rename {assets => Sources/bowlin_project/assets}/images/Spare_background.png (100%) rename {assets => Sources/bowlin_project/assets}/images/Strike_background.png (100%) rename {assets => Sources/bowlin_project/assets}/images/achievements/0point_locked.png (100%) rename {assets => Sources/bowlin_project/assets}/images/achievements/0point_unlocked.png (100%) rename {assets => Sources/bowlin_project/assets}/images/achievements/10spares_locked.png (100%) rename {assets => Sources/bowlin_project/assets}/images/achievements/10spares_unlocked.png (100%) rename {assets => Sources/bowlin_project/assets}/images/achievements/10strikes_locked.png (100%) rename {assets => Sources/bowlin_project/assets}/images/achievements/10strikes_unlocked.png (100%) rename {assets => Sources/bowlin_project/assets}/images/achievements/10x9spins_locked.png (100%) rename {assets => Sources/bowlin_project/assets}/images/achievements/10x9spins_unlocked.png (100%) rename {assets => Sources/bowlin_project/assets}/images/achievements/150points_locked.png (100%) rename {assets => Sources/bowlin_project/assets}/images/achievements/150points_unlocked.png (100%) rename {assets => Sources/bowlin_project/assets}/images/achievements/2strikeinarow_locked.png (100%) rename {assets => Sources/bowlin_project/assets}/images/achievements/2strikeinarow_unlocked.png (100%) rename {assets => Sources/bowlin_project/assets}/images/achievements/5friends_locked.png (100%) rename {assets => Sources/bowlin_project/assets}/images/achievements/5friends_unlocked.png (100%) rename {assets => Sources/bowlin_project/assets}/images/achievements/5games_locked.png (100%) rename {assets => Sources/bowlin_project/assets}/images/achievements/5games_unlocked.png (100%) rename {assets => Sources/bowlin_project/assets}/images/achievements/win_locked.png (100%) rename {assets => Sources/bowlin_project/assets}/images/achievements/win_unlocked.png (100%) rename {assets => Sources/bowlin_project/assets}/images/background_analysis.png (100%) rename {assets => Sources/bowlin_project/assets}/images/background_welcomepage.png (100%) rename {assets => Sources/bowlin_project/assets}/images/card_game.png (100%) rename {assets => Sources/bowlin_project/assets}/images/congrats_background.png (100%) rename {assets => Sources/bowlin_project/assets}/images/icon.png (100%) rename {assets => Sources/bowlin_project/assets}/images/icon_bowl_in.png (100%) rename {assets => Sources/bowlin_project/assets}/images/image_achievement_card.png (100%) rename {assets => Sources/bowlin_project/assets}/images/image_achievement_table.png (100%) rename {assets => Sources/bowlin_project/assets}/images/image_achievement_unlocked.png (100%) rename {assets => Sources/bowlin_project/assets}/images/image_analysis.png (100%) rename {assets => Sources/bowlin_project/assets}/images/image_game_card.png (100%) rename {assets => Sources/bowlin_project/assets}/images/image_newgame_modal(1).png (100%) rename {assets => Sources/bowlin_project/assets}/images/image_newgame_modal.png (100%) rename {assets => Sources/bowlin_project/assets}/images/image_podium(1).png (100%) rename {assets => Sources/bowlin_project/assets}/images/image_podium.png (100%) rename {assets => Sources/bowlin_project/assets}/images/image_profile.png (100%) rename {assets => Sources/bowlin_project/assets}/images/image_ranking.png (100%) rename {assets => Sources/bowlin_project/assets}/images/image_score.png (100%) rename {assets => Sources/bowlin_project/assets}/images/image_spare_card.png (100%) rename {assets => Sources/bowlin_project/assets}/images/image_strike_card.png (100%) rename {assets => Sources/bowlin_project/assets}/images/image_trophee.png (100%) rename {assets => Sources/bowlin_project/assets}/images/image_user_cyan.png (100%) rename {assets => Sources/bowlin_project/assets}/images/image_user_green.png (100%) rename {assets => Sources/bowlin_project/assets}/images/image_user_orange.png (100%) rename {assets => Sources/bowlin_project/assets}/images/image_user_pink.png (100%) rename {assets => Sources/bowlin_project/assets}/images/image_user_purple.png (100%) rename {assets => Sources/bowlin_project/assets}/images/image_user_red.png (100%) rename {assets => Sources/bowlin_project/assets}/images/image_user_yellow.png (100%) rename {assets => Sources/bowlin_project/assets}/images/ingame_cardgame.png (100%) rename {assets => Sources/bowlin_project/assets}/images/sentence_joingame.png (100%) rename {assets => Sources/bowlin_project/assets}/images/start_sentence.png (100%) diff --git a/assets/fonts/BowlInFont.ttf b/Sources/bowlin_project/assets/fonts/BowlInFont.ttf similarity index 100% rename from assets/fonts/BowlInFont.ttf rename to Sources/bowlin_project/assets/fonts/BowlInFont.ttf diff --git a/assets/images/Spare_background.png b/Sources/bowlin_project/assets/images/Spare_background.png similarity index 100% rename from assets/images/Spare_background.png rename to Sources/bowlin_project/assets/images/Spare_background.png diff --git a/assets/images/Strike_background.png b/Sources/bowlin_project/assets/images/Strike_background.png similarity index 100% rename from assets/images/Strike_background.png rename to Sources/bowlin_project/assets/images/Strike_background.png diff --git a/assets/images/achievements/0point_locked.png b/Sources/bowlin_project/assets/images/achievements/0point_locked.png similarity index 100% rename from assets/images/achievements/0point_locked.png rename to Sources/bowlin_project/assets/images/achievements/0point_locked.png diff --git a/assets/images/achievements/0point_unlocked.png b/Sources/bowlin_project/assets/images/achievements/0point_unlocked.png similarity index 100% rename from assets/images/achievements/0point_unlocked.png rename to Sources/bowlin_project/assets/images/achievements/0point_unlocked.png diff --git a/assets/images/achievements/10spares_locked.png b/Sources/bowlin_project/assets/images/achievements/10spares_locked.png similarity index 100% rename from assets/images/achievements/10spares_locked.png rename to Sources/bowlin_project/assets/images/achievements/10spares_locked.png diff --git a/assets/images/achievements/10spares_unlocked.png b/Sources/bowlin_project/assets/images/achievements/10spares_unlocked.png similarity index 100% rename from assets/images/achievements/10spares_unlocked.png rename to Sources/bowlin_project/assets/images/achievements/10spares_unlocked.png diff --git a/assets/images/achievements/10strikes_locked.png b/Sources/bowlin_project/assets/images/achievements/10strikes_locked.png similarity index 100% rename from assets/images/achievements/10strikes_locked.png rename to Sources/bowlin_project/assets/images/achievements/10strikes_locked.png diff --git a/assets/images/achievements/10strikes_unlocked.png b/Sources/bowlin_project/assets/images/achievements/10strikes_unlocked.png similarity index 100% rename from assets/images/achievements/10strikes_unlocked.png rename to Sources/bowlin_project/assets/images/achievements/10strikes_unlocked.png diff --git a/assets/images/achievements/10x9spins_locked.png b/Sources/bowlin_project/assets/images/achievements/10x9spins_locked.png similarity index 100% rename from assets/images/achievements/10x9spins_locked.png rename to Sources/bowlin_project/assets/images/achievements/10x9spins_locked.png diff --git a/assets/images/achievements/10x9spins_unlocked.png b/Sources/bowlin_project/assets/images/achievements/10x9spins_unlocked.png similarity index 100% rename from assets/images/achievements/10x9spins_unlocked.png rename to Sources/bowlin_project/assets/images/achievements/10x9spins_unlocked.png diff --git a/assets/images/achievements/150points_locked.png b/Sources/bowlin_project/assets/images/achievements/150points_locked.png similarity index 100% rename from assets/images/achievements/150points_locked.png rename to Sources/bowlin_project/assets/images/achievements/150points_locked.png diff --git a/assets/images/achievements/150points_unlocked.png b/Sources/bowlin_project/assets/images/achievements/150points_unlocked.png similarity index 100% rename from assets/images/achievements/150points_unlocked.png rename to Sources/bowlin_project/assets/images/achievements/150points_unlocked.png diff --git a/assets/images/achievements/2strikeinarow_locked.png b/Sources/bowlin_project/assets/images/achievements/2strikeinarow_locked.png similarity index 100% rename from assets/images/achievements/2strikeinarow_locked.png rename to Sources/bowlin_project/assets/images/achievements/2strikeinarow_locked.png diff --git a/assets/images/achievements/2strikeinarow_unlocked.png b/Sources/bowlin_project/assets/images/achievements/2strikeinarow_unlocked.png similarity index 100% rename from assets/images/achievements/2strikeinarow_unlocked.png rename to Sources/bowlin_project/assets/images/achievements/2strikeinarow_unlocked.png diff --git a/assets/images/achievements/5friends_locked.png b/Sources/bowlin_project/assets/images/achievements/5friends_locked.png similarity index 100% rename from assets/images/achievements/5friends_locked.png rename to Sources/bowlin_project/assets/images/achievements/5friends_locked.png diff --git a/assets/images/achievements/5friends_unlocked.png b/Sources/bowlin_project/assets/images/achievements/5friends_unlocked.png similarity index 100% rename from assets/images/achievements/5friends_unlocked.png rename to Sources/bowlin_project/assets/images/achievements/5friends_unlocked.png diff --git a/assets/images/achievements/5games_locked.png b/Sources/bowlin_project/assets/images/achievements/5games_locked.png similarity index 100% rename from assets/images/achievements/5games_locked.png rename to Sources/bowlin_project/assets/images/achievements/5games_locked.png diff --git a/assets/images/achievements/5games_unlocked.png b/Sources/bowlin_project/assets/images/achievements/5games_unlocked.png similarity index 100% rename from assets/images/achievements/5games_unlocked.png rename to Sources/bowlin_project/assets/images/achievements/5games_unlocked.png diff --git a/assets/images/achievements/win_locked.png b/Sources/bowlin_project/assets/images/achievements/win_locked.png similarity index 100% rename from assets/images/achievements/win_locked.png rename to Sources/bowlin_project/assets/images/achievements/win_locked.png diff --git a/assets/images/achievements/win_unlocked.png b/Sources/bowlin_project/assets/images/achievements/win_unlocked.png similarity index 100% rename from assets/images/achievements/win_unlocked.png rename to Sources/bowlin_project/assets/images/achievements/win_unlocked.png diff --git a/assets/images/background_analysis.png b/Sources/bowlin_project/assets/images/background_analysis.png similarity index 100% rename from assets/images/background_analysis.png rename to Sources/bowlin_project/assets/images/background_analysis.png diff --git a/assets/images/background_welcomepage.png b/Sources/bowlin_project/assets/images/background_welcomepage.png similarity index 100% rename from assets/images/background_welcomepage.png rename to Sources/bowlin_project/assets/images/background_welcomepage.png diff --git a/assets/images/card_game.png b/Sources/bowlin_project/assets/images/card_game.png similarity index 100% rename from assets/images/card_game.png rename to Sources/bowlin_project/assets/images/card_game.png diff --git a/assets/images/congrats_background.png b/Sources/bowlin_project/assets/images/congrats_background.png similarity index 100% rename from assets/images/congrats_background.png rename to Sources/bowlin_project/assets/images/congrats_background.png diff --git a/assets/images/icon.png b/Sources/bowlin_project/assets/images/icon.png similarity index 100% rename from assets/images/icon.png rename to Sources/bowlin_project/assets/images/icon.png diff --git a/assets/images/icon_bowl_in.png b/Sources/bowlin_project/assets/images/icon_bowl_in.png similarity index 100% rename from assets/images/icon_bowl_in.png rename to Sources/bowlin_project/assets/images/icon_bowl_in.png diff --git a/assets/images/image_achievement_card.png b/Sources/bowlin_project/assets/images/image_achievement_card.png similarity index 100% rename from assets/images/image_achievement_card.png rename to Sources/bowlin_project/assets/images/image_achievement_card.png diff --git a/assets/images/image_achievement_table.png b/Sources/bowlin_project/assets/images/image_achievement_table.png similarity index 100% rename from assets/images/image_achievement_table.png rename to Sources/bowlin_project/assets/images/image_achievement_table.png diff --git a/assets/images/image_achievement_unlocked.png b/Sources/bowlin_project/assets/images/image_achievement_unlocked.png similarity index 100% rename from assets/images/image_achievement_unlocked.png rename to Sources/bowlin_project/assets/images/image_achievement_unlocked.png diff --git a/assets/images/image_analysis.png b/Sources/bowlin_project/assets/images/image_analysis.png similarity index 100% rename from assets/images/image_analysis.png rename to Sources/bowlin_project/assets/images/image_analysis.png diff --git a/assets/images/image_game_card.png b/Sources/bowlin_project/assets/images/image_game_card.png similarity index 100% rename from assets/images/image_game_card.png rename to Sources/bowlin_project/assets/images/image_game_card.png diff --git a/assets/images/image_newgame_modal(1).png b/Sources/bowlin_project/assets/images/image_newgame_modal(1).png similarity index 100% rename from assets/images/image_newgame_modal(1).png rename to Sources/bowlin_project/assets/images/image_newgame_modal(1).png diff --git a/assets/images/image_newgame_modal.png b/Sources/bowlin_project/assets/images/image_newgame_modal.png similarity index 100% rename from assets/images/image_newgame_modal.png rename to Sources/bowlin_project/assets/images/image_newgame_modal.png diff --git a/assets/images/image_podium(1).png b/Sources/bowlin_project/assets/images/image_podium(1).png similarity index 100% rename from assets/images/image_podium(1).png rename to Sources/bowlin_project/assets/images/image_podium(1).png diff --git a/assets/images/image_podium.png b/Sources/bowlin_project/assets/images/image_podium.png similarity index 100% rename from assets/images/image_podium.png rename to Sources/bowlin_project/assets/images/image_podium.png diff --git a/assets/images/image_profile.png b/Sources/bowlin_project/assets/images/image_profile.png similarity index 100% rename from assets/images/image_profile.png rename to Sources/bowlin_project/assets/images/image_profile.png diff --git a/assets/images/image_ranking.png b/Sources/bowlin_project/assets/images/image_ranking.png similarity index 100% rename from assets/images/image_ranking.png rename to Sources/bowlin_project/assets/images/image_ranking.png diff --git a/assets/images/image_score.png b/Sources/bowlin_project/assets/images/image_score.png similarity index 100% rename from assets/images/image_score.png rename to Sources/bowlin_project/assets/images/image_score.png diff --git a/assets/images/image_spare_card.png b/Sources/bowlin_project/assets/images/image_spare_card.png similarity index 100% rename from assets/images/image_spare_card.png rename to Sources/bowlin_project/assets/images/image_spare_card.png diff --git a/assets/images/image_strike_card.png b/Sources/bowlin_project/assets/images/image_strike_card.png similarity index 100% rename from assets/images/image_strike_card.png rename to Sources/bowlin_project/assets/images/image_strike_card.png diff --git a/assets/images/image_trophee.png b/Sources/bowlin_project/assets/images/image_trophee.png similarity index 100% rename from assets/images/image_trophee.png rename to Sources/bowlin_project/assets/images/image_trophee.png diff --git a/assets/images/image_user_cyan.png b/Sources/bowlin_project/assets/images/image_user_cyan.png similarity index 100% rename from assets/images/image_user_cyan.png rename to Sources/bowlin_project/assets/images/image_user_cyan.png diff --git a/assets/images/image_user_green.png b/Sources/bowlin_project/assets/images/image_user_green.png similarity index 100% rename from assets/images/image_user_green.png rename to Sources/bowlin_project/assets/images/image_user_green.png diff --git a/assets/images/image_user_orange.png b/Sources/bowlin_project/assets/images/image_user_orange.png similarity index 100% rename from assets/images/image_user_orange.png rename to Sources/bowlin_project/assets/images/image_user_orange.png diff --git a/assets/images/image_user_pink.png b/Sources/bowlin_project/assets/images/image_user_pink.png similarity index 100% rename from assets/images/image_user_pink.png rename to Sources/bowlin_project/assets/images/image_user_pink.png diff --git a/assets/images/image_user_purple.png b/Sources/bowlin_project/assets/images/image_user_purple.png similarity index 100% rename from assets/images/image_user_purple.png rename to Sources/bowlin_project/assets/images/image_user_purple.png diff --git a/assets/images/image_user_red.png b/Sources/bowlin_project/assets/images/image_user_red.png similarity index 100% rename from assets/images/image_user_red.png rename to Sources/bowlin_project/assets/images/image_user_red.png diff --git a/assets/images/image_user_yellow.png b/Sources/bowlin_project/assets/images/image_user_yellow.png similarity index 100% rename from assets/images/image_user_yellow.png rename to Sources/bowlin_project/assets/images/image_user_yellow.png diff --git a/assets/images/ingame_cardgame.png b/Sources/bowlin_project/assets/images/ingame_cardgame.png similarity index 100% rename from assets/images/ingame_cardgame.png rename to Sources/bowlin_project/assets/images/ingame_cardgame.png diff --git a/assets/images/sentence_joingame.png b/Sources/bowlin_project/assets/images/sentence_joingame.png similarity index 100% rename from assets/images/sentence_joingame.png rename to Sources/bowlin_project/assets/images/sentence_joingame.png diff --git a/assets/images/start_sentence.png b/Sources/bowlin_project/assets/images/start_sentence.png similarity index 100% rename from assets/images/start_sentence.png rename to Sources/bowlin_project/assets/images/start_sentence.png