Update from upstream repo superusercode/PokemonUnity#3
Open
backstroke-bot wants to merge 1604 commits intoIAmWaseem:masterfrom
Open
Update from upstream repo superusercode/PokemonUnity#3backstroke-bot wants to merge 1604 commits intoIAmWaseem:masterfrom
backstroke-bot wants to merge 1604 commits intoIAmWaseem:masterfrom
Conversation
Alpha Branch Using Beta Wrapper
Removed DOTween (and is replaced with LeanTween)
Removed Unused Script Assets from Unity Moved around a couple files Updated Framework with a little cleaning
Added Framework Components to Scene
Command Menu (Fight...) Fight Menu (Move1-4) Level Loader Scene Transition
Namespace Legacy Scripts Import Scene Package
Minor Corrections and Fixes to library Co-Authored-By: TheArtho <91839683+TheArtho@users.noreply.github.com>
Co-Authored-By: TheArtho <91839683+TheArtho@users.noreply.github.com>
This reverts commit 7f1a58c.
Alpha feature updates to wrapper Merge Beta branch and Alpha Legacy branches into one ecosystem. This should allow for other branches to be trimmed... and easier to implement new framework designs into old demo samples. Added to wrapper refactor is: Namespace to separate legacy logic Added some fixes to shared library framework Removed unused components and libraries Made efforts to connect battle framework to unity api
Renamed Class File Remapped Static Item Functions to Interface in Game Class Uncomment and Implement Item EventHandler
Created Interface for Battle Trainer Data Uncommented and Implemented more Essentials Logic
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Hello! The remote
superusercode/PokemonUnityhas some new changes that aren't in this fork.So, here they are, ready to be merged! 🎉
If this pull request can be merged without conflict, you can publish your software
with these new changes.
If you have merge conflicts, this is a great place to fix them.
Have fun!
Created by Backstroke. Oh yea, I'm a bot.