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

Mycah #4

Open
wants to merge 98 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
98 commits
Select commit Hold shift + click to select a range
88c327a
Background added and displaying in correct size
meganenglert Jan 20, 2023
a92fd52
Merge pull request #1 from meganenglert/megan
meganenglert Jan 20, 2023
785bb1b
Setting up GitHub Pages (hopefully)
meganenglert Jan 20, 2023
e0f1879
init commit
rrachelr Jan 20, 2023
94a4648
Pages very possibly set up
meganenglert Jan 20, 2023
731421e
Merge pull request #2 from meganenglert/gh-pages-setup
meganenglert Jan 20, 2023
18ea1ce
Delete jekyll-gh-pages.yml
meganenglert Jan 20, 2023
672eeab
working on window
rrachelr Jan 21, 2023
96bbd9f
init commit
rrachelr Jan 20, 2023
ebca245
Merge branch 'rachel' of https://github.com/meganenglert/build-a-bird…
rrachelr Jan 21, 2023
e3e0fd9
First new component added (Shop)
meganenglert Jan 21, 2023
41a5ee7
Merge pull request #3 from meganenglert/megan-organization
meganenglert Jan 21, 2023
4bfb141
All other files set up
meganenglert Jan 21, 2023
d9f812a
Merge pull request #4 from meganenglert/megan-organization
meganenglert Jan 21, 2023
a735c37
actually rendering all the components now oops
meganenglert Jan 21, 2023
3f3f606
Merge pull request #5 from meganenglert/megan-organization
meganenglert Jan 21, 2023
b85129d
Shop image adding issues
Jan 21, 2023
077ebae
help
Jan 21, 2023
8af60be
colors images added
meganenglert Jan 21, 2023
90b6e81
draggable popup
rrachelr Jan 21, 2023
f655100
replaced popup background
rrachelr Jan 21, 2023
ae777a7
Mycah Drag Drop
mycahdt Jan 21, 2023
4a1ffc3
properly displays colorwheel
meganenglert Jan 21, 2023
9dcfd6e
Mycah DragNDrop
mycahdt Jan 21, 2023
fbc7f31
popup working and interactive
rrachelr Jan 21, 2023
57f71a0
Mycah DragNDrop push
mycahdt Jan 21, 2023
8eb1d93
Mycah Drag and Drop
mycahdt Jan 21, 2023
66a6fd9
init commit
rrachelr Jan 20, 2023
1c7f548
working on window
rrachelr Jan 21, 2023
3584dcc
draggable popup
rrachelr Jan 21, 2023
22b4994
replaced popup background
rrachelr Jan 21, 2023
d5aa7d3
popup working and interactive
rrachelr Jan 21, 2023
0556857
Merge branch 'rachel' of https://github.com/meganenglert/build-a-bird…
rrachelr Jan 21, 2023
6b00a7b
Merge remote-tracking branch 'origin/main' into rachel
rrachelr Jan 21, 2023
ef4d370
Merge pull request #6 from meganenglert/mycah
mycahdt Jan 21, 2023
3986993
fix conflict
meganenglert Jan 21, 2023
518201c
reorganized into components
meganenglert Jan 21, 2023
56508e4
new commit
meganenglert Jan 21, 2023
eb98ef4
Merge remote-tracking branch 'origin/main' into lucas
Jan 21, 2023
ec45c29
lucas final work for today
Jan 21, 2023
2ff7799
Merge branch 'main' into rachel
meganenglert Jan 21, 2023
004fd50
Merge pull request #7 from meganenglert/rachel
meganenglert Jan 21, 2023
5a059ae
Merge branch 'main' into lucas
meganenglert Jan 21, 2023
8c84eee
Merge pull request #8 from meganenglert/lucas
meganenglert Jan 21, 2023
c69d7db
started getting stuff set up for additional functionality
meganenglert Jan 21, 2023
1aeb67b
fixed linter issues
meganenglert Jan 21, 2023
281b14a
deployed!
meganenglert Jan 21, 2023
7c00af6
commit
rrachelr Jan 21, 2023
ed5e198
added color drag and drops
meganenglert Jan 23, 2023
fc12674
renamed files to actually work
meganenglert Jan 23, 2023
642655b
colors now drag and drop / color can change
meganenglert Jan 24, 2023
1a7db9d
fixed merge conflict
meganenglert Jan 24, 2023
1e8d724
please no more merge conflicts
meganenglert Jan 24, 2023
bd6419a
new shop
Jan 24, 2023
d0c9afa
Merge pull request #10 from meganenglert/lucas
castlel3000 Jan 24, 2023
6d711d2
Add files via upload
Co1etrain Jan 24, 2023
a45092c
Merge remote-tracking branch 'origin' into cole
Jan 24, 2023
77cbeba
colors now become available again after replacement
meganenglert Jan 24, 2023
d46c82a
Merge pull request #11 from meganenglert/megan-colors-v2-1
meganenglert Jan 24, 2023
c9bbc9e
added hat images
meganenglert Jan 24, 2023
3e6511f
Most updated
Jan 24, 2023
d86fbc0
we have hats and colors woohoo
meganenglert Jan 24, 2023
df84f30
Merge pull request #12 from meganenglert/megan-colors-v2-2
meganenglert Jan 24, 2023
23ae514
reset button image
meganenglert Jan 24, 2023
03263cc
reset button added and working
meganenglert Jan 24, 2023
836a781
Merge pull request #14 from meganenglert/megan-add-reset-button
meganenglert Jan 24, 2023
f1221a1
Merge pull request #13 from meganenglert/cole
meganenglert Jan 24, 2023
0d7ab7d
Merge branch 'rachel' of https://github.com/meganenglert/build-a-bird…
rrachelr Jan 24, 2023
999d9ef
Merge remote-tracking branch 'origin/main' into ra
rrachelr Jan 24, 2023
b6b2739
moving files
meganenglert Jan 24, 2023
0ec67ec
fixed title
meganenglert Jan 24, 2023
efcd334
Delete titleScene.ts
meganenglert Jan 24, 2023
3701232
alpha publish
meganenglert Jan 24, 2023
b3180da
Popups working
rrachelr Jan 24, 2023
6d36c3a
Question formatting
rrachelr Jan 24, 2023
d089a5e
collection scene
mycahdt Jan 26, 2023
3cad448
Merge pull request #17 from meganenglert/mycah
mycahdt Jan 26, 2023
2d5d6bc
Merge remote-tracking branch 'origin/main' into rachel
rrachelr Jan 26, 2023
5090ff4
ready to merge
rrachelr Jan 26, 2023
ea6376b
Merge pull request #18 from meganenglert/rachel
rrachelr Jan 26, 2023
9b08f55
fixed popup error
rrachelr Jan 26, 2023
8abfadb
Merge pull request #19 from meganenglert/rachel
rrachelr Jan 26, 2023
aea18f5
quiz questions
mycahdt Jan 26, 2023
afc57bc
Merge branch 'main' of https://github.com/meganenglert/build-a-bird-M…
mycahdt Jan 26, 2023
5088944
Merge pull request #20 from meganenglert/mycah
mycahdt Jan 26, 2023
7dfd2a7
deployment actually works now?
meganenglert Jan 26, 2023
e63dce7
Fixed hats location and I have updated title screen background
Jan 26, 2023
2e1a621
Merge pull request #21 from meganenglert/cole
meganenglert Jan 26, 2023
a51e743
ready for deployment
meganenglert Jan 26, 2023
ec9a4d7
drag and drop cleaned
meganenglert Jan 26, 2023
ef04ee8
cleaned up files
meganenglert Jan 26, 2023
f58c1d0
Merge pull request #22 from meganenglert/megan-cleanup
meganenglert Jan 26, 2023
5f73160
saves user input text
mycahdt Jan 26, 2023
4564f3c
save name
mycahdt Jan 27, 2023
a41c34c
Merge pull request #23 from meganenglert/mycah
mycahdt Jan 27, 2023
bf669ba
updated package lock
meganenglert Jan 27, 2023
70aab2f
displays names in collection
mycahdt Jan 27, 2023
8f930b2
Merge branch 'main' of https://github.com/meganenglert/build-a-bird-M…
mycahdt Jan 27, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,6 @@ node_modules
# don't lint build output (make sure it's set to your correct build folder name)
dist
index.html
.eslintrc.cjs
.eslintrc.cjs

src/GameScene.ts
Loading