Code

Alyssa's Tic-Tac-Toe#34

Code

Open

alyssahursh wants to merge 94 commits intoAda-C6:masterAda-C6/tic-tac-toe:masterfrom alyssahursh:masteralyssahursh/set:masterCopy head branch name to clipboard

+952-72

Commits

Commits on Dec 13, 2016

• initialize all objects and files. built starter tests for board and player.

  

  Maya Wang

  committed
  e946ac6

  Copy full SHA for e946ac6

• work on logic and testing on hasWon in Board

  

  Maya Wang

  committed
  2eb10b7

  Copy full SHA for 2eb10b7

• hasWon function works

  alyssahursh

  committed
  5a249e9

  Copy full SHA for 5a249e9

• completed logic and testing on hasTied in Board

  

  Maya Wang

  committed
  9b3f278

  Copy full SHA for 9b3f278

• completed logic and testing on roundOver in Board

  

  Maya Wang

  committed
  094981a

  Copy full SHA for 094981a

Commits on Dec 14, 2016

• completed logic and testing on Game initialization and newRound in Game

  

  Maya Wang

  committed
  adee71b

  Copy full SHA for adee71b

• follow up testing on newRound, completed logic and testing on move function in Game

  

  Maya Wang

  committed
  f7947fe

  Copy full SHA for f7947fe

• completed logic and testing on rejecting a move on occupied tile.

  

  Maya Wang

  committed
  c0187e6

  Copy full SHA for c0187e6

• completed logic testing on score incrementation and started newRound automatically in Game

  

  Maya Wang

  committed
  596cca1

  Copy full SHA for 596cca1

• completed logic and testing on player can not choose same symbols on Game. Improved description on testing on check winner or tie

  

  Maya Wang

  committed
  06420ae

  Copy full SHA for 06420ae

• Update README.md

  

  Maya Wang

  authored
  ab1cd59

  Copy full SHA for ab1cd59

• Update README.md

  

  Maya Wang

  authored
  a05931f

  Copy full SHA for a05931f

• Update README.md

  

  Maya Wang

  authored
  68a1303

  Copy full SHA for 68a1303

• Update

  

  Maya Wang

  authored
  16db5b9

  Copy full SHA for 16db5b9

• Update README.md

  

  Maya Wang

  authored
  96fb4a1

  Copy full SHA for 96fb4a1

• Update README.md

  

  Maya Wang

  authored
  ab86d68

  Copy full SHA for ab86d68

Commits on Dec 15, 2016

• Update README.md

  

  Maya Wang

  authored
  c6c388a

  Copy full SHA for c6c388a

• Update README.md

  

  Maya Wang

  authored
  0bba195

  Copy full SHA for 0bba195

• deleted unwanted parts in board testing

  

  Maya Wang

  committed
  94755bc

  Copy full SHA for 94755bc

• merge master

  

  Maya Wang

  committed
  86e963d

  Copy full SHA for 86e963d

Commits on Dec 16, 2016

• Pretty background gradation animation and page title

  alyssahursh

  committed
  1fc0239

  Copy full SHA for 1fc0239

• Added blank board styling

  alyssahursh

  committed
  79ca051

  Copy full SHA for 79ca051

• Added scoring area to html and css

  alyssahursh

  committed
  9e9b75c

  Copy full SHA for 9e9b75c

• Created stub files for backbone structure

  alyssahursh

  committed
  7c8b3cb

  Copy full SHA for 7c8b3cb

Commits on Dec 17, 2016

• Added hover motion to board, buttons, and score

  alyssahursh

  committed
  1751580

  Copy full SHA for 1751580

Commits on Dec 21, 2016

• Committing to save work and move to another branch

  alyssahursh

  committed
  3e81374

  Copy full SHA for 3e81374

• Created empty app files

  alyssahursh

  committed
  83bc38a

  Copy full SHA for 83bc38a

• Set up the Card model

  alyssahursh

  committed
  324b1f9

  Copy full SHA for 324b1f9

• Created a standard set deck in app.js

  alyssahursh

  committed
  8999da6

  Copy full SHA for 8999da6

• Created basic deck collectionto contain deck of cards

  alyssahursh

  committed
  77b0a06

  Copy full SHA for 77b0a06

• A board is started with a fresh deck and draws 12 random cards

  alyssahursh

  committed
  d2d8322

  Copy full SHA for d2d8322

• The computer can tell if the 12 cards in play have a set

  alyssahursh

  committed
  f3a4c35

  Copy full SHA for f3a4c35

• Cards now print to the screen(attributes in text only)

  alyssahursh

  committed
  7ae815f

  Copy full SHA for 7ae815f

Commits on Dec 22, 2016

• Styled cards

  alyssahursh

  committed
  74eda89

  Copy full SHA for 74eda89

• Cards now have symbol colornumber and color

  alyssahursh

  committed
  45d011b

  Copy full SHA for 45d011b

Commits on Dec 23, 2016

• Added sub divs to diamonds for outlining

  alyssahursh

  committed
  529eb6d

  Copy full SHA for 529eb6d

• DIAMONDS SHOW UP WITH AN OUTLINE

  alyssahursh

  committed
  d107865

  Copy full SHA for d107865

• Moved game logic to board model

  alyssahursh

  committed
  605f4db

  Copy full SHA for 605f4db

• Removed console logs from document ready

  alyssahursh

  committed
  039f02a

  Copy full SHA for 039f02a

• Removed game logic and moved it to the board model

  alyssahursh

  committed
  b8aaf39

  Copy full SHA for b8aaf39

• Corrected listening functions

  alyssahursh

  committed
  2ecdc05

  Copy full SHA for 2ecdc05

• Corrected listening functions

  alyssahursh

  committed
  3b77753

  Copy full SHA for 3b77753

• Switched all measurements to pixels

  alyssahursh

  committed
  6e9b04a

  Copy full SHA for 6e9b04a

• Fixed white symbols

  alyssahursh

  committed
  17b5e5b

  Copy full SHA for 17b5e5b

• Extended deselect timeout

  alyssahursh

  committed
  b52c044

  Copy full SHA for b52c044

• Made replaceWinningCards timeout function work correctly

  alyssahursh

  committed
  582856e

  Copy full SHA for 582856e

Commits on Dec 24, 2016

• Fixed white backgrounds so that they turn grey when selected

  alyssahursh

  committed
  b535e25

  Copy full SHA for b535e25

• Re-did console logs (now showing accurent checkAllCombinations on every rerender)

  alyssahursh

  committed
  0a22926

  Copy full SHA for 0a22926

• Refactored using JS set class

  alyssahursh

  committed
  fb2b41b

  Copy full SHA for fb2b41b

• Added application view layer and put table view inside it

  alyssahursh

  committed
  9dc5b98

  Copy full SHA for 9dc5b98

• Added gameplay buttons and basic button functionality

  alyssahursh

  committed
  2bf2c33

  Copy full SHA for 2bf2c33

• Styled gameplay buttons

  alyssahursh

  committed
  fd77d66

  Copy full SHA for fd77d66

• Are there sets button now toggles to yes and no when clicked and resets when new cards are drawn

  alyssahursh

  committed
  25af869

  Copy full SHA for 25af869

• Draw cards draws cards and puts them in the right spots

  alyssahursh

  committed
  70347ca

  Copy full SHA for 70347ca

• Hint button wiggles the card that is in the most sets

  alyssahursh

  committed
  0147d65

  Copy full SHA for 0147d65

• If no set, hint button cause Draw Cards to shake

  alyssahursh

  committed
  1457d33

  Copy full SHA for 1457d33

• Added margin to the top of the page

  alyssahursh

  committed
  6afc4a8

  Copy full SHA for 6afc4a8

Commits on Dec 25, 2016

• Resolved merge conflict to merge in startover branch

  alyssahursh

  committed
  fec0776

  Copy full SHA for fec0776

• Added node and npm to engines

  alyssahursh

  committed
  db52b69

  Copy full SHA for db52b69

• Attempting to prep for heroku deploy

  alyssahursh

  committed
  327956a

  Copy full SHA for 327956a

• Point to webpack.config.js

  alyssahursh

  committed
  2868d77

  Copy full SHA for 2868d77

• Added procfile

  alyssahursh

  committed
  80f5385

  Copy full SHA for 80f5385

• Turned off heroku-postbuild

  alyssahursh

  committed
  9255845

  Copy full SHA for 9255845

• Turned off heroku-postbuild

  alyssahursh

  committed
  a9bc1e3

  Copy full SHA for a9bc1e3

• Turned off heroku-postbuild

  alyssahursh

  committed
  2c74de2

  Copy full SHA for 2c74de2

• Updated procfile

  alyssahursh

  committed
  bce575e

  Copy full SHA for bce575e

• Updated procfile

  alyssahursh

  committed
  52af104

  Copy full SHA for 52af104

• Updated procfile

  alyssahursh

  committed
  319802b

  Copy full SHA for 319802b

Commits on Dec 26, 2016

• Redid heroku-postbuild

  alyssahursh

  committed
  93c59aa

  Copy full SHA for 93c59aa

• Redid heroku-postbuild

  alyssahursh

  committed
  c5f5f18

  Copy full SHA for c5f5f18

• test

  alyssahursh

  committed
  cb3aa21

  Copy full SHA for cb3aa21

• test

  alyssahursh

  committed
  4f8c118

  Copy full SHA for 4f8c118

• fix

  alyssahursh

  committed
  a3492a1

  Copy full SHA for a3492a1

• fix

  alyssahursh

  committed
  96ccb11

  Copy full SHA for 96ccb11

• fix

  alyssahursh

  committed
  afc42c0

  Copy full SHA for afc42c0

• fix

  alyssahursh

  committed
  3a8241f

  Copy full SHA for 3a8241f

Commits on Jan 3, 2017

• Added rerender trigger when three cards are selected but set is not found

  alyssahursh

  committed
  01ecbb3

  Copy full SHA for 01ecbb3

• Deleting all files related to original tic tac toe

  alyssahursh

  committed
  3a41b15

  Copy full SHA for 3a41b15

Commits on Jan 4, 2017

• Merge branch 'alyssa'

  Show description for e183d6e
  alyssahursh

  committed
  e183d6e

  Copy full SHA for e183d6e

Commits on Jan 5, 2017

• reset to webpack

  alyssahursh

  committed
  fb03980

  Copy full SHA for fb03980

• Fixed wiggle listener

  alyssahursh

  committed
  534a922

  Copy full SHA for 534a922

Commits on Jan 12, 2017

• Made production changes based on Charles' recommendations

  alyssahursh

  committed
  1092371

  Copy full SHA for 1092371

• Corrected link direction

  alyssahursh

  committed
  88598d8

  Copy full SHA for 88598d8

Commits on Jan 13, 2017

• Changed pointers on hover

  alyssahursh

  committed
  259dd5a

  Copy full SHA for 259dd5a

Commits on Apr 29, 2017

• Add files via upload

  alyssahursh

  authored
  f34c1aa

  Copy full SHA for f34c1aa

• Add files via upload

  alyssahursh

  authored
  dbc5453

  Copy full SHA for dbc5453

• Update README.md

  alyssahursh

  authored
  5ff1e63

  Copy full SHA for 5ff1e63

• Update README.md

  alyssahursh

  authored
  294ac9e

  Copy full SHA for 294ac9e

• Update README.md

  alyssahursh

  authored
  2c60ee4

  Copy full SHA for 2c60ee4

Commits on Apr 30, 2017

• Update README.md

  alyssahursh

  authored
  5be8cee

  Copy full SHA for 5be8cee

• Update README.md

  alyssahursh

  authored
  e40ddb5

  Copy full SHA for e40ddb5

• Update README.md

  alyssahursh

  authored
  98b0a2d

  Copy full SHA for 98b0a2d

• Update README.md

  alyssahursh

  authored
  88bf427

  Copy full SHA for 88bf427

Commits on May 2, 2017

• Update README.md

  alyssahursh

  authored
  8240289

  Copy full SHA for 8240289