From 511ff95b479b3213afc26f5d4f9a4e0a6ba7c4f5 Mon Sep 17 00:00:00 2001 From: hgn Date: Mon, 15 Nov 2021 12:17:09 +0000 Subject: [PATCH 01/16] score save to disk Former-commit-id: 284582f279c0241552d5b989b3207a259baf6046 --- fishladder.c.REMOVED.git-id | 2 +- maps/impossible.map | 13 +++++++++++++ maps/level2.map | 8 ++++++++ maps/level3.map | 10 ++++++++++ maps/level4.map | 10 ++++++++++ maps/level5.map | 13 +++++++++++++ vg/vg_io.h.REMOVED.git-id | 2 +- 7 files changed, 56 insertions(+), 2 deletions(-) create mode 100644 maps/impossible.map create mode 100644 maps/level2.map create mode 100644 maps/level3.map create mode 100644 maps/level4.map create mode 100644 maps/level5.map diff --git a/fishladder.c.REMOVED.git-id b/fishladder.c.REMOVED.git-id index ffb11e8..423322e 100644 --- a/fishladder.c.REMOVED.git-id +++ b/fishladder.c.REMOVED.git-id @@ -1 +1 @@ -0abe4b52946b9490dfa3f85bd8c53291a9020136 \ No newline at end of file +e3669a45e66f1cb46c0a9172fabc856ef9e7c638 \ No newline at end of file diff --git a/maps/impossible.map b/maps/impossible.map new file mode 100644 index 0000000..94fa39d --- /dev/null +++ b/maps/impossible.map @@ -0,0 +1,13 @@ +###############; +####-##-##-####;a,a,a +## ##; +## ##; +## ##; +## ##; +## ##; +## ##; +## ##; +## ##; +## ##; +#######+#######;aaa +###############; diff --git a/maps/level2.map b/maps/level2.map new file mode 100644 index 0000000..46cc4e7 --- /dev/null +++ b/maps/level2.map @@ -0,0 +1,8 @@ +###########; +#####-#####;bbbbb +## ##; +## ###; +## # ##; +## ##; +###+##+####;bbb,bb +###########; diff --git a/maps/level3.map b/maps/level3.map new file mode 100644 index 0000000..9c548b3 --- /dev/null +++ b/maps/level3.map @@ -0,0 +1,10 @@ +#############; +###-#####-###;a,aaa +## ##; +## ##; +## ##; +## ##; +## ##; +## ##; +######+######;aaaa +#############; diff --git a/maps/level4.map b/maps/level4.map new file mode 100644 index 0000000..3fa19dc --- /dev/null +++ b/maps/level4.map @@ -0,0 +1,10 @@ +#############; +###-#####-###;aaa,aa +## ##; +## ##; +## ##; +## ##; +## ##; +## ##; +###+#####+###;aa,aaa +#############; diff --git a/maps/level5.map b/maps/level5.map new file mode 100644 index 0000000..0614be6 --- /dev/null +++ b/maps/level5.map @@ -0,0 +1,13 @@ +###############; +####-##########;abcb +## ##; +## ##; +## ##; +## ##; +## ##; +## ##; +## ##; +## ##; +## ##; +##########+####;bcba +###############; diff --git a/vg/vg_io.h.REMOVED.git-id b/vg/vg_io.h.REMOVED.git-id index ebad0e4..7723f1c 100644 --- a/vg/vg_io.h.REMOVED.git-id +++ b/vg/vg_io.h.REMOVED.git-id @@ -1 +1 @@ -d037dd2a1aff2649872da5679767156a7e293c17 \ No newline at end of file +afd134f45a05a76d72d0a69ee7a5076a2eeecd93 \ No newline at end of file -- 2.25.1 From 224963998accba9f2a12853f47687c6c0559f316 Mon Sep 17 00:00:00 2001 From: hgn Date: Mon, 15 Nov 2021 15:51:16 +0000 Subject: [PATCH 02/16] fixed invalid reads / some bugs Former-commit-id: 8abf2b92cf0c9608ac922e96549a68652b7659c0 --- build.sh.REMOVED.git-id | 2 +- fishladder.c.REMOVED.git-id | 2 +- vg/vg_shader.h.REMOVED.git-id | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.sh.REMOVED.git-id b/build.sh.REMOVED.git-id index 4488fda..254a262 100644 --- a/build.sh.REMOVED.git-id +++ b/build.sh.REMOVED.git-id @@ -1 +1 @@ -328e432a9bf367015e515dff195d6099ced08971 \ No newline at end of file +ab013e2b2371ec28eaa18311d656abe52d0b7a41 \ No newline at end of file diff --git a/fishladder.c.REMOVED.git-id b/fishladder.c.REMOVED.git-id index 423322e..d77c0ef 100644 --- a/fishladder.c.REMOVED.git-id +++ b/fishladder.c.REMOVED.git-id @@ -1 +1 @@ -e3669a45e66f1cb46c0a9172fabc856ef9e7c638 \ No newline at end of file +52752d53905032b2627f180f36d1d85ec861479d \ No newline at end of file diff --git a/vg/vg_shader.h.REMOVED.git-id b/vg/vg_shader.h.REMOVED.git-id index b1b610f..b276a36 100644 --- a/vg/vg_shader.h.REMOVED.git-id +++ b/vg/vg_shader.h.REMOVED.git-id @@ -1 +1 @@ -8e17da33e22d8c60baa0dbf49ac7d3b97d3c92c7 \ No newline at end of file +ff8a5f0dc143c6126167394579fc4cced7922499 \ No newline at end of file -- 2.25.1 From 09bce8f651f61f226223f6362249e599246db4c4 Mon Sep 17 00:00:00 2001 From: hgn Date: Wed, 17 Nov 2021 12:16:07 +0000 Subject: [PATCH 03/16] added score counters/career stuff Former-commit-id: e750e1ea996212bec83072cab19cc21c358b4d89 --- fishladder.c.REMOVED.git-id | 2 +- fishladder_resources.h.REMOVED.git-id | 2 +- fonts/numbers/n0.h | 9 +++++++++ fonts/numbers/n1.h | 5 +++++ fonts/numbers/n2.h | 11 +++++++++++ fonts/numbers/n3.h | 12 ++++++++++++ fonts/numbers/n4.h | 10 ++++++++++ fonts/numbers/n5.h | 11 +++++++++++ fonts/numbers/n6.h | 14 ++++++++++++++ fonts/numbers/n7.h | 5 +++++ fonts/numbers/n8.h.REMOVED.git-id | 1 + fonts/numbers/n9.h | 14 ++++++++++++++ 12 files changed, 94 insertions(+), 2 deletions(-) create mode 100644 fonts/numbers/n0.h create mode 100644 fonts/numbers/n1.h create mode 100644 fonts/numbers/n2.h create mode 100644 fonts/numbers/n3.h create mode 100644 fonts/numbers/n4.h create mode 100644 fonts/numbers/n5.h create mode 100644 fonts/numbers/n6.h create mode 100644 fonts/numbers/n7.h create mode 100644 fonts/numbers/n8.h.REMOVED.git-id create mode 100644 fonts/numbers/n9.h diff --git a/fishladder.c.REMOVED.git-id b/fishladder.c.REMOVED.git-id index d77c0ef..272c44d 100644 --- a/fishladder.c.REMOVED.git-id +++ b/fishladder.c.REMOVED.git-id @@ -1 +1 @@ -52752d53905032b2627f180f36d1d85ec861479d \ No newline at end of file +de9da68cac28ba2d7dc9acff593111af255e80ae \ No newline at end of file diff --git a/fishladder_resources.h.REMOVED.git-id b/fishladder_resources.h.REMOVED.git-id index 85a2c2b..3d184b7 100644 --- a/fishladder_resources.h.REMOVED.git-id +++ b/fishladder_resources.h.REMOVED.git-id @@ -1 +1 @@ -511854b8c107fc8d25d44d5b615f84ef263c41a2 \ No newline at end of file +0585b0ce2cb295499c5db40df375074e1e98e9d9 \ No newline at end of file diff --git a/fonts/numbers/n0.h b/fonts/numbers/n0.h new file mode 100644 index 0000000..111d132 --- /dev/null +++ b/fonts/numbers/n0.h @@ -0,0 +1,9 @@ +/*triangle buffer generated from source file: 'models/n0.obj'*/ +0.500000f,-0.000000f,0.375000f,0.875000f,0.375000f,0.125000f, +0.500000f,1.000000f,0.125000f,0.875000f,0.375000f,0.875000f, +0.375000f,0.125000f,0.000000f,-0.000000f,0.500000f,-0.000000f, +0.000000f,-0.000000f,0.125000f,0.875000f,0.000000f,1.000000f, +0.500000f,-0.000000f,0.500000f,1.000000f,0.375000f,0.875000f, +0.500000f,1.000000f,0.000000f,1.000000f,0.125000f,0.875000f, +0.375000f,0.125000f,0.125000f,0.125000f,0.000000f,-0.000000f, +0.000000f,-0.000000f,0.125000f,0.125000f,0.125000f,0.875000f, diff --git a/fonts/numbers/n1.h b/fonts/numbers/n1.h new file mode 100644 index 0000000..6d395ae --- /dev/null +++ b/fonts/numbers/n1.h @@ -0,0 +1,5 @@ +/*triangle buffer generated from source file: 'models/n1.obj'*/ +0.437500f,-0.000000f,0.312500f,0.875000f,0.312500f,-0.000000f, +0.312500f,0.875000f,0.250000f,1.000000f,0.250000f,0.875000f, +0.437500f,-0.000000f,0.437500f,1.000000f,0.312500f,0.875000f, +0.312500f,0.875000f,0.437500f,1.000000f,0.250000f,1.000000f, diff --git a/fonts/numbers/n2.h b/fonts/numbers/n2.h new file mode 100644 index 0000000..a71391a --- /dev/null +++ b/fonts/numbers/n2.h @@ -0,0 +1,11 @@ +/*triangle buffer generated from source file: 'models/n2.obj'*/ +0.500000f,0.437500f,0.375000f,0.875000f,0.375000f,0.562500f, +0.125000f,0.437500f,0.375000f,0.562500f,0.000000f,0.562500f, +0.125000f,0.125000f,0.000000f,0.562500f,0.000000f,-0.000000f, +0.375000f,0.875000f,0.000000f,1.000000f,0.000000f,0.875000f, +0.125000f,0.125000f,0.500000f,-0.000000f,0.500000f,0.125000f, +0.500000f,0.437500f,0.500000f,1.000000f,0.375000f,0.875000f, +0.125000f,0.437500f,0.500000f,0.437500f,0.375000f,0.562500f, +0.125000f,0.125000f,0.125000f,0.437500f,0.000000f,0.562500f, +0.375000f,0.875000f,0.500000f,1.000000f,0.000000f,1.000000f, +0.125000f,0.125000f,0.000000f,-0.000000f,0.500000f,-0.000000f, diff --git a/fonts/numbers/n3.h b/fonts/numbers/n3.h new file mode 100644 index 0000000..fb91e11 --- /dev/null +++ b/fonts/numbers/n3.h @@ -0,0 +1,12 @@ +/*triangle buffer generated from source file: 'models/n3.obj'*/ +0.500000f,0.562500f,0.375000f,0.875000f,0.375000f,0.562500f, +0.000000f,0.437500f,0.375000f,0.562500f,0.000000f,0.562500f, +0.500000f,0.562500f,0.375000f,0.125000f,0.500000f,-0.000000f, +0.375000f,0.875000f,0.000000f,1.000000f,0.000000f,0.875000f, +0.375000f,0.562500f,0.375000f,0.437500f,0.500000f,0.562500f, +0.375000f,0.125000f,0.000000f,-0.000000f,0.500000f,-0.000000f, +0.500000f,0.562500f,0.500000f,1.000000f,0.375000f,0.875000f, +0.000000f,0.437500f,0.375000f,0.437500f,0.375000f,0.562500f, +0.500000f,0.562500f,0.375000f,0.437500f,0.375000f,0.125000f, +0.375000f,0.875000f,0.500000f,1.000000f,0.000000f,1.000000f, +0.375000f,0.125000f,0.000000f,0.125000f,0.000000f,-0.000000f, diff --git a/fonts/numbers/n4.h b/fonts/numbers/n4.h new file mode 100644 index 0000000..065737c --- /dev/null +++ b/fonts/numbers/n4.h @@ -0,0 +1,10 @@ +/*triangle buffer generated from source file: 'models/n4.obj'*/ +0.125000f,0.562500f,0.000000f,1.000000f,0.000000f,0.437500f, +0.125000f,0.562500f,0.375000f,0.437500f,0.375000f,0.562500f, +0.375000f,0.562500f,0.375000f,0.437500f,0.500000f,0.562500f, +0.500000f,0.562500f,0.375000f,1.000000f,0.375000f,0.562500f, +0.375000f,0.437500f,0.500000f,-0.000000f,0.500000f,0.562500f, +0.125000f,0.562500f,0.125000f,1.000000f,0.000000f,1.000000f, +0.125000f,0.562500f,0.000000f,0.437500f,0.375000f,0.437500f, +0.500000f,0.562500f,0.500000f,1.000000f,0.375000f,1.000000f, +0.375000f,0.437500f,0.375000f,-0.000000f,0.500000f,-0.000000f, diff --git a/fonts/numbers/n5.h b/fonts/numbers/n5.h new file mode 100644 index 0000000..176aed8 --- /dev/null +++ b/fonts/numbers/n5.h @@ -0,0 +1,11 @@ +/*triangle buffer generated from source file: 'models/n5.obj'*/ +0.125000f,0.875000f,0.000000f,0.437500f,0.125000f,0.562500f, +0.125000f,0.562500f,0.375000f,0.437500f,0.500000f,0.562500f, +0.500000f,0.562500f,0.375000f,0.125000f,0.500000f,-0.000000f, +0.125000f,0.875000f,0.500000f,1.000000f,0.000000f,1.000000f, +0.375000f,0.125000f,0.000000f,-0.000000f,0.500000f,-0.000000f, +0.125000f,0.875000f,0.000000f,1.000000f,0.000000f,0.437500f, +0.125000f,0.562500f,0.000000f,0.437500f,0.375000f,0.437500f, +0.500000f,0.562500f,0.375000f,0.437500f,0.375000f,0.125000f, +0.125000f,0.875000f,0.500000f,0.875000f,0.500000f,1.000000f, +0.375000f,0.125000f,0.000000f,0.125000f,0.000000f,-0.000000f, diff --git a/fonts/numbers/n6.h b/fonts/numbers/n6.h new file mode 100644 index 0000000..675ea5b --- /dev/null +++ b/fonts/numbers/n6.h @@ -0,0 +1,14 @@ +/*triangle buffer generated from source file: 'models/n6.obj'*/ +0.500000f,0.562500f,0.375000f,0.125000f,0.500000f,-0.000000f, +0.125000f,0.125000f,0.500000f,-0.000000f,0.375000f,0.125000f, +0.125000f,0.437500f,0.000000f,-0.000000f,0.125000f,0.125000f, +0.125000f,0.437500f,0.125000f,0.562500f,0.000000f,0.562500f, +0.125000f,0.562500f,0.375000f,0.437500f,0.500000f,0.562500f, +0.125000f,0.875000f,0.000000f,0.562500f,0.125000f,0.562500f, +0.125000f,0.875000f,0.500000f,1.000000f,0.000000f,1.000000f, +0.500000f,0.562500f,0.375000f,0.437500f,0.375000f,0.125000f, +0.125000f,0.125000f,0.000000f,-0.000000f,0.500000f,-0.000000f, +0.125000f,0.437500f,0.000000f,0.562500f,0.000000f,-0.000000f, +0.125000f,0.562500f,0.125000f,0.437500f,0.375000f,0.437500f, +0.125000f,0.875000f,0.000000f,1.000000f,0.000000f,0.562500f, +0.125000f,0.875000f,0.500000f,0.875000f,0.500000f,1.000000f, diff --git a/fonts/numbers/n7.h b/fonts/numbers/n7.h new file mode 100644 index 0000000..f3016f3 --- /dev/null +++ b/fonts/numbers/n7.h @@ -0,0 +1,5 @@ +/*triangle buffer generated from source file: 'models/n7.obj'*/ +0.500000f,-0.000000f,0.375000f,0.875000f,0.375000f,-0.000000f, +0.375000f,0.875000f,0.000000f,1.000000f,0.000000f,0.875000f, +0.500000f,-0.000000f,0.500000f,1.000000f,0.375000f,0.875000f, +0.375000f,0.875000f,0.500000f,1.000000f,0.000000f,1.000000f, diff --git a/fonts/numbers/n8.h.REMOVED.git-id b/fonts/numbers/n8.h.REMOVED.git-id new file mode 100644 index 0000000..9b5efa2 --- /dev/null +++ b/fonts/numbers/n8.h.REMOVED.git-id @@ -0,0 +1 @@ +e7f59576ea64c4d15ef9b693f01da0114db76f83 \ No newline at end of file diff --git a/fonts/numbers/n9.h b/fonts/numbers/n9.h new file mode 100644 index 0000000..ccc3e6c --- /dev/null +++ b/fonts/numbers/n9.h @@ -0,0 +1,14 @@ +/*triangle buffer generated from source file: 'models/n9.obj'*/ +0.000000f,1.000000f,0.125000f,0.562500f,0.125000f,0.875000f, +0.375000f,0.875000f,0.000000f,1.000000f,0.125000f,0.875000f, +0.375000f,0.875000f,0.500000f,0.437500f,0.500000f,1.000000f, +0.375000f,0.562500f,0.375000f,0.437500f,0.500000f,0.437500f, +0.375000f,0.437500f,0.125000f,0.562500f,0.000000f,0.437500f, +0.375000f,0.125000f,0.500000f,0.437500f,0.375000f,0.437500f, +0.375000f,0.125000f,0.000000f,-0.000000f,0.500000f,-0.000000f, +0.000000f,1.000000f,0.000000f,0.437500f,0.125000f,0.562500f, +0.375000f,0.875000f,0.500000f,1.000000f,0.000000f,1.000000f, +0.375000f,0.875000f,0.375000f,0.562500f,0.500000f,0.437500f, +0.375000f,0.437500f,0.375000f,0.562500f,0.125000f,0.562500f, +0.375000f,0.125000f,0.500000f,-0.000000f,0.500000f,0.437500f, +0.375000f,0.125000f,0.000000f,0.125000f,0.000000f,-0.000000f, -- 2.25.1 From 43f667542bce10ee5a554ef2b685803b0b7a40e2 Mon Sep 17 00:00:00 2001 From: hgn Date: Sat, 20 Nov 2021 11:30:02 +0000 Subject: [PATCH 04/16] switch to multiple runs conditions Former-commit-id: eb539f4993a936fee522af4a977e39186de47396 --- fishladder.c.REMOVED.git-id | 2 +- maps/level6.map | 15 +++++++++++++++ maps/xor.map | 15 +++++++++++++++ 3 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 maps/level6.map create mode 100644 maps/xor.map diff --git a/fishladder.c.REMOVED.git-id b/fishladder.c.REMOVED.git-id index 272c44d..bd5f8b3 100644 --- a/fishladder.c.REMOVED.git-id +++ b/fishladder.c.REMOVED.git-id @@ -1 +1 @@ -de9da68cac28ba2d7dc9acff593111af255e80ae \ No newline at end of file +1d93a6088e15d24f782e55fb63b274140aa102d9 \ No newline at end of file diff --git a/maps/level6.map b/maps/level6.map new file mode 100644 index 0000000..a9802d1 --- /dev/null +++ b/maps/level6.map @@ -0,0 +1,15 @@ +#################; +##-###########-##;acac,acac +## ##; +## ##; +## ##; +## ##; +## ##; +## ##; +## ##; +## ##; +## ##; +## ##; +## ##; +########+########;aaaacccc +#################; diff --git a/maps/xor.map b/maps/xor.map new file mode 100644 index 0000000..ca66c87 --- /dev/null +++ b/maps/xor.map @@ -0,0 +1,15 @@ +#################; +########-########;c:c: +## ##; +## ##; +## ##; +## ##; +## ##; +## ##; +## ##; +## ##; +## ##; +## ##; +## ##; +#####+##+#####+##;:a:,a::a,c:c:c +#################; -- 2.25.1 From 874adec0ce8b1e93f412dd266b14a9468d40b600 Mon Sep 17 00:00:00 2001 From: hgn Date: Tue, 23 Nov 2021 17:05:25 +0000 Subject: [PATCH 05/16] added basic cell triggering Former-commit-id: 7d8dae73edd0ecb6a1212046952740d43618dd81 --- fishladder.c.REMOVED.git-id | 2 +- maps/level7_combine.map | 15 +++++++++++++++ textures/tileset.png.REMOVED.git-id | 2 +- 3 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 maps/level7_combine.map diff --git a/fishladder.c.REMOVED.git-id b/fishladder.c.REMOVED.git-id index bd5f8b3..687d3c8 100644 --- a/fishladder.c.REMOVED.git-id +++ b/fishladder.c.REMOVED.git-id @@ -1 +1 @@ -1d93a6088e15d24f782e55fb63b274140aa102d9 \ No newline at end of file +3a3d53c4f7dd8408e3d40780b97a90efd103a804 \ No newline at end of file diff --git a/maps/level7_combine.map b/maps/level7_combine.map new file mode 100644 index 0000000..4e06beb --- /dev/null +++ b/maps/level7_combine.map @@ -0,0 +1,15 @@ +#################; +##-###########-##;aaa,bbb +## ##; +## ##; +## ##; +## ##; +## ##; +## ##; +## ##; +## ##; +## ##; +## ##; +## ##; +####+###+###+####;ab,ab,ab +#################; diff --git a/textures/tileset.png.REMOVED.git-id b/textures/tileset.png.REMOVED.git-id index 6162015..b67fe16 100644 --- a/textures/tileset.png.REMOVED.git-id +++ b/textures/tileset.png.REMOVED.git-id @@ -1 +1 @@ -6d8928b59e11be0896064eb0e02c797920ce51f2 \ No newline at end of file +522d5706ff2124ea551de9eeb4c0aa359ca2f8c4 \ No newline at end of file -- 2.25.1 From dd5d7090e1adc30732372c3841f0fdaef28b4349 Mon Sep 17 00:00:00 2001 From: hgn Date: Wed, 24 Nov 2021 17:46:26 +0000 Subject: [PATCH 06/16] trigger link serialize/load Former-commit-id: f41ad9a5cd33c68bab59f2818416b8b6e8b632ae --- fishladder.c.REMOVED.git-id | 2 +- maps/xor.map | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fishladder.c.REMOVED.git-id b/fishladder.c.REMOVED.git-id index 687d3c8..01ac03f 100644 --- a/fishladder.c.REMOVED.git-id +++ b/fishladder.c.REMOVED.git-id @@ -1 +1 @@ -3a3d53c4f7dd8408e3d40780b97a90efd103a804 \ No newline at end of file +bcb554774c96c1a1b6797eb2a0c83f205fa26c16 \ No newline at end of file diff --git a/maps/xor.map b/maps/xor.map index ca66c87..4d05382 100644 --- a/maps/xor.map +++ b/maps/xor.map @@ -11,5 +11,5 @@ ## ##; ## ##; ## ##; -#####+##+#####+##;:a:,a::a,c:c:c +#####+##+#####+##;:a:a,a::a,c:c:c #################; -- 2.25.1 From 11c4a6567d668979a96fa9a20ba70025efc7f6d4 Mon Sep 17 00:00:00 2001 From: hgn Date: Thu, 25 Nov 2021 04:13:56 +0000 Subject: [PATCH 07/16] bendy ropes Former-commit-id: f98aae8c634505a899a2feaec34af873d90227cc --- fishladder.c.REMOVED.git-id | 2 +- maps/and_small.map | 9 +++++++++ maps/xor_small.map | 12 ++++++++++++ 3 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 maps/and_small.map create mode 100644 maps/xor_small.map diff --git a/fishladder.c.REMOVED.git-id b/fishladder.c.REMOVED.git-id index 01ac03f..461aeaf 100644 --- a/fishladder.c.REMOVED.git-id +++ b/fishladder.c.REMOVED.git-id @@ -1 +1 @@ -bcb554774c96c1a1b6797eb2a0c83f205fa26c16 \ No newline at end of file +bcbc37428b6335433bd2ff7306feb337aeab982d \ No newline at end of file diff --git a/maps/and_small.map b/maps/and_small.map new file mode 100644 index 0000000..f241bc0 --- /dev/null +++ b/maps/and_small.map @@ -0,0 +1,9 @@ +#############; +######-######;::c +## ##; +## ##; +## ##; +## ##; +## ##; +###+##+###+##;:a:a,a::a,c:c:c +#############; diff --git a/maps/xor_small.map b/maps/xor_small.map new file mode 100644 index 0000000..1cf622c --- /dev/null +++ b/maps/xor_small.map @@ -0,0 +1,12 @@ +#############; +######-######;:c:c: +## ##; +## ##; +## ##; +## ##; +## ##; +## ##; +## ##; +## ##; +###+##+###+##;::a:a,:a::a,c:c:c:c +#############; -- 2.25.1 From 4bbfc5bfc198dddbc323ae003edf16d7024590ff Mon Sep 17 00:00:00 2001 From: hgn Date: Fri, 26 Nov 2021 14:17:00 +0000 Subject: [PATCH 08/16] level changes Former-commit-id: 18aa936b41a102700b6fc9fc9f0ac49712a0fced --- fishladder.c.REMOVED.git-id | 2 +- maps/level5.map | 4 ++-- maps/level7_combine.map | 25 ++++++++++--------------- 3 files changed, 13 insertions(+), 18 deletions(-) diff --git a/fishladder.c.REMOVED.git-id b/fishladder.c.REMOVED.git-id index 461aeaf..306c873 100644 --- a/fishladder.c.REMOVED.git-id +++ b/fishladder.c.REMOVED.git-id @@ -1 +1 @@ -bcbc37428b6335433bd2ff7306feb337aeab982d \ No newline at end of file +e7cd191add03093edde65cec9982454be901e139 \ No newline at end of file diff --git a/maps/level5.map b/maps/level5.map index 0614be6..7e2c727 100644 --- a/maps/level5.map +++ b/maps/level5.map @@ -1,5 +1,5 @@ ###############; -####-##########;abcb +####-##########;abcb:ccaa ## ##; ## ##; ## ##; @@ -9,5 +9,5 @@ ## ##; ## ##; ## ##; -##########+####;bcba +##########+####;bcba:aacc ###############; diff --git a/maps/level7_combine.map b/maps/level7_combine.map index 4e06beb..72333e1 100644 --- a/maps/level7_combine.map +++ b/maps/level7_combine.map @@ -1,15 +1,10 @@ -#################; -##-###########-##;aaa,bbb -## ##; -## ##; -## ##; -## ##; -## ##; -## ##; -## ##; -## ##; -## ##; -## ##; -## ##; -####+###+###+####;ab,ab,ab -#################; +#############; +##-#######-##;aaa,bbb +## ##; +## ##; +## ##; +## ##; +## ##; +## ##; +###+###+##+##;ab,ab,ab +#############; -- 2.25.1 From 94221159b6d9b1c985017c9286d653ca5198c875 Mon Sep 17 00:00:00 2001 From: hgn Date: Fri, 26 Nov 2021 16:22:30 +0000 Subject: [PATCH 09/16] fixed windows line-endings messing stuff up Former-commit-id: 17d104181ae9f3b9cb16dab5ba3164d2f469233d --- build.sh.REMOVED.git-id | 2 +- fishladder.c.REMOVED.git-id | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sh.REMOVED.git-id b/build.sh.REMOVED.git-id index 254a262..3979166 100644 --- a/build.sh.REMOVED.git-id +++ b/build.sh.REMOVED.git-id @@ -1 +1 @@ -ab013e2b2371ec28eaa18311d656abe52d0b7a41 \ No newline at end of file +c24169d30f577750c4fc9d3945672f565d78b7e3 \ No newline at end of file diff --git a/fishladder.c.REMOVED.git-id b/fishladder.c.REMOVED.git-id index 306c873..43eef71 100644 --- a/fishladder.c.REMOVED.git-id +++ b/fishladder.c.REMOVED.git-id @@ -1 +1 @@ -e7cd191add03093edde65cec9982454be901e139 \ No newline at end of file +68f04febd75e54bd42da4c043bf3d956d0503caf \ No newline at end of file -- 2.25.1 From bcf278e03a21afb94ab7e773ba10ccf598321f63 Mon Sep 17 00:00:00 2001 From: hgn Date: Fri, 26 Nov 2021 18:15:43 +0000 Subject: [PATCH 10/16] switch from png to qoi textures Former-commit-id: 72e9a469a490e537f2e12464c1b075eb8991a868 --- build.sh.REMOVED.git-id | 2 +- fishladder_resources.h.REMOVED.git-id | 2 +- fontcomp.c.REMOVED.git-id | 2 +- phoboslab/qoi.h.REMOVED.git-id | 1 + qoiconv.c.REMOVED.git-id | 1 + vg/vg.h.REMOVED.git-id | 2 +- vg/vg_tex.h.REMOVED.git-id | 2 +- 7 files changed, 7 insertions(+), 5 deletions(-) create mode 100644 phoboslab/qoi.h.REMOVED.git-id create mode 100644 qoiconv.c.REMOVED.git-id diff --git a/build.sh.REMOVED.git-id b/build.sh.REMOVED.git-id index 254a262..88c30b2 100644 --- a/build.sh.REMOVED.git-id +++ b/build.sh.REMOVED.git-id @@ -1 +1 @@ -ab013e2b2371ec28eaa18311d656abe52d0b7a41 \ No newline at end of file +a6a260a8ef77d16db94383b991df196187f0b1d9 \ No newline at end of file diff --git a/fishladder_resources.h.REMOVED.git-id b/fishladder_resources.h.REMOVED.git-id index 3d184b7..9d77e41 100644 --- a/fishladder_resources.h.REMOVED.git-id +++ b/fishladder_resources.h.REMOVED.git-id @@ -1 +1 @@ -0585b0ce2cb295499c5db40df375074e1e98e9d9 \ No newline at end of file +147f9aa748a32feba973175d54866f104e4f85b9 \ No newline at end of file diff --git a/fontcomp.c.REMOVED.git-id b/fontcomp.c.REMOVED.git-id index 61c651f..ff5381d 100644 --- a/fontcomp.c.REMOVED.git-id +++ b/fontcomp.c.REMOVED.git-id @@ -1 +1 @@ -ea1fac962c6da60f7abc3588b7b0af713afa70b6 \ No newline at end of file +73046b80ec1c0d9801d42309e4a54ff829bf5fbb \ No newline at end of file diff --git a/phoboslab/qoi.h.REMOVED.git-id b/phoboslab/qoi.h.REMOVED.git-id new file mode 100644 index 0000000..d59a386 --- /dev/null +++ b/phoboslab/qoi.h.REMOVED.git-id @@ -0,0 +1 @@ +f12b3af662dc45155835b57fb36d5daf19db2b97 \ No newline at end of file diff --git a/qoiconv.c.REMOVED.git-id b/qoiconv.c.REMOVED.git-id new file mode 100644 index 0000000..0a929f0 --- /dev/null +++ b/qoiconv.c.REMOVED.git-id @@ -0,0 +1 @@ +610f2b18d5dc376c844bac841e313969a5368931 \ No newline at end of file diff --git a/vg/vg.h.REMOVED.git-id b/vg/vg.h.REMOVED.git-id index a369fbc..0e2c890 100644 --- a/vg/vg.h.REMOVED.git-id +++ b/vg/vg.h.REMOVED.git-id @@ -1 +1 @@ -bf3a0a0224166961d968560d04e2e1cd41dc8f90 \ No newline at end of file +22cd0a7e3e80bb3fd1a2f41b97c46f97d2bb905c \ No newline at end of file diff --git a/vg/vg_tex.h.REMOVED.git-id b/vg/vg_tex.h.REMOVED.git-id index 3aab4f6..c8c0e9c 100644 --- a/vg/vg_tex.h.REMOVED.git-id +++ b/vg/vg_tex.h.REMOVED.git-id @@ -1 +1 @@ -967337a8fa1a1e40cdbf3296a1347d08e445094c \ No newline at end of file +a9c24c0a68cd4e27e58cc801c248a0b521c8e842 \ No newline at end of file -- 2.25.1 From c7815f7d14ee2f1c240df314b52a3ec2cba8fc7a Mon Sep 17 00:00:00 2001 From: hgn Date: Fri, 26 Nov 2021 19:15:52 +0000 Subject: [PATCH 11/16] fix up build script Former-commit-id: d7f11d926bc3972eba39b51099e216188e87b3ca --- build.sh.REMOVED.git-id | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh.REMOVED.git-id b/build.sh.REMOVED.git-id index 722efd8..440b19a 100644 --- a/build.sh.REMOVED.git-id +++ b/build.sh.REMOVED.git-id @@ -1 +1 @@ -c22ad791c750c60902445519645bcefc33ac33f0 \ No newline at end of file +485a8c170626e76b7bb2902d1c0a3c4413d9dd0d \ No newline at end of file -- 2.25.1 From 090d4d5ce05e5e95937f8f07e0cd3a52524a1be4 Mon Sep 17 00:00:00 2001 From: hgn Date: Sun, 28 Nov 2021 22:02:12 +0000 Subject: [PATCH 12/16] some maps, update QOI, fix bug/UB with too many fishes Former-commit-id: a3c5df9429bfb22d49ef0fac45de4f8e87a938e6 --- fishladder.c.REMOVED.git-id | 2 +- maps/full_adder.map | 16 ++++++++++++++++ maps/half_adder.map | 12 ++++++++++++ maps/sort.map | 16 ++++++++++++++++ phoboslab/qoi.h.REMOVED.git-id | 2 +- qoiconv.c.REMOVED.git-id | 2 +- vg/vg_tex.h.REMOVED.git-id | 2 +- 7 files changed, 48 insertions(+), 4 deletions(-) create mode 100644 maps/full_adder.map create mode 100644 maps/half_adder.map create mode 100644 maps/sort.map diff --git a/fishladder.c.REMOVED.git-id b/fishladder.c.REMOVED.git-id index 43eef71..9c36af1 100644 --- a/fishladder.c.REMOVED.git-id +++ b/fishladder.c.REMOVED.git-id @@ -1 +1 @@ -68f04febd75e54bd42da4c043bf3d956d0503caf \ No newline at end of file +b6c220fbd76f6d5f95e929270d4fd7959492f640 \ No newline at end of file diff --git a/maps/full_adder.map b/maps/full_adder.map new file mode 100644 index 0000000..25a1e27 --- /dev/null +++ b/maps/full_adder.map @@ -0,0 +1,16 @@ +################; +###-##-#########;:c:c:c:,:::c:c +## ##; +## ##; +## ##; +## ##; +## ##; +## ##; +## ##; +## ##; +## ##; +## ##; +## ##; +## ##; +###+##+##+##+###;::b:b:b,:b:b:b:,:b::b:,c:c:c:c:c +################; diff --git a/maps/half_adder.map b/maps/half_adder.map new file mode 100644 index 0000000..aff4da0 --- /dev/null +++ b/maps/half_adder.map @@ -0,0 +1,12 @@ +#############; +###-##-######;:c:c:,:::c +## ##; +## ##; +## ##; +## ##; +## ##; +## ##; +## ##; +## ##; +###+##+###+##;::a:a,:a::a,c:c:c:c +#############; diff --git a/maps/sort.map b/maps/sort.map new file mode 100644 index 0000000..07ab324 --- /dev/null +++ b/maps/sort.map @@ -0,0 +1,16 @@ +################; +####-######-####;aa:a:a:aa,bbb:bbb:bb:bbbb +## ##; +## ##; +## ##; +## ##; +## ##; +## ##; +## ##; +## ##; +## ##; +## ##; +## ##; +## ##; +###+#######+####;aa:bbb:bb:aa,bbb:a:a:bbbb +################; diff --git a/phoboslab/qoi.h.REMOVED.git-id b/phoboslab/qoi.h.REMOVED.git-id index d59a386..e8d16ff 100644 --- a/phoboslab/qoi.h.REMOVED.git-id +++ b/phoboslab/qoi.h.REMOVED.git-id @@ -1 +1 @@ -f12b3af662dc45155835b57fb36d5daf19db2b97 \ No newline at end of file +d70e2e8557dff2e54a6a165d63f9ae54c7c853e0 \ No newline at end of file diff --git a/qoiconv.c.REMOVED.git-id b/qoiconv.c.REMOVED.git-id index 0a929f0..7a5fe43 100644 --- a/qoiconv.c.REMOVED.git-id +++ b/qoiconv.c.REMOVED.git-id @@ -1 +1 @@ -610f2b18d5dc376c844bac841e313969a5368931 \ No newline at end of file +366e92c0e5fc797b9a36e264e34dd673ab359eb4 \ No newline at end of file diff --git a/vg/vg_tex.h.REMOVED.git-id b/vg/vg_tex.h.REMOVED.git-id index c8c0e9c..c1af909 100644 --- a/vg/vg_tex.h.REMOVED.git-id +++ b/vg/vg_tex.h.REMOVED.git-id @@ -1 +1 @@ -a9c24c0a68cd4e27e58cc801c248a0b521c8e842 \ No newline at end of file +e97900fed12054673ab7d5a67abe3d85661ecfa4 \ No newline at end of file -- 2.25.1 From c4c1271efdb953b8e636ea2d0df7f59e0d5a2ee4 Mon Sep 17 00:00:00 2001 From: hgn Date: Mon, 29 Nov 2021 16:42:12 +0000 Subject: [PATCH 13/16] line/curve renderer Former-commit-id: 8a39a1bbac29228f650cef6c1d36f618f1c3c000 --- fishladder.c.REMOVED.git-id | 2 +- fishladder_resources.h.REMOVED.git-id | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fishladder.c.REMOVED.git-id b/fishladder.c.REMOVED.git-id index 9c36af1..25566cb 100644 --- a/fishladder.c.REMOVED.git-id +++ b/fishladder.c.REMOVED.git-id @@ -1 +1 @@ -b6c220fbd76f6d5f95e929270d4fd7959492f640 \ No newline at end of file +6c5e9962bb79ef613170cc8159caa0e5099e58d5 \ No newline at end of file diff --git a/fishladder_resources.h.REMOVED.git-id b/fishladder_resources.h.REMOVED.git-id index 9d77e41..4e910da 100644 --- a/fishladder_resources.h.REMOVED.git-id +++ b/fishladder_resources.h.REMOVED.git-id @@ -1 +1 @@ -147f9aa748a32feba973175d54866f104e4f85b9 \ No newline at end of file +2bd1442d125e379b53eb589b77fc3f0b81ba8390 \ No newline at end of file -- 2.25.1 From 30d342b144bf4643c0615a4b0d803c74af8a31e1 Mon Sep 17 00:00:00 2001 From: hgn Date: Mon, 29 Nov 2021 18:35:26 +0000 Subject: [PATCH 14/16] thids/trigger stabalize Former-commit-id: edd5498fac470c6a98e45ab326c2bf2e2a552664 --- fishladder.c.REMOVED.git-id | 2 +- maps/thirds.map | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 maps/thirds.map diff --git a/fishladder.c.REMOVED.git-id b/fishladder.c.REMOVED.git-id index 25566cb..2bfaa4f 100644 --- a/fishladder.c.REMOVED.git-id +++ b/fishladder.c.REMOVED.git-id @@ -1 +1 @@ -6c5e9962bb79ef613170cc8159caa0e5099e58d5 \ No newline at end of file +f310bd53ff798ad3f00e018b7a60158163ba610b \ No newline at end of file diff --git a/maps/thirds.map b/maps/thirds.map new file mode 100644 index 0000000..ab14e51 --- /dev/null +++ b/maps/thirds.map @@ -0,0 +1,12 @@ +#############; +###-##-##-###;a:aa:aaa,a:aa:aaa,a:aa:aaa +## ##; +## ##; +## ##; +## ##; +## ##; +## ##; +## ##; +## ##; +######+######;aaa:aaaaaa:aaaaaaaaa +#############; -- 2.25.1 From 7f45211a288a6c3e91565c1bca4d720364dc4237 Mon Sep 17 00:00:00 2001 From: hgn Date: Tue, 30 Nov 2021 00:11:36 +0000 Subject: [PATCH 15/16] added pull animation to wires Former-commit-id: de8f99418ff76e1d22bfd549b8f0bcc33d61e778 --- fishladder.c.REMOVED.git-id | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fishladder.c.REMOVED.git-id b/fishladder.c.REMOVED.git-id index 2bfaa4f..88a81d1 100644 --- a/fishladder.c.REMOVED.git-id +++ b/fishladder.c.REMOVED.git-id @@ -1 +1 @@ -f310bd53ff798ad3f00e018b7a60158163ba610b \ No newline at end of file +072c9a09a2592748d4fa65f45c57d775efaaef00 \ No newline at end of file -- 2.25.1 From ee9482ce77b40de1723792120b47f51c55daeaeb Mon Sep 17 00:00:00 2001 From: hgn Date: Tue, 30 Nov 2021 00:17:19 +0000 Subject: [PATCH 16/16] improve dragging wire visuals Former-commit-id: 4528469af4267280885db212dd5c68ee938ebd92 --- fishladder.c.REMOVED.git-id | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fishladder.c.REMOVED.git-id b/fishladder.c.REMOVED.git-id index 88a81d1..0e01be9 100644 --- a/fishladder.c.REMOVED.git-id +++ b/fishladder.c.REMOVED.git-id @@ -1 +1 @@ -072c9a09a2592748d4fa65f45c57d775efaaef00 \ No newline at end of file +461731df105000130099fc37309ab36d9cb887b6 \ No newline at end of file -- 2.25.1