Skip to content
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

Merge latest updates #5

Open
wants to merge 164 commits into
base: master
Choose a base branch
from

Conversation

ExperiencersInternational
Copy link
Owner

No description provided.

eugeneration and others added 30 commits May 16, 2020 15:49
Add Template modal (and the first React components!)
Fix the broken upload screenshot targets
…er to close, attempt to remove overscroll bounce with overflow;none
Add blank layout and (kind of) fix scrolling for mobible
Add every flower in-game to the designer

Added every flower in-game to the designer (Custom captured and grown assets of the flowers).

For possible compatibility issues I maintained the names of the original flower names in flower.ts and the rest are rewritten in a different format.

Enabled weeds that were commented out.
Move A5 to east, as A5 has an east outlet
Normalized the names to be in the flowerColor format instead of a mix of both.

Reverted a few other renamed ones (Example: mumRed to the original chrysanthemumRed) to keep with the original formatting just to keep consistency and remove any need for any legacy references.
Added all in-game flowers to designer
…socket-extensions-0.1.4

Bump websocket-extensions from 0.1.3 to 0.1.4
Bumps [elliptic](https://github.com/indutny/elliptic) from 6.5.2 to 6.5.3.
- [Release notes](https://github.com/indutny/elliptic/releases)
- [Commits](indutny/elliptic@v6.5.2...v6.5.3)

Signed-off-by: dependabot[bot] <[email protected]>
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.15 to 4.17.20.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](lodash/lodash@4.17.15...4.17.20)

Signed-off-by: dependabot[bot] <[email protected]>
…ash-4.17.20

Bump lodash from 4.17.15 to 4.17.20
…iptic-6.5.3

Bump elliptic from 6.5.2 to 6.5.3
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Feature New feature or request help wanted Extra attention is needed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet