Skip to content

Commit eb3bb94

Browse files
authored
Merge pull request #2 from processing/master
update local fork
2 parents 5d522a1 + 6d832af commit eb3bb94

File tree

220 files changed

+19661
-26707
lines changed

Some content is hidden

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

220 files changed

+19661
-26707
lines changed

.all-contributorsrc

Lines changed: 77 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@
104104
},
105105
{
106106
"login": "dhowe",
107-
"name": "dhowe",
107+
"name": "Daniel Howe",
108108
"avatar_url": "https://avatars3.githubusercontent.com/u/737638?v=4",
109109
"profile": "https://github.com/dhowe",
110110
"contributions": []
@@ -1284,7 +1284,7 @@
12841284
"avatar_url": "https://avatars0.githubusercontent.com/u/8083973?s=460&v=4",
12851285
"profile": "https://caro.io/",
12861286
"contributions": [
1287-
"example",
1287+
"example",
12881288
"doc"
12891289
]
12901290
},
@@ -1294,6 +1294,81 @@
12941294
"avatar_url": "https://avatars3.githubusercontent.com/u/19146133?s=460&v=4",
12951295
"profile": "https://github.com/faithwyu",
12961296
"contributions": []
1297+
},
1298+
{
1299+
"login": "aatishb",
1300+
"name": "Aatish Bhatia",
1301+
"avatar_url": "https://avatars2.githubusercontent.com/u/1878638?s=400&v=4",
1302+
"profile": "https://aatishb.com",
1303+
"contributions": [
1304+
"doc",
1305+
"bug"
1306+
]
1307+
},
1308+
{
1309+
"login": "dekmm",
1310+
"name": "Mislav Milicevic",
1311+
"avatar_url": "https://avatars3.githubusercontent.com/u/7628664?v=4",
1312+
"profile": "https://github.com/dekmm",
1313+
"contributions": [
1314+
"code",
1315+
"bug"
1316+
]
1317+
},
1318+
{
1319+
"login": "yutinglu413",
1320+
"name": "Yuting Lu",
1321+
"avatar_url": "https://avatars1.githubusercontent.com/u/25344311?v=4",
1322+
"profile": "https://github.com/yutinglu413",
1323+
"contributions": [
1324+
"doc"
1325+
]
1326+
},
1327+
{
1328+
"login": "adilrabbani",
1329+
"name": "Adil Rabbani",
1330+
"avatar_url": "https://avatars2.githubusercontent.com/u/15272015?v=4",
1331+
"profile": "https://github.com/adilrabbani",
1332+
"contributions": [
1333+
"code",
1334+
"bug",
1335+
"example"
1336+
]
1337+
},
1338+
{
1339+
"login": "Zalastax",
1340+
"name": "Pierre Krafft",
1341+
"avatar_url": "https://avatars3.githubusercontent.com/u/908496?v=4",
1342+
"profile": "http://zalastax.github.io/",
1343+
"contributions": [
1344+
"bug",
1345+
"code",
1346+
"doc",
1347+
"example",
1348+
"review",
1349+
"test",
1350+
"tool"
1351+
]
1352+
},
1353+
{
1354+
"login": "zoeingram",
1355+
"name": "Zoë Ingram",
1356+
"avatar_url": "https://avatars2.githubusercontent.com/u/12074409?v=4",
1357+
"profile": "https://github.com/zoeingram",
1358+
"contributions": [
1359+
"doc"
1360+
]
1361+
},
1362+
{
1363+
"login": "aidannelson",
1364+
"name": "Aidan Nelson",
1365+
"avatar_url": "https://avatars1.githubusercontent.com/u/6486359?s=460&v=4",
1366+
"profile": "https://github.com/AidanNelson",
1367+
"contributions": [
1368+
"bug",
1369+
"code",
1370+
"doc"
1371+
]
12971372
}
12981373
]
12991374
}

.eslintrc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@
1414
},
1515
"extends": ["eslint:recommended", "prettier"],
1616
"plugins": ["prettier"],
17+
"parserOptions": {
18+
"ecmaVersion": 2017
19+
},
1720
"rules": {
1821
"prettier/prettier": [
1922
"error",

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ lib/p5.*
77
lib/modules
88
lib/addons/p5.dom.min.js
99
docs/reference/*
10-
docs/yuidoc-p5-theme/assets/js/reference.js*
1110
!*.gitkeep
1211
examples/3d/
1312
.idea

.travis.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
language: node_js
22
node_js:
33
- "8.9"
4+
addons:
5+
chrome: stable
46
install: npm install
7+
before_script:
8+
- sed -i 's/'"'"'--disable-gpu'"'"',//g' node_modules/mocha-chrome/lib/instance.js
9+
- sed -i 's/options.logLevel/"verbose"/g' node_modules/mocha-chrome/lib/instance.js
510
script: npm run grunt
611
sudo: false

CODE_OF_CONDUCT.md

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
2+
## [p5.js community statement](http://p5js.org/community/)
3+
4+
p5.js is a community interested in exploring the creation of art and design with technology.
5+
6+
We are a community of, and in solidarity with, people from every gender identity and expression, sexual orientation, race, ethnicity, language, neuro-type, size, ability, class, religion, culture, subculture, political opinion, age, skill level, occupation, and background. We acknowledge that not everyone has the time, financial means, or capacity to actively participate, but we recognize and encourage involvement of all kinds. We facilitate and foster access and empowerment. We are all learners.
7+
8+
We like these hashtags: #noCodeSnobs (because we value community over efficiency), #newKidLove (because we all started somewhere), #unassumeCore (because we don't assume knowledge), and #BlackLivesMatter (because of course).
9+
10+
In practice:
11+
* We are not code snobs. We do not assume knowledge or imply there are things that somebody should know.
12+
* We insist on actively engaging with requests for feedback regardless of their complexity.
13+
* We welcome newcomers and prioritize the education of others. We strive to approach all tasks with the enthusiasm of a newcomer. Because we believe that newcomers are just as valuable in this effort as experts.
14+
* We consistently make the effort to actively recognize and validate multiple types of contributions.
15+
* We are always willing to offer help or guidance.
16+
17+
In times of conflict:
18+
* We listen.
19+
* We clearly communicate while acknowledging other's feelings.
20+
* We admit when we're wrong, apologize, and accept responsibility for our actions.
21+
* We are continuously seeking to improve ourselves and our community.
22+
* We keep our community respectful and open.
23+
* We make everyone feel heard.
24+
* We are mindful and kind in our interactions.
25+
26+
In the future:
27+
* The future is now.
28+
29+
30+
## p5.js Code of Conduct
31+
32+
* **Be mindful of your language.** Any of the following behavior is unacceptable:
33+
* Offensive comments related to gender identity and expression, sexual orientation, race, ethnicity, language, neuro-type, size, ability, class, religion, culture, subculture, political opinion, age, skill level, occupation, or background
34+
* Threats of violence
35+
* Deliberate intimidation
36+
* Sexually explicit or violent material
37+
* Unwelcome sexual attention
38+
* Stalking or following
39+
* Or any other kinds of harassment
40+
41+
Use your best judgement. If it will possibly make others uncomfortable, do not post it.
42+
43+
* **Be respectful.** Disagreement is not an opportunity to attack someone else's thoughts or opinions. Although views may differ, remember to approach every situation with patience and care.
44+
* **Be considerate.** Think about how your contribution will affect others in the community.
45+
* **Be open minded.** Embrace new people and new ideas. Our community is continually evolving and we welcome positive change.
46+
47+
If you believe someone is violating the code of conduct, we ask that you report it by emailing [[email protected]](mailto:[email protected]). Please include your name and a description of the incident, and we will get back to you ASAP.
48+
49+
Sometimes, participants violating the Code of Conduct are unaware that their behavior is harmful, and an open conversation clears things up to move forward. However, if a participant continues with the behavior, the p5.js team may take any action they deem appropriate, up to and including expulsion from all p5.js spaces and identification of the participant as a harasser to other p5.js members or the general public.

CONTRIBUTING.md

Lines changed: 5 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,9 @@
1-
### The github issues are for bugs and feature requests for the p5.js library itself. If you have a general question or bug programming with p5.js please post it in the [p5.js forum](https://forum.processing.org/two/).
1+
Hi there! Welcome to p5.js contributing! Here are a few things to know:
22

3-
### Please make sure you are posting to the right repository. See this [section](https://github.com/processing/p5.js/blob/master/README.md#issues) for a list of all p5.js repositories.
3+
The github issues are for bugs and feature requests for the p5.js library itself. If you have a general question or bug programming with p5.js please post it in the [p5.js forum](https://forum.processing.org/two/).
44

5-
## p5.js Code of Conduct
5+
Please make sure you are posting to the correct repository. See this [section](https://github.com/processing/p5.js/blob/master/README.md#issues) for a list of all p5.js repositories.
66

7-
* **Be mindful of your language.** Any of the following behavior is unacceptable:
8-
* Offensive comments related to gender identity and expression, sexual orientation, race, ethnicity, language, neuro-type, size, ability, class, religion, culture, subculture, political opinion, age, skill level, occupation, or background
9-
* Threats of violence
10-
* Deliberate intimidation
11-
* Sexually explicit or violent material
12-
* Unwelcome sexual attention
13-
* Stalking or following
14-
* Or any other kinds of harassment
7+
Please be sure to review our [community statement and code of conduct](https://github.com/processing/p5.js/blob/master/CODE_OF_CONDUCT.md). These things are very important to us.
158

16-
Use your best judgement. If it will possibly make others uncomfortable, do not post it.
17-
18-
* **Be respectful.** Disagreement is not an opportunity to attack someone else's thoughts or opinions. Although views may differ, remember to approach every situation with patience and care.
19-
* **Be considerate.** Think about how your contribution will affect others in the community.
20-
* **Be open minded.** Embrace new people and new ideas. Our community is continually evolving and we welcome positive change.
21-
22-
If you believe someone is violating the code of conduct, we ask that you report it by emailing [[email protected]](mailto:[email protected]). Please include your name and a description of the incident, and we will get back to you ASAP.
23-
24-
Participants asked to stop any harassing behavior are expected to comply immediately. If a participant engages in harassing behavior, the p5.js Team may take any action they deem appropriate, up to and including expulsion from all p5.js spaces and identification of the participant as a harasser to other p5.js members or the general public.
25-
26-
## Also
27-
* You can read our [community statement](http://p5js.org/community/) on our website.
28-
* Check out the [development](https://github.com/processing/p5.js/wiki/Development) wiki page for more in-depth details about contributing code, bug fixes, and documentation.
9+
Check out the [developer docs](https://github.com/processing/p5.js/blob/master/developer_docs/) for more in-depth details about contributing code, bug fixes, and documentation.

0 commit comments

Comments
 (0)