Brackets Yeni and Beylul #26

Bella8 · 2016-12-24T04:56:12Z

We’ve finished wave three and started wave four. We didn’t have time to finish wave four.

… Commented out future functions in the other files

… in Player and tests

…tion in Player to minimize confusion.

…e to call won from player play function.

…wn object. Added player and play functions to game and transferred the tests to game.spec.

…s not working like we expect.

… only

…pec.

…he table in. Updated the css accordingly.

…e, render and events to gameview and boardview. Events are console logging.

…with that change.

…initialize instead of default attribute since we moved it from default to initialize.

…nd game views accordingly.

…hanges in app.js and the models to get that get to work.

…o reflect the changes.

…r need.

…ce a win occurs.

…ected now, only displays once, when game resets the message disappears. Hurray.

Bella8 and others added 30 commits December 13, 2016 12:16

created spec and tic-tac-toe file.

19890e5

created three objects and imorted it into specs

41b94d5

Created separate files with specs for each object.

ac9e1ec

added import line to spec files.

de8b4ec

Added tests for empty and filled functions.

51141d2

Added tests for checkBoard function.

e779da8

updated the board filled function and make sure the test still works.…

07d3f27

… Commented out future functions in the other files

updated filled function in board and test. Implemented play function…

2711f86

… in Player and tests

finished board functionality (for now) and its tests.

c01ed88

changed the argument names for filled function in Board and play func…

36b9ce0

…tion in Player to minimize confusion.

worked on won function in Game and created test. working on being abl…

a4bbb6c

…e to call won from player play function.

Decided to include player into the game instead of having it as its o…

4f1f443

…wn object. Added player and play functions to game and transferred the tests to game.spec.

working on play/won functionality working together. Testing for tie i…

a14f3e7

…s not working like we expect.

added horizonatal, diagonal, tie methods and tests

2070573

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

5d61db5

… only

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

134b4b5

added tests to check the current state of the the board in the game s…

e8967d6

…pec.

solved merge conflict.

321db62

Made a change in play function for test to pass.

b6d2def

Created folders and files for backbone.

1f07fab

modeifined the board and game modeland the game_view

542346c

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

0c22ad0

worked on the html again and created a template to place the td for t…

3ab6135

…he table in. Updated the css accordingly.

simplified model content, in progress.

fdbc78b

set up the instances for game and gameview in app.js. Added initializ…

a566c4a

…e, render and events to gameview and boardview. Events are console logging.

changed game model to backbone

8e84b4e

integrated the board as a backbone model and fixed the specs to work …

4df9e88

…with that change.

cleaned up game model and spec

d8b8714

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

90cd011

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

3008b41

yenicapotediaz and others added 15 commits December 20, 2016 14:26

Edited the render function template piece to pull the board from the …

8610de3

…initialize instead of default attribute since we moved it from default to initialize.

have our events working properly (just console logs) adjusted board a…

9b82def

…nd game views accordingly.

Implemented the clickBox function to work with the event. Made some c…

d552751

…hanges in app.js and the models to get that get to work.

Fixed won and play functions to do their own thing. Fixed the specs t…

0123ac6

…o reflect the changes.

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

fc2e4f8

modifined gitignore

2af1fac

cleaned up specs and removed pieces of play function that we no longe…

03e31d8

…r need.

finally got the board to stop allowing the user to click on a spot on…

e10b4a5

…ce a win occurs.

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

bbfb396

worked on been able to view the winner on the screen. It works as exp…

8c37a5e

…ected now, only displays once, when game resets the message disappears. Hurray.

added background image

dd969c2

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

ec41252

Added new collection folder and list_game

fb11cb7

created collection folder and list_game file

4edc5fd

addded images

6c62eeb

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Brackets Yeni and Beylul #26

Brackets Yeni and Beylul #26

Bella8 commented Dec 24, 2016

Brackets Yeni and Beylul #26

Are you sure you want to change the base?

Brackets Yeni and Beylul #26

Conversation

Bella8 commented Dec 24, 2016