Skip to content

Brackets Yeni and Beylul #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Open
beylulkbreab wants to merge 45 commits into
base: master
Choose a base branch
from
Open

Brackets Yeni and Beylul #26

beylulkbreab wants to merge 45 commits into from

Conversation

@beylulkbreab
Copy link

@beylulkbreab beylulkbreab commented Dec 24, 2016

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

beylulkbreab and others added 30 commits December 13, 2016 12:16
@beylulkbreab
created spec and tic-tac-toe file.
19890e5
@beylulkbreab
created three objects and imorted it into specs
41b94d5
@yenicapotediaz
Created separate files with specs for each object.
ac9e1ec
@yenicapotediaz
added import line to spec files.
de8b4ec
@yenicapotediaz
Added tests for empty and filled functions.
51141d2
@yenicapotediaz
Added tests for checkBoard function.
e779da8
@beylulkbreab
updated the board filled function and make sure the test still works.…
07d3f27 
… Commented out future functions in the other files
@beylulkbreab
updated filled function in board and test. Implemented play function…
2711f86 
… in Player and tests
@yenicapotediaz
finished board functionality (for now) and its tests.
c01ed88
@yenicapotediaz
changed the argument names for filled function in Board and play func…
36b9ce0 
…tion in Player to minimize confusion.
@yenicapotediaz
worked on won function in Game and created test. working on being abl…
a4bbb6c 
…e to call won from player play function.
@yenicapotediaz
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.
@yenicapotediaz
working on play/won functionality working together. Testing for tie i…
a14f3e7 
…s not working like we expect.
@beylulkbreab
added horizonatal, diagonal, tie methods and tests
2070573
@beylulkbreab
modifid the won function to check if its a tie after the game is over…
5d61db5 
… only
@beylulkbreab
clear board after a player wins or if its a tie.
134b4b5
@beylulkbreab
added tests to check the current state of the the board in the game s…
e8967d6 
…pec.
@yenicapotediaz
solved merge conflict.
321db62
@yenicapotediaz
Made a change in play function for test to pass.
b6d2def
@beylulkbreab
Created folders and files for backbone.
1f07fab
@beylulkbreab
modeifined the board and game modeland the game_view
542346c
@beylulkbreab
Still in progress, working on views, model, and events
0c22ad0
@yenicapotediaz
worked on the html again and created a template to place the td for t…
3ab6135 
…he table in. Updated the css accordingly.
@yenicapotediaz
simplified model content, in progress.
fdbc78b
@yenicapotediaz
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.
@beylulkbreab
changed game model to backbone
8e84b4e
@yenicapotediaz
integrated the board as a backbone model and fixed the specs to work …
4df9e88 
…with that change.
@beylulkbreab
cleaned up game model and spec
d8b8714
@beylulkbreab
Merge branch 'master' of https://github.com/Bella8/tic-tac-toe
90cd011
@beylulkbreab
deleted board.js and modifined board.js model to pass the tests
3008b41
yenicapotediaz and others added 15 commits December 20, 2016 14:26
@yenicapotediaz
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.
@yenicapotediaz
have our events working properly (just console logs) adjusted board a…
9b82def 
…nd game views accordingly.
@yenicapotediaz
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.
@yenicapotediaz
Fixed won and play functions to do their own thing. Fixed the specs t…
0123ac6 
…o reflect the changes.
@yenicapotediaz
Worked on game view event to clear the board. It works now.
fc2e4f8
@beylulkbreab
modifined gitignore
2af1fac
@yenicapotediaz
cleaned up specs and removed pieces of play function that we no longe…
03e31d8 
…r need.
@yenicapotediaz
finally got the board to stop allowing the user to click on a spot on…
e10b4a5 
…ce a win occurs.
@yenicapotediaz
Can now see who the winner is, still a work in progress.
bbfb396
@yenicapotediaz
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.
@beylulkbreab
added background image
dd969c2
@yenicapotediaz
worked on the index and css layout. Looks pretty now.
ec41252
@beylulkbreab
Added new collection folder and list_game
fb11cb7
@beylulkbreab
created collection folder and list_game file
4edc5fd
@beylulkbreab
addded images
6c62eeb
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@beylulkbreab @yenicapotediaz