andreyratz/block
3
3
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Projectiles+bounce #3

Closed
tedTalks wants to merge 0 commits from Projectiles-and-bounce into main
pull from: Projectiles-and-bounce
merge into: andreyratz:main
Conversation 3 Commits - Files Changed -
tedTalks commented 2026-03-02 02:27:20 -08:00
Collaborator
Copy Link

I hate github desktop oh my god just let me create a new branch

It may say that there are conflicting files, git is tweaking. I tested it myself, and it works. You can push it anyways, it's fine. The last commit to main was also from me so there's nothing to be conflicting with anyways

I hate github desktop oh my god just let me create a new branch It may say that there are conflicting files, git is tweaking. I tested it myself, and it works. You can push it anyways, it's fine. The last commit to main was also from me so there's nothing to be conflicting with anyways
tedTalks added 1 commit 2026-03-02 02:27:21 -08:00
Projectiles+bounce ebff6dfa3e 
I hate github desktop oh my god just let me create a new branch

i gave up on creating a new branch

It wont let me move to a new branch cause it thinks there are conflicts. what the fuck is the point of that

It may say that there are conflicting files. push them through anyways, git is tweaking. I tested it myself, and the last commit to main was also from me so there's nothing to be conflicting with
tedTalks commented 2026-03-02 02:27:56 -08:00
Author
Collaborator
Copy Link

it's 2:30am, i'm goin to bed

it's 2:30am, i'm goin to bed
tedTalks added 1 commit 2026-03-03 17:04:30 -08:00
Fixed projectile rotation bbda9768a2 
Fixed minor visual glitch where projectiles wouldn't be at the correct rotation after being deflected
tedTalks added 1 commit 2026-03-04 13:12:06 -08:00
Cleanup 894f77e3cd 
Cleaning up the messy sections of my code and making the debug console output easier to read
tedTalks commented 2026-03-04 13:17:02 -08:00
Author
Collaborator
Copy Link

Did some more code cleanup on the branch so it's better for merging onto the main branch

Did some more code cleanup on the branch so it's better for merging onto the main branch
andreyratz closed this pull request 2026-03-08 19:49:17 -07:00
andreyratz commented 2026-03-08 19:49:23 -07:00
Owner
Copy Link

Manually merged.

Manually merged.

Pull request closed

Please reopen this pull request to perform a merge.
Sign in to join this conversation.
Reviewers
No Reviewers
Labels
Clear labels
bug
Something is not working
 duplicate
This issue or pull request already exists
 enhancement
New feature
 help wanted
Need some help
 invalid
Something is wrong
 question
More information is needed
 wontfix
This won't be fixed
No Label
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
kyleraykbs tedTalks andreyratz
No Assignees
2 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: andreyratz/block#3
Delete Branch "Projectiles-and-bounce"

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?