From 8ebc797a1950ba8aeb60043705d667585f1970bd Mon Sep 17 00:00:00 2001 From: nek0 Date: Thu, 8 Sep 2022 17:14:07 +0200 Subject: [PATCH 1/3] make cards mergable --- .gitattributes | 1 + src/Card.gd | 4 ++-- src/Card.tscn | 4 ++-- src/DropZone.gd | 4 ++-- src/DropZone.tscn | 4 ++-- src/Playfield.tscn | 4 ++-- 6 files changed, 11 insertions(+), 10 deletions(-) diff --git a/.gitattributes b/.gitattributes index a917f44..9317d52 100644 --- a/.gitattributes +++ b/.gitattributes @@ -7,3 +7,4 @@ *.gitignore filter=lfs diff=lfs merge=lfs -text *.gd filter=lfs diff=lfs merge=lfs -text *.tscn filter=lfs diff=lfs merge=lfs -text +*.blend filter=lfs diff=lfs merge=lfs -text diff --git a/src/Card.gd b/src/Card.gd index 6a40ca8..6d4ec23 100644 --- a/src/Card.gd +++ b/src/Card.gd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8b795848c1b21d850860439daf3a115f090f1fc03219b3d47a91c8322d07c5d0 -size 1024 +oid sha256:7b6d454b5984bdba41eb62b63360fff09053c540ff3ba5cccbac113d8a3e6866 +size 1680 diff --git a/src/Card.tscn b/src/Card.tscn index be0a702..0c294d9 100644 --- a/src/Card.tscn +++ b/src/Card.tscn @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f1b3d9e24a3ef3407be2283b42bd675bf1a497f2f1ddfb301ca732fba3697bfd -size 574 +oid sha256:8bf31a8d1c89aaf4d1fcc56022e4623e63c120337c4212fbd65470980fa89954 +size 764 diff --git a/src/DropZone.gd b/src/DropZone.gd index 37a0c5e..30af869 100644 --- a/src/DropZone.gd +++ b/src/DropZone.gd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f0f5fa6e2d1e757f84c8c6ae94f327773eba93a777678aeb1b02ccff7e6a50d2 -size 575 +oid sha256:681ff73748eb9837b37f6ea799618d898d985416876823e1cb3a5bb7527b4492 +size 586 diff --git a/src/DropZone.tscn b/src/DropZone.tscn index 4942acc..02cbe06 100644 --- a/src/DropZone.tscn +++ b/src/DropZone.tscn @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cb2da4ef9888b53ee932952ba9aa9fbcd2b174ee23517bd1d1afc53d0ba80d5a -size 490 +oid sha256:d690ce4dc7f94e29d78355109524b108502d7e6a2922b6041c04975b0715adf5 +size 703 diff --git a/src/Playfield.tscn b/src/Playfield.tscn index f913847..608e493 100644 --- a/src/Playfield.tscn +++ b/src/Playfield.tscn @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d65e72713f4be388d1bd23b013303e753c909fad583a2f3d01437f4ae29d2a63 -size 422 +oid sha256:ca8ff319d722e16f8b363a657f0f23b52fe116c91e3fa4337d7e2d004cb1eb9a +size 866 From b98d3007a3c0a8a3c6add879d0342ef984d06c50 Mon Sep 17 00:00:00 2001 From: nek0 Date: Thu, 8 Sep 2022 17:25:48 +0200 Subject: [PATCH 2/3] fix attribute check --- src/Card.gd | 4 ++-- src/DropZone.gd | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Card.gd b/src/Card.gd index 6d4ec23..3df3c34 100644 --- a/src/Card.gd +++ b/src/Card.gd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7b6d454b5984bdba41eb62b63360fff09053c540ff3ba5cccbac113d8a3e6866 -size 1680 +oid sha256:dad0f60b6037c2fdcf401c7b12638c68ca923dd37240fc075d202dc8785e929b +size 1715 diff --git a/src/DropZone.gd b/src/DropZone.gd index 30af869..e4b4375 100644 --- a/src/DropZone.gd +++ b/src/DropZone.gd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:681ff73748eb9837b37f6ea799618d898d985416876823e1cb3a5bb7527b4492 -size 586 +oid sha256:84f2cd3330255286e2109d50190754e312a1883434f684aad8e4a28f4b9fb7a6 +size 642 From 90db31178db0436bd6d2e54bed0049dc6c61f145 Mon Sep 17 00:00:00 2001 From: nek0 Date: Thu, 8 Sep 2022 17:27:59 +0200 Subject: [PATCH 3/3] fix string exports --- src/Card.gd | 4 ++-- src/DropZone.gd | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Card.gd b/src/Card.gd index 3df3c34..a7aa9d3 100644 --- a/src/Card.gd +++ b/src/Card.gd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dad0f60b6037c2fdcf401c7b12638c68ca923dd37240fc075d202dc8785e929b -size 1715 +oid sha256:4b7df798c83aece3be02e3a72eb768d192209a913fa2d8322734d838c254d939 +size 1718 diff --git a/src/DropZone.gd b/src/DropZone.gd index e4b4375..ffa3681 100644 --- a/src/DropZone.gd +++ b/src/DropZone.gd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:84f2cd3330255286e2109d50190754e312a1883434f684aad8e4a28f4b9fb7a6 -size 642 +oid sha256:43c4af0e1e49a9fe4e2d0a55f35187bcad1912d16e53fa9d2c0eaae0bd68cec0 +size 645