Bubel/bubel-ecs
2
0
Fork 0
Code Issues 1 Pull requests 2 Projects Releases Packages Wiki Activity Actions

Support compiling demos in wasm build #17

Open
mmcomando wants to merge 6 commits from wasm_demos into master
pull from: wasm_demos
merge into: Bubel:master
Conversation 4 Commits 6 Files changed 11 +156 -43
mmcomando commented 2021-03-01 21:45:21 +01:00 (Migrated from gitlab.com)
Copy link
No description provided.
mmcomando (Migrated from gitlab.com) changed target branch from master to Demos 2021-03-01 21:48:10 +01:00
Mergul commented 2021-03-07 14:18:19 +01:00 (Migrated from gitlab.com)
Copy link

Needs improvement before merge

Needs improvement before merge
mmcomando commented 2021-03-13 13:31:08 +01:00 (Migrated from gitlab.com)
Copy link

added 22 commits

Compare with previous version

added 22 commits <ul><li>3eb4a40c...dd7af911 - 10 commits from branch <code>Mergul:Demos</code></li><li>7d090d56 - Merge branch &#39;Demos&#39; into &#39;master&#39;</li><li>e7bb51b7 - Merge branch &#39;Demos&#39; into &#39;master&#39;</li><li>83cf803d - Update .gitlab-ci.yml</li><li>9b3602b6 - Update .gitlab-ci.yml</li><li>001f6851 - Update .gitlab-ci.yml</li><li>180f2ed3 - Merge branch &#39;Demos&#39; into &#39;master&#39;</li><li>37d15f97 - -fixed some meson issues on windows (becs and tests compilation works. Demos not yet)</li><li>fa0c196c - -code cleanup</li><li>2107f390 - -fixed sp,e demos issues and crashes</li><li>21b657a8 - Merge branch &#39;windows-fixes&#39; of https://gitlab.com/Mergul/bubel-ecs.git into beta-release</li><li>bcd9ee4a - Merge branch &#39;beta-release&#39; into &#39;master&#39;</li><li>84a5cbef - Merge branch &#39;master&#39; into wasm_demos</li></ul> [Compare with previous version](/Mergul/bubel-ecs/-/merge_requests/14/diffs?diff_id=156849532&start_sha=3eb4a40c39758399d2bae8887b4919d2f498c599)
mmcomando (Migrated from gitlab.com) changed target branch from Demos to master 2021-03-13 13:31:48 +01:00
mmcomando commented 2021-03-13 14:23:20 +01:00 (Migrated from gitlab.com)
Copy link

added 1 commit

Compare with previous version

added 1 commit <ul><li>55bd6985 - Update thread_pool.d</li></ul> [Compare with previous version](/Mergul/bubel-ecs/-/merge_requests/14/diffs?diff_id=156854350&start_sha=84a5cbef1346ffa828229aae7a99ae0a711b38d4)
Mergul commented 2021-03-13 20:28:12 +01:00 (Migrated from gitlab.com)
Copy link

added 3 commits

Compare with previous version

added 3 commits <ul><li>1254a990 - -added compilation for multithreaded and singlethreaded code</li><li>ef12bce8 - Merge branch &#39;wasm_demos&#39; of https://gitlab.com/mmcomando/bubel-ecs.git into wasm_demos</li><li>3e0ab409 - -cleaned Meson build files and added some comments</li></ul> [Compare with previous version](/Mergul/bubel-ecs/-/merge_requests/14/diffs?diff_id=156886016&start_sha=55bd698541229d7f2ccf46a31966201b8c386e60)
This pull request is broken due to missing fork information.
View command line instructions

Checkout

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

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git checkout master
git merge --no-ff wasm_demos
git checkout wasm_demos
git rebase master
git checkout master
git merge --ff-only wasm_demos
git checkout wasm_demos
git rebase master
git checkout master
git merge --no-ff wasm_demos
git checkout master
git merge --squash wasm_demos
git checkout master
git merge --ff-only wasm_demos
git checkout master
git merge wasm_demos
git push origin master
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
Feedback

   
Meson
No labels
Feedback
Meson
Milestone
Clear milestone
No items
No milestone
Public Release
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: Bubel/bubel-ecs#17
No description provided.
Delete branch "wasm_demos"

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?