Code

Guinevere's tic-tac-toe#22

Code

Open

guineveresaenger wants to merge 36 commits intoAda-C6:masterAda-C6/tic-tac-toe:masterfrom guineveresaenger:masterguineveresaenger/tic-tac-toe:masterCopy head branch name to clipboard

+5,132-1

Commits

Commits on Dec 13, 2016

• created board, game, player files and specs, with proper imports and exports. Created basic Board attributes using BDD.

  guineveresaenger

  committed
  f9ec5c3

• created attributes for player and created functions to set the attributes

  allisonhoke

  committed
  4f8e766

• created initial attributes of turnCounter, 2 players, and current player for game

  allisonhoke

  committed
  6e52d80

• Added checkRows to Board to check if the rows have a winning condition

  guineveresaenger

  committed
  1723fde

• Added win checks for diagonals, checkDiags

  guineveresaenger

  committed
  e6197ff

• wrote function for checking the columns for a win

  allisonhoke

  committed
  eac0b06

• fixed merge conflicts

  allisonhoke

  committed
  1818341

• fixed more merge conflicts

  allisonhoke

  committed
  4327001

• created checkWin function to check all possibilities for winning game

  allisonhoke

  committed
  52cea58

• so many tests. created functions to check if a particular space is available and to set a space with the given marker

  allisonhoke

  committed
  ef5d979

Commits on Dec 14, 2016

• adjusted setMarker function - we will handle the logic in the game. adjusted test for function

  allisonhoke

  committed
  497ac23

• added togglePlayer function with tests

  allisonhoke

  committed
  402489e

• some setter methods for Game, and better logic in checkColumns

  guineveresaenger

  committed
  0744dfb

• fixed the flexibility for checking winning conditions on any size board

  guineveresaenger

  committed
  93aa0d1

• wrote comprehensive overall test for 1 gameplay with a win

  guineveresaenger

  committed
  cc2d870

• changed name of setMarker to makeMove for clarity. Also made all the null board fields be a blank space string instead

  guineveresaenger

  committed
  6b92ea6

Commits on Dec 16, 2016

• set up file structure for backbone

  allisonhoke

  committed
  ffc52b7

• set up HTML structure

  allisonhoke

  committed
  331f3d0

• set up import/export relations in file structure, declared most models and views

  guineveresaenger

  committed
  c4036d1

Commits on Dec 19, 2016

• added header to HTML

  allisonhoke

  committed
  8af5acf

• Moved app.js one level up into src

  guineveresaenger

  committed
  6f2e1a2

• Added Css file and Foundation. Tweaked index to make a game board, players and new game button.

  guineveresaenger

  committed
  b998ec3

• WIP working on DOM events

  allisonhoke

  committed
  612439b

• WIP working on DOM events, debugging lines in place

  allisonhoke

  committed
  ffb4121

• resolved DOM event issues

  guineveresaenger

  committed
  313a9bb

• made Player into backbone model successfully

  guineveresaenger

  committed
  86ae4e8

• translated board with tests into Backbone successfully

  guineveresaenger

  committed
  e8edadd

Commits on Dec 20, 2016

• fixed a bunch of stuff in board tests. Added Game translated into Backbone, with specs.

  guineveresaenger

  committed
  43d2e8a

• Made my click handler log stuff and make changes

  guineveresaenger

  committed
  dbd4cdc

Commits on Dec 21, 2016

• Made BoardView to have Game as its model, because that's where all the logic lives. Tried and tried and tried to pass the current mark into the tmplate, and need to figure out rendering again.

  guineveresaenger

  committed
  f0b8c7e

• Made cells respond to click updates. Added triggers for win and draw events, and played around with a modal. Game logic fully functional on website.

  guineveresaenger

  committed
  0ab88a9

• A little closer to not having my 3X3 grid fall apart when changing window size. Small windows still problematic.

  guineveresaenger

  committed
  c8773ca

Commits on Dec 22, 2016

• Added GameList collection and made the API connections work for post and get. Design still lacking.

  guineveresaenger

  committed
  9de046a

Commits on Dec 23, 2016

• Some tweaking of loading game data and failed attempts to make delete function work

  guineveresaenger

  committed
  c2a0bdb

• Game log will refresh automatically when new game is won

  guineveresaenger

  committed
  ffe7b8e

• hide games log when new game is selected

  guineveresaenger

  committed
  a93489f