Translation for Gen2 moves, HP, Level for pokemon#2
Open
ra281tr092 wants to merge 106 commits intojjskuld:masterfrom
Open
Translation for Gen2 moves, HP, Level for pokemon#2ra281tr092 wants to merge 106 commits intojjskuld:masterfrom
ra281tr092 wants to merge 106 commits intojjskuld:masterfrom
Conversation
…nto develop # Conflicts: # src/script/script.js # src/script/script.js.map # src/script/ts/Controllers/Menus/Snipes/HumanSnipeMenuController.ts # src/style/style.css # src/style/style.css.map # src/style/style.scss
# Please enter a commit message to explain why this merge is necessary, # especially if it merges an updated upstream into a topic branch. # # Lines starting with '#' will be ignored, and an empty message aborts # the commit.
…since it points to a DOM element (not a JQuery object).
Evolve disabled if not enough candies.
rearrange and reseted base
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
6 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.
Added Gen2 moveset for display in info page.
Receive the Level from websocket.
Show Level and HP of a pokemon in info popup.
Disable evolve button if not enough candy.