sphi/OpenStarscape
2
1
Fork
You've already forked OpenStarscape
0

First cut at limited fuel in ships #21

Open
aspen wants to merge 3 commits from aspen/fuel into main
pull from: aspen/fuel
merge into: sphi:main
sphi:main
sphi:halo-shader
sphi:as/shrapnel
sphi:configure-listen-addr
sphi:fuck-jest
sphi:fix-body-selection
sphi:as/limited-missiles
Collaborator
Copy link

This is expressed in deltaV currently - eventually, we should do this in terms of reaction mass and actually do the newton's third law calculation

This is expressed in deltaV currently - eventually, we should do this in terms of reaction mass and actually do the newton's third law calculation
This pull request can be merged automatically.
This branch is out-of-date with the base branch
You are not authorized to merge this pull request.
View command line instructions

Checkout

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

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 switch main
git merge --no-ff aspen/fuel
git switch aspen/fuel
git rebase main
git switch main
git merge --ff-only aspen/fuel
git switch aspen/fuel
git rebase main
git switch main
git merge --no-ff aspen/fuel
git switch main
git merge --squash aspen/fuel
git switch main
git merge --ff-only aspen/fuel
git switch main
git merge aspen/fuel
git push origin main
Sign in to join this conversation.
No reviewers
Labels
Clear labels
No items
No labels
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
sphi/OpenStarscape!21
Reference in a new issue
sphi/OpenStarscape
No description provided.
Delete branch "aspen/fuel"

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?