From db4aac845c0526811125d4efc7dc94f6da64bc0b Mon Sep 17 00:00:00 2001 From: Erzangel Date: Wed, 22 May 2024 19:42:22 +0200 Subject: [PATCH 01/12] feat(card): flushed on 002 --- public/cards/heron/002.png | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/cards/heron/002.png b/public/cards/heron/002.png index 432233d..02b8f19 100644 --- a/public/cards/heron/002.png +++ b/public/cards/heron/002.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cbbd4981865187b78dbfaf871e4a281734965a7c6090a530a369918b7277a363 -size 125228 +oid sha256:d1b381184c5d9a4336abacd6c8e4684c1d583886113194c1c94fe25a6da93b23 +size 126449 From 0305dbe9b712af07844fe2ccd4ca3871529f31f1 Mon Sep 17 00:00:00 2001 From: Erzangel Date: Wed, 22 May 2024 19:47:44 +0200 Subject: [PATCH 02/12] feat: we are so back, move settings img loc --- components/GlobalOverlay.vue | 2 +- components/ResultDialog.vue | 2 ++ public/{ => images}/settings.png | 0 public/images/so_back.png | 3 +++ 4 files changed, 6 insertions(+), 1 deletion(-) rename public/{ => images}/settings.png (100%) create mode 100644 public/images/so_back.png diff --git a/components/GlobalOverlay.vue b/components/GlobalOverlay.vue index 0db208c..4a0f540 100644 --- a/components/GlobalOverlay.vue +++ b/components/GlobalOverlay.vue @@ -7,7 +7,7 @@ const displayOptions = ref(false) diff --git a/components/ResultDialog.vue b/components/ResultDialog.vue index 834f703..44e52dc 100644 --- a/components/ResultDialog.vue +++ b/components/ResultDialog.vue @@ -45,7 +45,9 @@ const close = () => { Et n'oubliez pas, la prochaine fois, vous gagnerez! Vous verrez! Vous êtes un gagnant, vous êtes un champion! Vous êtes le meilleur! Vous êtes le roi du monde! + Une image décrivant le meme 'We are so back'

+ diff --git a/public/settings.png b/public/images/settings.png similarity index 100% rename from public/settings.png rename to public/images/settings.png diff --git a/public/images/so_back.png b/public/images/so_back.png new file mode 100644 index 0000000..5c2ea5b --- /dev/null +++ b/public/images/so_back.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:04430d8665385eaab8f9ae63a6c14549ee58f4b8c615cd74a5bf2e8796ba5aa8 +size 20039 From ffd9f0187d106169e86174c75f848218c821d252 Mon Sep 17 00:00:00 2001 From: Erzangel Date: Wed, 22 May 2024 20:05:52 +0200 Subject: [PATCH 03/12] feat: new favicon attempt --- public/favicon.ico | 2 +- public/favicon_niko.ico | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 public/favicon_niko.ico diff --git a/public/favicon.ico b/public/favicon.ico index 6bb35de..10554a8 100644 --- a/public/favicon.ico +++ b/public/favicon.ico @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3349fdee8c4fe0bfaa60db50fd1442f5e4fc323e96ee6ed5e34405fe65b873cf +oid sha256:6a3ad0a6c65a9ccd490badc5182b3613d2c30617ae15345064af4f2845088603 size 15406 diff --git a/public/favicon_niko.ico b/public/favicon_niko.ico new file mode 100644 index 0000000..6bb35de --- /dev/null +++ b/public/favicon_niko.ico @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3349fdee8c4fe0bfaa60db50fd1442f5e4fc323e96ee6ed5e34405fe65b873cf +size 15406 From ceab43e861adae60fc0202c152de36fc79a7af57 Mon Sep 17 00:00:00 2001 From: Erzangel Date: Wed, 22 May 2024 20:40:41 +0200 Subject: [PATCH 04/12] feat(rules): add mention of right click zoom --- components/RulesDisplay.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/components/RulesDisplay.vue b/components/RulesDisplay.vue index 1fe1afd..2b36884 100644 --- a/components/RulesDisplay.vue +++ b/components/RulesDisplay.vue @@ -243,6 +243,7 @@ const router = useRouter();

Quand vous avez un effet "Sacrifice", vous pouvez fouiller votre défausse pour choisir la carte à sacrifier. Vous pouvez également sacrifier une carte de la main qui n'est pas encore locked!

+

Pour zoomer sur une carte, maintenez votre clic droit.

From 90ed8a62113462e451127f5769080406d779ebd1 Mon Sep 17 00:00:00 2001 From: Erzangel Date: Wed, 22 May 2024 20:41:00 +0200 Subject: [PATCH 05/12] fix: forgot changes --- components/RulesDisplay.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/components/RulesDisplay.vue b/components/RulesDisplay.vue index 2b36884..5180a44 100644 --- a/components/RulesDisplay.vue +++ b/components/RulesDisplay.vue @@ -243,6 +243,7 @@ const router = useRouter();

Quand vous avez un effet "Sacrifice", vous pouvez fouiller votre défausse pour choisir la carte à sacrifier. Vous pouvez également sacrifier une carte de la main qui n'est pas encore locked!

+

Zoomer sur les cartes

Pour zoomer sur une carte, maintenez votre clic droit.

From 66b6cc61e9e9f6897073cb244d14767050299bb6 Mon Sep 17 00:00:00 2001 From: legonzaur Date: Fri, 24 May 2024 12:14:37 +0200 Subject: [PATCH 06/12] wrap market and player list in containers --- components/GameBoard.vue | 50 ++++++++++++++++++++------------ components/MarketCards.vue | 12 ++++++-- components/PlayerList.vue | 0 components/PlayerListElement.vue | 6 ++-- components/PlayerSlot.vue | 4 +-- pages/index.vue | 1 - 6 files changed, 46 insertions(+), 27 deletions(-) create mode 100644 components/PlayerList.vue diff --git a/components/GameBoard.vue b/components/GameBoard.vue index 6730d43..9fa0b2a 100644 --- a/components/GameBoard.vue +++ b/components/GameBoard.vue @@ -59,18 +59,21 @@ function showWinnerScreen() {