8
46
Fork
You've already forked flok
18

WIP: Experimental VEDA.js support #82

Draft
munshkr wants to merge 8 commits from vedajs into main
pull from: vedajs
merge into: munshkr:main
munshkr:main
munshkr:chore/fix-ci-build
munshkr:chore/use-pnpm-vite
munshkr:feat/pwa
munshkr:fix/compile-cjs
munshkr:dependabot/npm_and_yarn/braces-3.0.3
munshkr:dependabot/npm_and_yarn/ws-8.17.1
munshkr:dependabot/npm_and_yarn/ejs-3.1.10
munshkr:flok-next
munshkr:29-sonicpi
munshkr:fix-remove-webrtc-provider
munshkr:notification
munshkr:binary-packages
munshkr:24-webrtc-pubsub
munshkr:51-rename-sclang
munshkr:32-remote-caret
munshkr:fix-dependencies
munshkr:follow
munshkr commented 2020年08月28日 02:57:45 +02:00 (Migrated from github.com)
Copy link

Implements fragment shaders with Veda, using target veda. For now only fragment shaders are supported, vertex could be added as an additional target (e.g. veda-vertex).

To do:

  • Fragment shaders
  • Error handling
Implements fragment shaders with Veda, using target `veda`. For now only fragment shaders are supported, vertex could be added as an additional target (e.g. `veda-vertex`). To do: - [x] Fragment shaders - [ ] Error handling
This pull request has changes conflicting with the target branch.
  • README.md
  • packages/web/components/LocalError.tsx
  • packages/web/components/Session.tsx
  • packages/web/components/TextEditor.tsx
  • packages/web/package.json
  • packages/web/pages/s/[session].tsx
  • packages/web/tsconfig.json
  • yarn.lock
View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin vedajs:vedajs
git switch vedajs

Merge

Merge the changes and update on Forgejo.
git switch main
git merge --no-ff vedajs
git switch vedajs
git rebase main
git switch main
git merge --ff-only vedajs
git switch vedajs
git rebase main
git switch main
git merge --no-ff vedajs
git switch main
git merge --squash vedajs
git switch main
git merge --ff-only vedajs
git switch main
git merge vedajs
git push origin main
Sign in to join this conversation.
No reviewers
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
munshkr/flok!82
Reference in a new issue
munshkr/flok
No description provided.
Delete branch "vedajs"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?