Lucas#3

Open

castlel3000 wants to merge 189 commits intoourcade:masterfrom

meganenglert:lucas

Commits on Jan 21, 2023

working on window
rrachelr
committed
init commit
rrachelr
committed
Merge branch 'rachel' of https://github.com/meganenglert/build-a-bird-MVP into rachel
rrachelr
committed
First new component added (Shop)
meganenglert
committed
Merge pull request #3 from meganenglert/megan-organization
meganenglert
authored
All other files set up
meganenglert
committed
Merge pull request #4 from meganenglert/megan-organization
meganenglert
authored
Pushed to figure out problems

Lucas Castle
authored and
Lucas Castle
committed
Merge branch 'main' of https://github.com/meganenglert/build-a-bird-MVP

Lucas Castle
authored and
Lucas Castle
committed
actually rendering all the components now oops
meganenglert
committed
Merge pull request #5 from meganenglert/megan-organization
meganenglert
authored
Merge branch 'main' of https://github.com/meganenglert/build-a-bird-MVP

Lucas Castle
authored and
Lucas Castle
committed
Shop image adding issues

Lucas Castle
authored and
Lucas Castle
committed
help

Lucas Castle
authored and
Lucas Castle
committed
colors images added
meganenglert
committed
draggable popup
rrachelr
committed
replaced popup background
rrachelr
committed
Mycah Drag Drop
mycahdt
committed
properly displays colorwheel
meganenglert
committed
Mycah DragNDrop
mycahdt
committed
popup working and interactive
rrachelr
committed
Mycah DragNDrop push
mycahdt
committed
Mycah Drag and Drop
mycahdt
committed
init commit
rrachelr
committed
working on window
rrachelr
committed
draggable popup
rrachelr
committed
replaced popup background
rrachelr
committed
popup working and interactive
rrachelr
committed
Merge branch 'rachel' of https://github.com/meganenglert/build-a-bird-MVP into rachel
rrachelr
committed
Merge remote-tracking branch 'origin/main' into rachel
rrachelr
committed
Merge pull request #6 from meganenglert/mycah
mycahdt
authored
fix conflict
meganenglert
committed
reorganized into components
meganenglert
committed
new commit
meganenglert
committed
Merge remote-tracking branch 'origin/main' into lucas

Lucas Castle
authored and
Lucas Castle
committed
lucas final work for today

Lucas Castle
authored and
Lucas Castle
committed
Merge branch 'main' into rachel
meganenglert
authored
Merge pull request #7 from meganenglert/rachel
meganenglert
authored
Merge branch 'main' into lucas
meganenglert
authored
Merge pull request #8 from meganenglert/lucas
meganenglert
authored
started getting stuff set up for additional functionality
meganenglert
committed
fixed linter issues
meganenglert
committed
deployed!
meganenglert
committed
commit
rrachelr
committed

Commits on Jan 23, 2023

Commits on Jan 24, 2023

colors now drag and drop / color can change
meganenglert
committed
fixed merge conflict
meganenglert
committed
please no more merge conflicts
meganenglert
committed
new shop

Lucas Castle
authored and
Lucas Castle
committed
shop2

Lucas Castle
authored and
Lucas Castle
committed
Merge pull request #10 from meganenglert/lucas
castlel3000
authored
Add files via upload
Co1etrain
authored
Merge remote-tracking branch 'origin' into cole

Cole McCaleb
authored and
Cole McCaleb
committed
colors now become available again after replacement
meganenglert
committed
Merge pull request #11 from meganenglert/megan-colors-v2-1
meganenglert
authored
lol

Lucas Castle
authored and
Lucas Castle
committed
Merge branch 'main' of https://github.com/meganenglert/build-a-bird-MVP

Lucas Castle
authored and
Lucas Castle
committed
added hat images
meganenglert
committed
Most updated

Cole McCaleb
authored and
Cole McCaleb
committed
we have hats and colors woohoo
meganenglert
committed
Merge pull request #12 from meganenglert/megan-colors-v2-2
meganenglert
authored
reset button image
meganenglert
committed
Alpha material

Lucas Castle
authored and
Lucas Castle
committed
reset button added and working
meganenglert
committed
Merge pull request #14 from meganenglert/megan-add-reset-button
meganenglert
authored
Merge pull request #13 from meganenglert/cole
meganenglert
authored
Merge branch 'rachel' of https://github.com/meganenglert/build-a-bird-MVP into rachel
rrachelr
committed
Merge remote-tracking branch 'origin/main' into ra
rrachelr
committed
moving files
meganenglert
committed
fixed title
meganenglert
committed
Delete titleScene.ts
meganenglert
authored
alpha publish
meganenglert
committed
Popups working
rrachelr
committed
Question formatting
rrachelr
committed

Commits on Jan 26, 2023

collection scene
mycahdt
committed
Merge pull request #17 from meganenglert/mycah
mycahdt
authored
Merge remote-tracking branch 'origin/main' into rachel
rrachelr
committed
ready to merge
rrachelr
committed
Merge pull request #18 from meganenglert/rachel
rrachelr
authored
fixed popup error
rrachelr
committed
Merge pull request #19 from meganenglert/rachel
rrachelr
authored
quiz questions
mycahdt
committed
Merge branch 'main' of https://github.com/meganenglert/build-a-bird-MVP into mycah
mycahdt
committed
Merge pull request #20 from meganenglert/mycah
mycahdt
authored
deployment actually works now?
meganenglert
committed
Fixed hats location and I have updated title screen background

Cole McCaleb
authored and
Cole McCaleb
committed
Double checking a commit

Lucas Castle
authored and
Lucas Castle
committed
Merge pull request #21 from meganenglert/cole
meganenglert
authored
ready for deployment
meganenglert
committed
drag and drop cleaned
meganenglert
committed
cleaned up files
meganenglert
committed
Merge pull request #22 from meganenglert/megan-cleanup
meganenglert
authored
merged
meganenglert
committed
fixed coin amount not updating
meganenglert
committed
Neew drag files

Lucas Castle
authored and
Lucas Castle
committed
now records each new nene
meganenglert
committed
fixed popups
rrachelr
committed
Merge remote-tracking branch 'origin/main' into rachel
rrachelr
committed
saves user input text
mycahdt
committed

Commits on Jan 27, 2023

save name
mycahdt
committed
Merge pull request #23 from meganenglert/mycah
mycahdt
authored
updated package lock
meganenglert
committed
merged in mycah's main updates
meganenglert
committed
displays names in collection
mycahdt
committed
Merge branch 'main' of https://github.com/meganenglert/build-a-bird-MVP into mycah
mycahdt
committed
Merge pull request #24 from meganenglert/mycah
mycahdt
authored
Updated Counter for total nenes collected, also updated text

Lucas Castle
authored and
Lucas Castle
committed
Updated Counter for total nenes collected, also I understand the text now

Lucas Castle
authored and
Lucas Castle
committed

Commits on Jan 28, 2023

Added hard button

Cole McCaleb
authored and
Cole McCaleb
committed
Merge remote-tracking branch 'origin' into cole

Cole McCaleb
authored and
Cole McCaleb
committed
Huh

Cole McCaleb
authored and
Cole McCaleb
committed
Work

Cole McCaleb
authored and
Cole McCaleb
committed
Final beta drop from LUCAS

Lucas Castle
authored and
Lucas Castle
committed
Additional final beta stuff

Lucas Castle
authored and
Lucas Castle
committed
Merge pull request #25 from meganenglert/lucas
castlel3000
authored
working
rrachelr
committed
fixed:
rrachelr
committed
fixing
rrachelr
committed
Finished Title screen buttons

Cole McCaleb
authored and
Cole McCaleb
committed
reverting hopefully
meganenglert
committed
Yikes

Cole McCaleb
authored and
Cole McCaleb
committed
merging
rrachelr
committed
Merge branch 'main' into cole

Cole McCaleb
authored and
Cole McCaleb
committed
Merge pull request #27 from meganenglert/cole
mycahdt
authored
please work
meganenglert
committed
commiting
rrachelr
committed
commots
rrachelr
committed
Delete node_modules directory
meganenglert
authored
Merge remote-tracking branch 'origin/main' into rachel-2
rrachelr
committed
game scene back?
meganenglert
committed
Merge remote-tracking branch 'origin/main' into rachel-2
rrachelr
committed
finally fixed
rrachelr
committed
save for now
meganenglert
committed
untracked the node modules
meganenglert
committed
Merge branch 'lucas' into merge-lucas-main
meganenglert
committed
lucas branch restored
meganenglert
committed
Merge remote-tracking branch 'origin/rachel-2' into merging-to-main
meganenglert
committed
Merge branch 'megan-collection-shows'
meganenglert
committed
gamescene merge fixed
meganenglert
committed
main is repaired!!
meganenglert
committed

Commits on Jan 29, 2023

collection shows, NAMES MUST BE REWORKED
meganenglert
committed
deploy ready
meganenglert
committed
custom names work!
meganenglert
committed
triggers end correctly
meganenglert
committed
Dont know what im changing but sure

Cole McCaleb
authored and
Cole McCaleb
committed
Merge remote-tracking branch 'origin' into cole
Co1etrain
committed
problem solved
meganenglert
committed
More beta

Lucas Castle
authored and
Lucas Castle
committed
working popups
rrachelr
committed
Game scene with working difficulty
Co1etrain
committed
Merge remote-tracking branch 'origin/main' into rachel
rrachelr
committed
BETA

Lucas Castle
authored and
Lucas Castle
committed
GameScene with working difficulty
Co1etrain
committed
coins are updating!
rrachelr
committed
nice
rrachelr
committed
Merge pull request #28 from meganenglert/cole
Co1etrain
authored
working
rrachelr
committed
Title screen graphics done
Co1etrain
committed
Shop and everything fucntioning and complete

Lucas Castle
authored and
Lucas Castle
committed
Merge branch 'main' of https://github.com/meganenglert/build-a-bird-MVP

Lucas Castle
authored and
Lucas Castle
committed
Finished graphic for title
Co1etrain
committed
Merge pull request #29 from meganenglert/cole
Co1etrain
authored
new files added
meganenglert
committed
about to merge
meganenglert
committed
Final implementation of the end screen

Lucas Castle
authored and
Lucas Castle
committed
custom names working !!
meganenglert
committed
Merge branch 'main' into megan-format-custom-name
meganenglert
committed
Fixed GameScene

Lucas Castle
authored and
Lucas Castle
committed
Fixed title screen with mute in progress
Co1etrain
committed
mute.png and unmute.png added
meganenglert
committed
Merge pull request #30 from meganenglert/cole
meganenglert
authored
beta popup's done
rrachelr
committed
main that works
meganenglert
committed
Merge branch 'main' into rachel
rrachelr
authored
Merge pull request #31 from meganenglert/rachel
rrachelr
authored
fixed custom names (again
meganenglert
committed
difficulty working
rrachelr
committed
Merge pull request #33 from meganenglert/rachel
rrachelr
authored
fixed that hat
meganenglert
committed
Merge branch 'main' of https://github.com/meganenglert/build-a-bird-MVP
meganenglert
committed
working!
meganenglert
committed