Skip to content
This repository was archived by the owner on Sep 22, 2024. It is now read-only.

Commit cb991f5

Browse files
shiffmanshiffman
committed
merging with main again
2 parents 6278fd5 + 321e0cd commit cb991f5

File tree

110 files changed

+133
-244
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

110 files changed

+133
-244
lines changed

‎chp00_introduction/NOC_I_01_RandomWalkTraditional/index.html

Lines changed: 9 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,12 @@
11
<!DOCTYPE html>
22
<html>
3-
4-
<head>
5-
<<<<<<< HEAD
6-
<script language="javascript" type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/p5.js/0.5.7/p5.js"></script>
7-
<script language="javascript" type="text/javascript" src="sketch.js"></script>
8-
<title> Random Walk Traditional </title>
9-
</head>
10-
11-
<body>
12-
</body>
13-
=======
14-
<script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/0.9.0/p5.min.js"></script>
15-
<script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/0.9.0/addons/p5.dom.min.js"></script>
16-
<meta charset="utf-8" />
17-
</head>
18-
19-
<body>
20-
<script src="sketch.js"></script>
21-
</body>
22-
3+
<head>
4+
<script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/0.9.0/p5.min.js"></script>
5+
<script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/0.9.0/addons/p5.dom.min.js"></script>
6+
<meta charset="utf-8" />
7+
</head>
8+
9+
<body>
10+
<script src="sketch.js"></script>
11+
</body>
2312
</html>
24-
>>>>>>> master

‎chp00_introduction/NOC_I_02_RandomDistribution/index.html

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
<!DOCTYPE html>
22
<html>
33
<head>
4-
<script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/0.9.0/p5.min.js"></script>
5-
<script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/0.9.0/addons/p5.dom.min.js"></script>
4+
<script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/1.4.1/p5.min.js"></script>
65
<meta charset="utf-8" />
76
</head>
87

‎chp00_introduction/NOC_I_03_RandomWalkTendsToRight/index.html

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
<!DOCTYPE html>
22
<html>
33
<head>
4-
<script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/0.9.0/p5.min.js"></script>
5-
<script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/0.9.0/addons/p5.dom.min.js"></script>
4+
<script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/1.4.1/p5.min.js"></script>
65
<meta charset="utf-8" />
76
</head>
87

‎chp00_introduction/NOC_I_04_Gaussian/index.html

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
<!DOCTYPE html>
22
<html>
33
<head>
4-
<script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/0.9.0/p5.min.js"></script>
5-
<script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/0.9.0/addons/p5.dom.min.js"></script>
4+
<script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/1.4.1/p5.min.js"></script>
65
<meta charset="utf-8" />
76
</head>
87

‎chp00_introduction/NOC_I_05_NoiseWalk/index.html

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
<!DOCTYPE html>
22
<html>
33
<head>
4-
<script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/0.9.0/p5.min.js"></script>
5-
<script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/0.9.0/addons/p5.dom.min.js"></script>
4+
<script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/1.4.1/p5.min.js"></script>
65
<meta charset="utf-8" />
76
</head>
87

‎chp00_introduction/Noise1D/index.html

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
<!DOCTYPE html>
22
<html>
33
<head>
4-
<script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/0.9.0/p5.min.js"></script>
5-
<script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/0.9.0/addons/p5.dom.min.js"></script>
4+
<script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/1.4.1/p5.min.js"></script>
65
<meta charset="utf-8" />
76
</head>
87

‎chp01_vectors/NOC_1_01_bouncingball_novectors/index.html

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22
<html>
33

44
<head>
5-
<script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/0.9.0/p5.min.js"></script>
6-
<script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/0.9.0/addons/p5.dom.min.js"></script>
5+
<script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/1.4.1/p5.min.js"></script>
76
<meta charset="utf-8" />
87
</head>
98

‎chp01_vectors/NOC_1_02_bouncingball_vectors/index.html

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,16 @@
22
<html>
33

44
<head>
5+
<<<<<<< HEAD
56
<<<<<<< HEAD
67
<script language="javascript" type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/0.5.7/p5.js"></script>
78
<script language="javascript" type="text/javascript" src="sketch.js"></script>
89
=======
910
<script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/0.9.0/p5.min.js"></script>
1011
<script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/0.9.0/addons/p5.dom.min.js"></script>
12+
=======
13+
<script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/1.4.1/p5.min.js"></script>
14+
>>>>>>> master
1115
<meta charset="utf-8" />
1216
>>>>>>> master
1317
</head>

‎chp01_vectors/NOC_1_02_bouncingball_vectors_object/index.html

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22
<html>
33

44
<head>
5-
<script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/0.9.0/p5.min.js"></script>
6-
<script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/0.9.0/addons/p5.dom.min.js"></script>
5+
<script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/1.4.1/p5.min.js"></script>
76
<meta charset="utf-8" />
87
</head>
98

‎chp01_vectors/NOC_1_03_vector_subtraction/index.html

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22
<html>
33

44
<head>
5-
<script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/0.9.0/p5.min.js"></script>
6-
<script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/0.9.0/addons/p5.dom.min.js"></script>
5+
<script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/1.4.1/p5.min.js"></script>
76
<meta charset="utf-8" />
87
</head>
98

0 commit comments

Comments
 (0)