Bring Safari branch in line with changes to main branch and other fixes

Ishadijcks / Ishadijcks.github.io

PokéClicker

15 stars 32 forks source link

Bring Safari branch in line with changes to main branch and other fixes #167

Closed Nyargleblargle closed 6 years ago

Nyargleblargle commented 7 years ago

A quick overview (since I'm still new to GitHub and the changelog is messy):

Added Safari data to a January version of the main branch, then included later changes manually.
Merged Safari and Route inProgress states. This fixes a glitch that caused infinite Pokéball shakes while on Routes and makes the ability to move in the Safari Zone more consistent.
Allows the player to actually catch Pokémon in the Safari Zone and randomizes spawns.

Aegyo commented 7 years ago

This kind of thing should be done as a git merge command instead of manually copying the changes over. Your version of the files has a conflicting history, since it you committed the changes in your branch, but not in the branch on here.

Isha will probably merge safari into the stage branch later, when the safari stuff is mostly done.