generated from UVASGD/ProjectTemplate
-
Notifications
You must be signed in to change notification settings - Fork 6
Attack animations #15
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
3amBEANS
wants to merge
152
commits into
UVASGD:develop
Choose a base branch
from
UVASGD:attackAnimations
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Moves some scripts around and move item getting to player script
Added arrow key to movement binds Changed default window settings
Tested; not thoroughly tested. Added what we were talking about in the meeting today. Left a few things in there that are for testing. Left a ton of comments. I tried to keep it as consolidated and simple as possible
First item system merge
The base of the scene switching architecture. I will extend it when we have more scenes.
phewf
I created some placeholders for scenes that other people are currently working on. I left notes (in the form of labels) of how to properly connect your scenes to the chain of things. Please move and rename the scenes you make to replace the placeholder scenes. There are a bunch of some resource methods in GameContainer. GameContainer is not a singleton, HOWEVER because of the setup it is always instantiated and it controls the scene order by instantiating new scenes as its children. ALSO you can access the game container at any time non-staticly with GameContainer.GAME_CONTAINER. TODO: Option was left open for overlay panels (ie a pause menu). Did not implement yet.
This reverts commit 9e10f40.
keyboard/controller toggle + keyboard keybinds
Joey G 03
mergeQuintin3intoDevelop
Haseeb 01
removed temp files
Moved changes from Vincent6
Fixed bug due to legacy code
Item system still doesnt work completely
Added item logic into player and attempted to connect stuff
re implemented dashing fixed animation edge case added simple candy system
Haseeb 01
Update project.godot
Added statuseffects
…host slightly faster
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Created Attack Animation functionality, waiting for Quentin to fix an error in attack to test if it works. Also made the ghost animations 6fps instead of 3 fps because it did not match the velocity of the sprite.