Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge main into dev-2.0 #7509

Merged
merged 355 commits into from
Jan 30, 2025
Merged

Merge main into dev-2.0 #7509

merged 355 commits into from
Jan 30, 2025

Conversation

davepagurek
Copy link
Contributor

Merge conflicts resolved, and tests pass locally!

davepagurek and others added 30 commits September 5, 2024 09:56
@davepagurek
Merge pull request #7233 from processing/all-contributors/add-TiborUd…
f35defd 
…vari

docs: add TiborUdvari as a contributor for code
@davepagurek
Merge pull request #7232 from willallstet/willallstet-fix-get-started…
8b49a0f 
…-link

Update README.md to include an updated get started link
@allcontributors
docs: update README.md [skip ci]
fbf9cd1
@allcontributors
docs: update .all-contributorsrc [skip ci]
fe5f42a
@davepagurek
Merge pull request #7234 from processing/all-contributors/add-willall…
b65fa45 
…stet

docs: add willallstet as a contributor for doc
@ashwanidey
Update webgl_mode_architecture.md
1ed73d0
@Abhinavcode13
fix: remove adjusted coordinates comment
e8dca69
@Abhinavcode13
small nit
aab2132
@Qianqianye
Update 'Learn' page to 'Tutorials' page
6ac7f81
@Qianqianye
Merge pull request #7235 from ashwanidey/patch-1
dbd790b 
Fix : broken link in contributor_docs/webgl_mode_architecture.md
@allcontributors
docs: update README.md [skip ci]
21362ab
@allcontributors
docs: update .all-contributorsrc [skip ci]
ccaf4f5
@Qianqianye
Merge pull request #7238 from processing/all-contributors/add-ashwanidey
ada3c05 
docs: add ashwanidey as a contributor for doc
@ashwanidey
Update webgl_contribution_guide.md
e45d330
@aleannab
Fix broken links in contributor_docs/steward_guidelines.md
d161dcc
@M0nica
Update links in lerpColor()
3612825
@aleannab
Fix broken link in contributor_docs/contributing_to_the_p5js_referenc…
4a00e3c 
…e.md
@aleannab
Fix broken links in contributor_docs/access.md
1b5c0ab
@allcontributors
docs: update README.md [skip ci]
b3d6cb8
@allcontributors
docs: update .all-contributorsrc [skip ci]
de2c06b
@jeanetteandrews
Fix clipping behavior in ellipse() function by adding ctx.closePath()
de3ff8b
@Qianqianye
Merge pull request #7245 from processing/all-contributors/add-ibrand
f00ef38 
docs: add ibrand as a contributor for bug
@Qianqianye
Update relative link
6965416
@Qianqianye
Update relative links in webgl_contribution_guide.md
2d38679
@Qianqianye
Merge pull request #7240 from aleannab/patch-1
f76f92b 
Fix broken links in contributor_docs/steward_guidelines.md
@allcontributors
docs: update README.md [skip ci]
1765934
@allcontributors
docs: update .all-contributorsrc [skip ci]
4ff7085
@Qianqianye
Merge pull request #7242 from aleannab/patch-2
0ee297a 
Fix broken link in contributing_to_the_p5js_references.md
@Qianqianye
Update link
2101429
@Qianqianye
Merge pull request #7247 from processing/all-contributors/add-aleannab
3d3d107 
docs: add aleannab as a contributor for doc
limzykenneth and others added 23 commits January 14, 2025 12:56
@limzykenneth
Merge pull request #7420 from FrauBoes/add-parameter-description
6e024b4 
Add and adjust alpha parameter description
@davepagurek
Update src/webgl/loading.js
d0715af
@davepagurek
Revert package-lock.json
97e495f
@davepagurek
Revert package.json
e13f48d
@davepagurek
Merge branch 'main' into atmajaa/main
4d9a9d3
@davepagurek
Remove trailing space
e732dfa
@davepagurek
Remove another trailing space
1aedfad
@davepagurek
Merge pull request #7454 from atmajaa/main
c1e7def 
Documentation Update:Webgl -  .lib files not supported
@allcontributors
docs: update README.md [skip ci]
97b6c5b
@allcontributors
docs: update .all-contributorsrc [skip ci]
55d0441
@Qianqianye
Merge pull request #7467 from processing/all-contributors/add-ImRAJAS…
6d63750 
…-SAMSE
@limzykenneth
Update p5.js 2.0 issue template
c643b7b
@thrly
Add angle param clarification to sin(), cos(), and tan()
15afab8
@philyawj
class documentation remove duplicate frog example
6027299
@philyawj
class documentation describe blue background
6a01c32
@limzykenneth
Merge pull request #7483 from philyawj/main
e987d6c 
Documentation Foundation Class: remove dupe example and describe color
@limzykenneth
Merge pull request #7458 from ImRAJAS-SAMSE/fix-typo-shader-doc
d46432d 
Fixed typo in p5.Shader.js documentation comment
@limzykenneth
Escape arrows in p5.Geometry reference
91d2a71
@lirenjie95
fixed some broken links in markdown files
bd7c253
@thrly
Update inline links to match with the new site's URL behavior
c1f4d84
@limzykenneth
Merge pull request #7475 from thrly/thrly-p5js-trig-angle-params
6ea957c 
Add angle param clarification to sin(), cos(), and tan()
@limzykenneth
Merge pull request #7485 from lirenjie95/docs/fix-broken-link
64e40b4 
fixed some broken links in markdown files
@limzykenneth
1.11.3
3c9de13
@davepagurek
Copy link
Contributor Author

@limzykenneth everything look ok here?

@limzykenneth
Copy link
Member

Seems to be fine, I'll squash b8d2825 to 68cabd6 into a single commit to limit the noise in the final merge.

@limzykenneth limzykenneth merged commit f245f68 into dev-2.0 Jan 30, 2025
2 checks passed
@limzykenneth limzykenneth deleted the merge-2.0 branch January 30, 2025 21:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.