Skip to content

Lucas #3

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

Open
wants to merge 189 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
189 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
d21a8f4
Pushed to figure out problems
Jan 21, 2023
b682baf
Merge branch 'main' of https://github.com/meganenglert/build-a-bird-MVP
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
84f74e5
Merge branch 'main' of https://github.com/meganenglert/build-a-bird-MVP
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
f57e4de
shop2
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
41d2d3a
lol
Jan 24, 2023
8246285
Merge branch 'main' of https://github.com/meganenglert/build-a-bird-MVP
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
f8e48ba
Alpha material
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
ee52011
Double checking a commit
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
30b8ffd
merged
meganenglert Jan 26, 2023
9aae53c
fixed coin amount not updating
meganenglert Jan 26, 2023
86c8a86
Neew drag files
Jan 26, 2023
b29084c
now records each new nene
meganenglert Jan 26, 2023
c958dd0
fixed popups
rrachelr Jan 26, 2023
4233057
Merge remote-tracking branch 'origin/main' into rachel
rrachelr 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
890fe81
merged in mycah's main updates
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
97b038e
Merge pull request #24 from meganenglert/mycah
mycahdt Jan 27, 2023
18e9fec
Updated Counter for total nenes collected, also updated text
Jan 27, 2023
e92afa3
Updated Counter for total nenes collected, also I understand the text…
Jan 27, 2023
c53c57c
Added hard button
Jan 28, 2023
dc69435
Merge remote-tracking branch 'origin' into cole
Jan 28, 2023
6bd63b0
Huh
Jan 28, 2023
ed4d1f5
Work
Jan 28, 2023
bea3429
Final beta drop from LUCAS
Jan 28, 2023
aeb59a2
Additional final beta stuff
Jan 28, 2023
87a8719
Merge pull request #25 from meganenglert/lucas
castlel3000 Jan 28, 2023
60e3539
working
rrachelr Jan 28, 2023
d19b383
fixed:
rrachelr Jan 28, 2023
171f1a4
fixing
rrachelr Jan 28, 2023
74acc5d
Finished Title screen buttons
Jan 28, 2023
7518917
reverting hopefully
meganenglert Jan 28, 2023
2dcf6af
Yikes
Jan 28, 2023
53fbf25
merging
rrachelr Jan 28, 2023
6abf2ff
Merge branch 'main' into cole
Jan 28, 2023
2bfec61
Merge pull request #27 from meganenglert/cole
mycahdt Jan 28, 2023
d044377
please work
meganenglert Jan 28, 2023
acaf38e
commiting
rrachelr Jan 28, 2023
dbedac5
commots
rrachelr Jan 28, 2023
655c9be
Delete node_modules directory
meganenglert Jan 28, 2023
0251c3e
Merge remote-tracking branch 'origin/main' into rachel-2
rrachelr Jan 28, 2023
160fb1e
game scene back?
meganenglert Jan 28, 2023
2503076
Merge remote-tracking branch 'origin/main' into rachel-2
rrachelr Jan 28, 2023
aa9167c
finally fixed
rrachelr Jan 28, 2023
806a28e
save for now
meganenglert Jan 28, 2023
7fd208d
untracked the node modules
meganenglert Jan 28, 2023
da05c38
Merge branch 'lucas' into merge-lucas-main
meganenglert Jan 28, 2023
196515a
lucas branch restored
meganenglert Jan 28, 2023
d54dd7f
Merge remote-tracking branch 'origin/rachel-2' into merging-to-main
meganenglert Jan 28, 2023
66152b9
Merge branch 'megan-collection-shows'
meganenglert Jan 28, 2023
62b4542
gamescene merge fixed
meganenglert Jan 28, 2023
dd558f1
main is repaired!!
meganenglert Jan 28, 2023
70d3565
collection shows, NAMES MUST BE REWORKED
meganenglert Jan 29, 2023
cdbd295
deploy ready
meganenglert Jan 29, 2023
3d7b7a4
custom names work!
meganenglert Jan 29, 2023
a9ac966
triggers end correctly
meganenglert Jan 29, 2023
8a29b06
Dont know what im changing but sure
Jan 29, 2023
30a773f
Merge remote-tracking branch 'origin' into cole
Co1etrain Jan 29, 2023
bfb9566
problem solved
meganenglert Jan 29, 2023
deb507f
More beta
Jan 29, 2023
90a7b7e
working popups
rrachelr Jan 29, 2023
d615271
Game scene with working difficulty
Co1etrain Jan 29, 2023
c0c9d5e
Merge remote-tracking branch 'origin/main' into rachel
rrachelr Jan 29, 2023
bfdadd6
BETA
Jan 29, 2023
d2912d6
GameScene with working difficulty
Co1etrain Jan 29, 2023
87541dc
coins are updating!
rrachelr Jan 29, 2023
5a2e4c8
nice
rrachelr Jan 29, 2023
86bb139
Merge pull request #28 from meganenglert/cole
Co1etrain Jan 29, 2023
d38fbac
working
rrachelr Jan 29, 2023
d1567ad
Title screen graphics done
Co1etrain Jan 29, 2023
082dff2
Shop and everything fucntioning and complete
Jan 29, 2023
467ece0
Merge branch 'main' of https://github.com/meganenglert/build-a-bird-MVP
Jan 29, 2023
04724b7
Finished graphic for title
Co1etrain Jan 29, 2023
eff324b
Merge pull request #29 from meganenglert/cole
Co1etrain Jan 29, 2023
f6c30d2
new files added
meganenglert Jan 29, 2023
05c414c
about to merge
meganenglert Jan 29, 2023
1cc55fe
Final implementation of the end screen
Jan 29, 2023
bb4e15b
custom names working !!
meganenglert Jan 29, 2023
31159cc
Merge branch 'main' into megan-format-custom-name
meganenglert Jan 29, 2023
21972cb
Fixed GameScene
Jan 29, 2023
b5368b6
Fixed title screen with mute in progress
Co1etrain Jan 29, 2023
a4e648c
mute.png and unmute.png added
meganenglert Jan 29, 2023
9dae64a
Merge pull request #30 from meganenglert/cole
meganenglert Jan 29, 2023
306af9c
beta popup's done
rrachelr Jan 29, 2023
716c55f
main that works
meganenglert Jan 29, 2023
f6d78ee
Merge branch 'main' into rachel
rrachelr Jan 29, 2023
5f4c1e9
Merge pull request #31 from meganenglert/rachel
rrachelr Jan 29, 2023
0ce9a8e
fixed custom names (again
meganenglert Jan 29, 2023
476f8ec
difficulty working
rrachelr Jan 29, 2023
38b33d3
Merge pull request #33 from meganenglert/rachel
rrachelr Jan 29, 2023
c7aaf83
fixed that hat
meganenglert Jan 29, 2023
295f7e1
Merge branch 'main' of https://github.com/meganenglert/build-a-bird-MVP
meganenglert Jan 29, 2023
91d5549
working!
meganenglert Jan 29, 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