forked from eugeneration/HappyIslandDesigner
-
-
Notifications
You must be signed in to change notification settings - Fork 1
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
ExperiencersInternational
wants to merge
164
commits into
ExperiencersInternational:master
Choose a base branch
from
eugeneration:master
base: master
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
Merge latest updates #5
ExperiencersInternational
wants to merge
164
commits into
ExperiencersInternational:master
from
eugeneration:master
Conversation
This file contains 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
…ints on the grid and it outputs a perspective corrected raster. Needs: upload, any-order point placement, point readjusting, move raster to layer, add raster overlay controls
…axis oriented box
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
…hups and removed grid from images
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
Bumps [websocket-extensions](https://github.com/faye/websocket-extensions-node) from 0.1.3 to 0.1.4. - [Release notes](https://github.com/faye/websocket-extensions-node/releases) - [Changelog](https://github.com/faye/websocket-extensions-node/blob/master/CHANGELOG.md) - [Commits](faye/websocket-extensions-node@0.1.3...0.1.4) Signed-off-by: dependabot[bot] <[email protected]>
…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
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.
No description provided.