Skip to content

Commit 47cbaaa

Browse files
authored
Merge pull request #21 from xinemata/main
added cc by-nc-sa 4.0 attributions
2 parents 2de81be + d5aef09 commit 47cbaaa

13 files changed

Lines changed: 28 additions & 1 deletion

_curriculum/02-01_Intro.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ gallery: # Below is for including an image gallery
1919
title: "Book from the Ground, Xu Bing"
2020
---
2121

22+
Lost and Found remixes Critical Computation by Xin Xin and Katherine Moriwaki, licensed under [CC BY-NC-SA 4.0](https://creativecommons.org/licenses/by-nc-sa/4.0/deed.en).
23+
2224
![Create a digital drawing tool with p5.js!]({{ "/assets/images/curriculum/Unit-1_Sample-6.png" | relative_url }})
2325
[The Necklace](https://cc-lab-portfolio-ardak.glitch.me/p1.html). Made in [p5.js](https://p5js.org/) by Ardak Mukanova.
2426

_curriculum/02-01_Lessons.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ permalink: /lostAndFound-lessons/1 # Give your page a permalink
55
published: true
66
---
77

8+
Lost and Found remixes Critical Computation by Xin Xin and Katherine Moriwaki, licensed under [CC BY-NC-SA 4.0](https://creativecommons.org/licenses/by-nc-sa/4.0/deed.en).
9+
810
## Shape
911
<iframe width="560" height="315" src="https://www.youtube.com/embed/hISICBkFa4Q?si=U-LWuegXM9xtLfXg" title="YouTube video player" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share" referrerpolicy="strict-origin-when-cross-origin" allowfullscreen></iframe>
1012

_curriculum/02-02_Lessons.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ permalink: /lostAndFound-lessons/2 # Give your page a permalink
55
published: true
66
---
77

8+
Lost and Found remixes Critical Computation by Xin Xin and Katherine Moriwaki, licensed under [CC BY-NC-SA 4.0](https://creativecommons.org/licenses/by-nc-sa/4.0/deed.en).
9+
810
## Color
911
<iframe width="560" height="315" src="https://www.youtube.com/embed/fTEvHLLwSBE?si=O-3UMF0ZjaUhQb6M" title="YouTube video player" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share" referrerpolicy="strict-origin-when-cross-origin" allowfullscreen></iframe>
1012

_curriculum/02-03_Lessons.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ permalink: /lostAndFound-lessons/3 # Give your page a permalink
55
published: true
66
---
77

8+
Lost and Found remixes Critical Computation by Xin Xin and Katherine Moriwaki, licensed under [CC BY-NC-SA 4.0](https://creativecommons.org/licenses/by-nc-sa/4.0/deed.en).
9+
810
## Composition
911

1012
### Grade 6~8

_curriculum/02-04_Lessons.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ permalink: /lostAndFound-lessons/4 # Give your page a permalink
55
published: true
66
---
77

8+
Lost and Found remixes Critical Computation by Xin Xin and Katherine Moriwaki, licensed under [CC BY-NC-SA 4.0](https://creativecommons.org/licenses/by-nc-sa/4.0/deed.en).
9+
810
## Variables
911

1012
### Grade 6~8

_curriculum/02-05_Lessons.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ permalink: /lostAndFound-lessons/5 # Give your page a permalink
55
published: true
66
---
77

8+
Lost and Found remixes Critical Computation by Xin Xin and Katherine Moriwaki, licensed under [CC BY-NC-SA 4.0](https://creativecommons.org/licenses/by-nc-sa/4.0/deed.en).
9+
810
## Randomness
911

1012
### Grade 6~8

_curriculum/02-06_Lessons.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ permalink: /lostAndFound-lessons/6 # Give your page a permalink
55
published: true
66
---
77

8+
Lost and Found remixes Critical Computation by Xin Xin and Katherine Moriwaki, licensed under [CC BY-NC-SA 4.0](https://creativecommons.org/licenses/by-nc-sa/4.0/deed.en).
9+
810
#### System Variables
911

1012
The [p5.js contributors](https://github.com/processing/p5.js?tab=readme-ov-file#contributors) have created a couple of variables that are available for us to load and use. These system variables were created to bring joy and ease to the coding process. We will spend the rest of Art + Code to try them out.

_curriculum/03-01-Intro.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ gallery: # Below is for including an image gallery
2121

2222
---
2323

24+
Mask Generator remixes Critical Computation by Xin Xin and Katherine Moriwaki, licensed under [CC BY-NC-SA 4.0](https://creativecommons.org/licenses/by-nc-sa/4.0/deed.en).
25+
2426
![Create a digital collage with p5.js!]({{ "https://verse.works/image/w3840/static%2F1dbce05a-42de-4250-a1b7-4f22d3e61886.png@webp" | relative_url }})
2527
[Generativemasks](https://generativemasks.io/gallery). Made in [p5.js](https://p5js.org/) by Shunsuke Takawo.
2628

_curriculum/03-02-Intro.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ permalink: /maskGenerator-intro/2 # Give your page a permalink
66
published: true
77
---
88

9+
Mask Generator remixes Critical Computation by Xin Xin and Katherine Moriwaki, licensed under [CC BY-NC-SA 4.0](https://creativecommons.org/licenses/by-nc-sa/4.0/deed.en)
10+
911
## Software that Makes Mistakes
1012

1113
![Sentiment analysis]({{ "/assets/images/curriculum/hito_s.webp" | relative_url }})

_curriculum/04-01-Lessons.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ title: "Mask Generator" # Title and Heading 1
44
permalink: /maskGenerator-lessons/1 # Give your page a permalink
55
published: true
66
---
7+
8+
Mask Generator remixes Critical Computation by Xin Xin and Katherine Moriwaki, licensed under [CC BY-NC-SA 4.0](https://creativecommons.org/licenses/by-nc-sa/4.0/deed.en)
9+
710
## Variables
811

912
### Grade 6~8

0 commit comments

Comments
 (0)