space_hs/space.hs
5
3
Fork
You've already forked space.hs
2

WIP: version 12 #27

Draft
dpwiz-apprentice wants to merge 8 commits from v12 into main
pull from: v12
merge into: space_hs:main
space_hs:main

not in any order, TBDs:

  • construction
  • more player agency
  • get a map to work
  • get aim direction to actually update

lastly:

  • held armor
  • crit, knockdown, ghost form
not in any order, TBDs: - [ ] construction - [ ] more player agency - [ ] get a map to work - [ ] get aim direction to actually update lastly: - [ ] held armor - [ ] crit, knockdown, ghost form
Author
Owner
Copy link

still not enough agency, gotta do movement modes next, add wield benefits to guns and make rifles actually wield-only

still not enough agency, gotta do movement modes next, add wield benefits to guns and make rifles actually wield-only
This pull request is marked as a work in progress.
View command line instructions

Checkout

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

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 v12
git switch v12
git rebase main
git switch main
git merge --ff-only v12
git switch v12
git rebase main
git switch main
git merge --no-ff v12
git switch main
git merge --squash v12
git switch main
git merge --ff-only v12
git switch main
git merge v12
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
space_hs/space.hs!27
Reference in a new issue
space_hs/space.hs
No description provided.
Delete branch "v12"

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?