Code

Mycah#4

Code

Open

mycahdt wants to merge 98 commits intoourcade:masterourcade/phaser3-typescript-vite-template:masterfrom meganenglert:mycahmeganenglert/build-a-bird-MVP:mycahCopy head branch name to clipboard

+1,056-2,236

Commits

Commits on Jan 20, 2023

• Background added and displaying in correct size

  meganenglert

  committed
  88c327a

  Copy full SHA for 88c327a

• Merge pull request #1 from meganenglert/megan

  Show description for a92fd52
  meganenglert

  authored
  a92fd52

  Copy full SHA for a92fd52

• Setting up GitHub Pages (hopefully)

  meganenglert

  authored
  785bb1b

  Copy full SHA for 785bb1b

• init commit

  rrachelr

  committed
  e0f1879

  Copy full SHA for e0f1879

• Pages very possibly set up

  meganenglert

  committed
  94a4648

  Copy full SHA for 94a4648

• Merge pull request #2 from meganenglert/gh-pages-setup

  Show description for 731421e
  meganenglert

  authored
  731421e

  Copy full SHA for 731421e

• Delete jekyll-gh-pages.yml

  meganenglert

  authored
  18ea1ce

  Copy full SHA for 18ea1ce

Commits on Jan 21, 2023

• working on window

  rrachelr

  committed
  672eeab

  Copy full SHA for 672eeab

• init commit

  rrachelr

  committed
  96bbd9f

  Copy full SHA for 96bbd9f

• Merge branch 'rachel' of https://github.com/meganenglert/build-a-bird-MVP into rachel

  rrachelr

  committed
  ebca245

  Copy full SHA for ebca245

• First new component added (Shop)

  meganenglert

  committed
  e3e0fd9

  Copy full SHA for e3e0fd9

• Merge pull request #3 from meganenglert/megan-organization

  Show description for 41a5ee7
  meganenglert

  authored
  41a5ee7

  Copy full SHA for 41a5ee7

• All other files set up

  meganenglert

  committed
  4bfb141

  Copy full SHA for 4bfb141

• Merge pull request #4 from meganenglert/megan-organization

  Show description for d9f812a
  meganenglert

  authored
  d9f812a

  Copy full SHA for d9f812a

• actually rendering all the components now oops

  meganenglert

  committed
  a735c37

  Copy full SHA for a735c37

• Merge pull request #5 from meganenglert/megan-organization

  Show description for 3f3f606
  meganenglert

  authored
  3f3f606

  Copy full SHA for 3f3f606

• Shop image adding issues

  

  Lucas Castle

  authored and

  Lucas Castle

  committed
  b85129d

  Copy full SHA for b85129d

• help

  

  Lucas Castle

  authored and

  Lucas Castle

  committed
  077ebae

  Copy full SHA for 077ebae

• colors images added

  meganenglert

  committed
  8af60be

  Copy full SHA for 8af60be

• draggable popup

  rrachelr

  committed
  90b6e81

  Copy full SHA for 90b6e81

• replaced popup background

  rrachelr

  committed
  f655100

  Copy full SHA for f655100

• Mycah Drag Drop

  mycahdt

  committed
  ae777a7

  Copy full SHA for ae777a7

• properly displays colorwheel

  meganenglert

  committed
  4a1ffc3

  Copy full SHA for 4a1ffc3

• Mycah DragNDrop

  mycahdt

  committed
  9dcfd6e

  Copy full SHA for 9dcfd6e

• popup working and interactive

  rrachelr

  committed
  fbc7f31

  Copy full SHA for fbc7f31

• Mycah DragNDrop push

  mycahdt

  committed
  57f71a0

  Copy full SHA for 57f71a0

• Mycah Drag and Drop

  mycahdt

  committed
  8eb1d93

  Copy full SHA for 8eb1d93

• init commit

  rrachelr

  committed
  66a6fd9

  Copy full SHA for 66a6fd9

• working on window

  rrachelr

  committed
  1c7f548

  Copy full SHA for 1c7f548

• draggable popup

  rrachelr

  committed
  3584dcc

  Copy full SHA for 3584dcc

• replaced popup background

  rrachelr

  committed
  22b4994

  Copy full SHA for 22b4994

• popup working and interactive

  rrachelr

  committed
  d5aa7d3

  Copy full SHA for d5aa7d3

• Merge branch 'rachel' of https://github.com/meganenglert/build-a-bird-MVP into rachel

  rrachelr

  committed
  0556857

  Copy full SHA for 0556857

• Merge remote-tracking branch 'origin/main' into rachel

  rrachelr

  committed
  6b00a7b

  Copy full SHA for 6b00a7b

• Merge pull request #6 from meganenglert/mycah

  Show description for ef4d370
  mycahdt

  authored
  ef4d370

  Copy full SHA for ef4d370

• fix conflict

  meganenglert

  committed
  3986993

  Copy full SHA for 3986993

• reorganized into components

  meganenglert

  committed
  518201c

  Copy full SHA for 518201c

• new commit

  meganenglert

  committed
  56508e4

  Copy full SHA for 56508e4

• Merge remote-tracking branch 'origin/main' into lucas

  

  Lucas Castle

  authored and

  Lucas Castle

  committed
  eb98ef4

  Copy full SHA for eb98ef4

• lucas final work for today

  

  Lucas Castle

  authored and

  Lucas Castle

  committed
  ec45c29

  Copy full SHA for ec45c29

• Merge branch 'main' into rachel

  meganenglert

  authored
  2ff7799

  Copy full SHA for 2ff7799

• Merge pull request #7 from meganenglert/rachel

  Show description for 004fd50
  meganenglert

  authored
  004fd50

  Copy full SHA for 004fd50

• Merge branch 'main' into lucas

  meganenglert

  authored
  5a059ae

  Copy full SHA for 5a059ae

• Merge pull request #8 from meganenglert/lucas

  Show description for 8c84eee
  meganenglert

  authored
  8c84eee

  Copy full SHA for 8c84eee

• started getting stuff set up for additional functionality

  meganenglert

  committed
  c69d7db

  Copy full SHA for c69d7db

• fixed linter issues

  meganenglert

  committed
  1aeb67b

  Copy full SHA for 1aeb67b

• deployed!

  meganenglert

  committed
  281b14a

  Copy full SHA for 281b14a

• commit

  rrachelr

  committed
  7c00af6

  Copy full SHA for 7c00af6

Commits on Jan 23, 2023

• added color drag and drops

  meganenglert

  committed
  ed5e198

  Copy full SHA for ed5e198

• renamed files to actually work

  meganenglert

  committed
  fc12674

  Copy full SHA for fc12674

Commits on Jan 24, 2023

• colors now drag and drop / color can change

  meganenglert

  committed
  642655b

  Copy full SHA for 642655b

• fixed merge conflict

  meganenglert

  committed
  1a7db9d

  Copy full SHA for 1a7db9d

• please no more merge conflicts

  meganenglert

  committed
  1e8d724

  Copy full SHA for 1e8d724

• new shop

  

  Lucas Castle

  authored and

  Lucas Castle

  committed
  bd6419a

  Copy full SHA for bd6419a

• Merge pull request #10 from meganenglert/lucas

  Show description for d0c9afa
  castlel3000

  authored
  d0c9afa

  Copy full SHA for d0c9afa

• Add files via upload

  Co1etrain

  authored
  6d711d2

  Copy full SHA for 6d711d2

• Merge remote-tracking branch 'origin' into cole

  

  Cole McCaleb

  authored and

  Cole McCaleb

  committed
  a45092c

  Copy full SHA for a45092c

• colors now become available again after replacement

  meganenglert

  committed
  77cbeba

  Copy full SHA for 77cbeba

• Merge pull request #11 from meganenglert/megan-colors-v2-1

  Show description for d46c82a
  meganenglert

  authored
  d46c82a

  Copy full SHA for d46c82a

• added hat images

  meganenglert

  committed
  c9bbc9e

  Copy full SHA for c9bbc9e

• Most updated

  

  Cole McCaleb

  authored and

  Cole McCaleb

  committed
  3e6511f

  Copy full SHA for 3e6511f

• we have hats and colors woohoo

  meganenglert

  committed
  d86fbc0

  Copy full SHA for d86fbc0

• Merge pull request #12 from meganenglert/megan-colors-v2-2

  Show description for df84f30
  meganenglert

  authored
  df84f30

  Copy full SHA for df84f30

• reset button image

  meganenglert

  committed
  23ae514

  Copy full SHA for 23ae514

• reset button added and working

  meganenglert

  committed
  03263cc

  Copy full SHA for 03263cc

• Merge pull request #14 from meganenglert/megan-add-reset-button

  Show description for 836a781
  meganenglert

  authored
  836a781

  Copy full SHA for 836a781

• Merge pull request #13 from meganenglert/cole

  Show description for f1221a1
  meganenglert

  authored
  f1221a1

  Copy full SHA for f1221a1

• Merge branch 'rachel' of https://github.com/meganenglert/build-a-bird-MVP into rachel

  rrachelr

  committed
  0d7ab7d

  Copy full SHA for 0d7ab7d

• Merge remote-tracking branch 'origin/main' into ra

  rrachelr

  committed
  999d9ef

  Copy full SHA for 999d9ef

• moving files

  meganenglert

  committed
  b6b2739

  Copy full SHA for b6b2739

• fixed title

  meganenglert

  committed
  0ec67ec

  Copy full SHA for 0ec67ec

• Delete titleScene.ts

  meganenglert

  authored
  efcd334

  Copy full SHA for efcd334

• alpha publish

  meganenglert

  committed
  3701232

  Copy full SHA for 3701232

• Popups working

  rrachelr

  committed
  b3180da

  Copy full SHA for b3180da

• Question formatting

  rrachelr

  committed
  6d36c3a

  Copy full SHA for 6d36c3a

Commits on Jan 26, 2023

• collection scene

  mycahdt

  committed
  d089a5e

  Copy full SHA for d089a5e

• Merge pull request #17 from meganenglert/mycah

  Show description for 3cad448
  mycahdt

  authored
  3cad448

  Copy full SHA for 3cad448

• Merge remote-tracking branch 'origin/main' into rachel

  rrachelr

  committed
  2d5d6bc

  Copy full SHA for 2d5d6bc

• ready to merge

  rrachelr

  committed
  5090ff4

  Copy full SHA for 5090ff4

• Merge pull request #18 from meganenglert/rachel

  Show description for ea6376b
  rrachelr

  authored
  ea6376b

  Copy full SHA for ea6376b

• fixed popup error

  rrachelr

  committed
  9b08f55

  Copy full SHA for 9b08f55

• Merge pull request #19 from meganenglert/rachel

  Show description for 8abfadb
  rrachelr

  authored
  8abfadb

  Copy full SHA for 8abfadb

• quiz questions

  mycahdt

  committed
  aea18f5

  Copy full SHA for aea18f5

• Merge branch 'main' of https://github.com/meganenglert/build-a-bird-MVP into mycah

  mycahdt

  committed
  afc57bc

  Copy full SHA for afc57bc

• Merge pull request #20 from meganenglert/mycah

  Show description for 5088944
  mycahdt

  authored
  5088944

  Copy full SHA for 5088944

• deployment actually works now?

  meganenglert

  committed
  7dfd2a7

  Copy full SHA for 7dfd2a7

• Fixed hats location and I have updated title screen background

  Show description for e63dce7
  

  Cole McCaleb

  authored and

  Cole McCaleb

  committed
  e63dce7

  Copy full SHA for e63dce7

• Merge pull request #21 from meganenglert/cole

  Show description for 2e1a621
  meganenglert

  authored
  2e1a621

  Copy full SHA for 2e1a621

• ready for deployment

  meganenglert

  committed
  a51e743

  Copy full SHA for a51e743

• drag and drop cleaned

  meganenglert

  committed
  ec9a4d7

  Copy full SHA for ec9a4d7

• cleaned up files

  meganenglert

  committed
  ef04ee8

  Copy full SHA for ef04ee8

• Merge pull request #22 from meganenglert/megan-cleanup

  Show description for f58c1d0
  meganenglert

  authored
  f58c1d0

  Copy full SHA for f58c1d0

• saves user input text

  mycahdt

  committed
  5f73160

  Copy full SHA for 5f73160

Commits on Jan 27, 2023

• save name

  mycahdt

  committed
  4564f3c

  Copy full SHA for 4564f3c

• Merge pull request #23 from meganenglert/mycah

  Show description for a41c34c
  mycahdt

  authored
  a41c34c

  Copy full SHA for a41c34c

• updated package lock

  meganenglert

  committed
  bf669ba

  Copy full SHA for bf669ba

• displays names in collection

  mycahdt

  committed
  70aab2f

  Copy full SHA for 70aab2f

• Merge branch 'main' of https://github.com/meganenglert/build-a-bird-MVP into mycah

  mycahdt

  committed
  8f930b2

  Copy full SHA for 8f930b2