Code

Brackets Yeni and Beylul #26

Code

Open

Bella8 wants to merge 45 commits intoAda-C6:masterAda-C6/tic-tac-toe:masterfrom Bella8:masterBella8/tic-tac-toe:masterCopy head branch name to clipboard

+4,808-7

Commits

Commits on Dec 13, 2016

• created spec and tic-tac-toe file.

  Bella8

  committed
  19890e5

  Copy full SHA for 19890e5

• created three objects and imorted it into specs

  Bella8

  committed
  41b94d5

  Copy full SHA for 41b94d5

• Created separate files with specs for each object.

  yenicapotediaz

  committed
  ac9e1ec

  Copy full SHA for ac9e1ec

• added import line to spec files.

  yenicapotediaz

  committed
  de8b4ec

  Copy full SHA for de8b4ec

• Added tests for empty and filled functions.

  yenicapotediaz

  committed
  51141d2

  Copy full SHA for 51141d2

• Added tests for checkBoard function.

  yenicapotediaz

  committed
  e779da8

  Copy full SHA for e779da8

Commits on Dec 14, 2016

• updated the board filled function and make sure the test still works. Commented out future functions in the other files

  Bella8

  committed
  07d3f27

  Copy full SHA for 07d3f27

• updated filled function in board and test. Implemented play function in Player and tests

  Bella8

  committed
  2711f86

  Copy full SHA for 2711f86

• finished board functionality (for now) and its tests.

  yenicapotediaz

  committed
  c01ed88

  Copy full SHA for c01ed88

• changed the argument names for filled function in Board and play function in Player to minimize confusion.

  yenicapotediaz

  committed
  36b9ce0

  Copy full SHA for 36b9ce0

Commits on Dec 15, 2016

• worked on won function in Game and created test. working on being able to call won from player play function.

  yenicapotediaz

  committed
  a4bbb6c

  Copy full SHA for a4bbb6c

Commits on Dec 16, 2016

• Decided to include player into the game instead of having it as its own object. Added player and play functions to game and transferred the tests to game.spec.

  yenicapotediaz

  committed
  4f1f443

  Copy full SHA for 4f1f443

Commits on Dec 17, 2016

• working on play/won functionality working together. Testing for tie is not working like we expect.

  yenicapotediaz

  committed
  a14f3e7

  Copy full SHA for a14f3e7

Commits on Dec 18, 2016

• added horizonatal, diagonal, tie methods and tests

  Bella8

  committed
  2070573

  Copy full SHA for 2070573

• modifid the won function to check if its a tie after the game is over only

  Bella8

  committed
  5d61db5

  Copy full SHA for 5d61db5

• clear board after a player wins or if its a tie.

  Bella8

  committed
  134b4b5

  Copy full SHA for 134b4b5

• added tests to check the current state of the the board in the game spec.

  Bella8

  committed
  e8967d6

  Copy full SHA for e8967d6

• solved merge conflict.

  yenicapotediaz

  committed
  321db62

  Copy full SHA for 321db62

Commits on Dec 19, 2016

• Made a change in play function for test to pass.

  yenicapotediaz

  committed
  b6d2def

  Copy full SHA for b6d2def

• Created folders and files for backbone.

  Bella8

  committed
  1f07fab

  Copy full SHA for 1f07fab

• modeifined the board and game modeland the game_view

  Bella8

  committed
  542346c

  Copy full SHA for 542346c

• Still in progress, working on views, model, and events

  Bella8

  committed
  0c22ad0

  Copy full SHA for 0c22ad0

Commits on Dec 20, 2016

• worked on the html again and created a template to place the td for the table in. Updated the css accordingly.

  yenicapotediaz

  committed
  3ab6135

  Copy full SHA for 3ab6135

• simplified model content, in progress.

  yenicapotediaz

  committed
  fdbc78b

  Copy full SHA for fdbc78b

• set up the instances for game and gameview in app.js. Added initialize, render and events to gameview and boardview. Events are console logging.

  yenicapotediaz

  committed
  a566c4a

  Copy full SHA for a566c4a

• changed game model to backbone

  Bella8

  committed
  8e84b4e

  Copy full SHA for 8e84b4e

• integrated the board as a backbone model and fixed the specs to work with that change.

  yenicapotediaz

  committed
  4df9e88

  Copy full SHA for 4df9e88

• cleaned up game model and spec

  Bella8

  committed
  d8b8714

  Copy full SHA for d8b8714

• Merge branch 'master' of https://github.com/Bella8/tic-tac-toe

  Bella8

  committed
  90cd011

  Copy full SHA for 90cd011

• deleted board.js and modifined board.js model to pass the tests

  Bella8

  committed
  3008b41

  Copy full SHA for 3008b41

• Edited the render function template piece to pull the board from the initialize instead of default attribute since we moved it from default to initialize.

  yenicapotediaz

  committed
  8610de3

  Copy full SHA for 8610de3

• have our events working properly (just console logs) adjusted board and game views accordingly.

  yenicapotediaz

  committed
  9b82def

  Copy full SHA for 9b82def

Commits on Dec 21, 2016

• Implemented the clickBox function to work with the event. Made some changes in app.js and the models to get that get to work.

  yenicapotediaz

  committed
  d552751

  Copy full SHA for d552751

• Fixed won and play functions to do their own thing. Fixed the specs to reflect the changes.

  yenicapotediaz

  committed
  0123ac6

  Copy full SHA for 0123ac6

• Worked on game view event to clear the board. It works now.

  yenicapotediaz

  committed
  fc2e4f8

  Copy full SHA for fc2e4f8

• modifined gitignore

  Bella8

  committed
  2af1fac

  Copy full SHA for 2af1fac

• cleaned up specs and removed pieces of play function that we no longer need.

  yenicapotediaz

  committed
  03e31d8

  Copy full SHA for 03e31d8

• finally got the board to stop allowing the user to click on a spot once a win occurs.

  yenicapotediaz

  committed
  e10b4a5

  Copy full SHA for e10b4a5

• Can now see who the winner is, still a work in progress.

  yenicapotediaz

  committed
  bbfb396

  Copy full SHA for bbfb396

• worked on been able to view the winner on the screen. It works as expected now, only displays once, when game resets the message disappears. Hurray.

  yenicapotediaz

  committed
  8c37a5e

  Copy full SHA for 8c37a5e

Commits on Dec 22, 2016

• added background image

  Bella8

  committed
  dd969c2

  Copy full SHA for dd969c2

• worked on the index and css layout. Looks pretty now.

  yenicapotediaz

  committed
  ec41252

  Copy full SHA for ec41252

• Added new collection folder and list_game

  Bella8

  committed
  fb11cb7

  Copy full SHA for fb11cb7

• created collection folder and list_game file

  Bella8

  committed
  4edc5fd

  Copy full SHA for 4edc5fd

• addded images

  Bella8

  committed
  6c62eeb

  Copy full SHA for 6c62eeb