Code

M. Johnson TTT#14

Code

Open

mjohnson3038 wants to merge 77 commits intoAda-C6:masterAda-C6/tic-tac-toe:masterfrom mjohnson3038:mastermjohnson3038/tic-tac-toe:masterCopy head branch name to clipboard

+5,004

Commits

Commits on Dec 13, 2016

• started Player spec testing and first test

  johnanmorris

  committed
  56da6d3

  Copy full SHA for 56da6d3

• preliminary player specs

  johnanmorris

  committed
  e5e4889

  Copy full SHA for e5e4889

• preliminary Board specs code

  mjohnson3038

  committed
  1f415f3

  Copy full SHA for 1f415f3

• sending the board.js

  mjohnson3038

  committed
  c33102f

  Copy full SHA for c33102f

• in progress game

  johnanmorris

  committed
  ce8fbc9

  Copy full SHA for ce8fbc9

• Merge branch 'game'

  Show description for 9daac5a
  johnanmorris

  committed
  9daac5a

  Copy full SHA for 9daac5a

• wrote specs and variables for initial game

  johnanmorris

  committed
  37636e4

  Copy full SHA for 37636e4

• wrote tests and functions for validSquare and toggleTurn

  johnanmorris

  committed
  4fbe08a

  Copy full SHA for 4fbe08a

Commits on Dec 14, 2016

• working through logic of finding winner

  mjohnson3038

  committed
  939fcbf

  Copy full SHA for 939fcbf

• hard coded horizontal winner

  mjohnson3038

  committed
  f883bd7

  Copy full SHA for f883bd7

• robust tests for horizontal win

  mjohnson3038

  committed
  1d68ab1

  Copy full SHA for 1d68ab1

• no winner to return properly

  johnanmorris

  committed
  2c28a72

  Copy full SHA for 2c28a72

• Horizontal passing as expected, vertical test failing because not coded

  mjohnson3038

  committed
  8c6f79c

  Copy full SHA for 8c6f79c

• testing and code for vertical wins

  johnanmorris

  committed
  11cb7bd

  Copy full SHA for 11cb7bd

• diagonal win tests and code

  johnanmorris

  committed
  f4639ca

  Copy full SHA for f4639ca

• wrote tests for draw game

  johnanmorris

  committed
  bb13868

  Copy full SHA for bb13868

• game play. WIP toggleTurn post valid play move

  mjohnson3038

  committed
  a5500a7

  Copy full SHA for a5500a7

• toggleTurn was good but the beforeEach needed to be altered

  mjohnson3038

  committed
  ab3a14f

  Copy full SHA for ab3a14f

• cleaning up post game play

  mjohnson3038

  committed
  d587b9d

  Copy full SHA for d587b9d

• functionality for when a player has won

  johnanmorris

  committed
  023888f

  Copy full SHA for 023888f

• First Error

  mjohnson3038

  committed
  70fbc6c

  Copy full SHA for 70fbc6c

• WIP: refactoring play

  johnanmorris

  committed
  d2250c5

  Copy full SHA for d2250c5

• refactored tests to create a new Game instance before every test

  johnanmorris

  committed
  e31be6e

  Copy full SHA for e31be6e

• revert changes to game

  johnanmorris

  committed
  6acebd5

  Copy full SHA for 6acebd5

• reverts, pt2

  johnanmorris

  committed
  0e626b3

  Copy full SHA for 0e626b3

• Adding Error messaging for checking coordinates of play square

  mjohnson3038

  committed
  89aa690

  Copy full SHA for 89aa690

• Merge branch 'master' into mbj/error-handling

  Show description for d1c24c1
  mjohnson3038

  committed
  d1c24c1

  Copy full SHA for d1c24c1

• Error handling for NON whole numbers

  mjohnson3038

  committed
  22ef51b

  Copy full SHA for 22ef51b

• error handling for play completed

  mjohnson3038

  committed
  278098e

  Copy full SHA for 278098e

• re-added test refactoring with beforeEach

  johnanmorris

  committed
  ce1a3b5

  Copy full SHA for ce1a3b5

• currentPlayer function to determine the playing whose turn it is

  mjohnson3038

  committed
  567a2fc

  Copy full SHA for 567a2fc

• refeactored winner with playerByMark

  mjohnson3038

  committed
  7af8cbe

  Copy full SHA for 7af8cbe

Commits on Dec 15, 2016

• Use currentPlayer to refactor play

  mjohnson3038

  committed
  5e5cb1e

  Copy full SHA for 5e5cb1e

• fixed logic of playerByMark error handling

  mjohnson3038

  committed
  d766c00

  Copy full SHA for d766c00

Commits on Dec 16, 2016

• Backbone files created; stubbed out HTML for index page

  johnanmorris

  committed
  245065b

  Copy full SHA for 245065b

• event framework for BoardView

  mjohnson3038

  committed
  62c9248

  Copy full SHA for 62c9248

• Add applicationView events and fix file mixup

  mjohnson3038

  committed
  2679894

  Copy full SHA for 2679894

• added custom events to views

  mjohnson3038

  committed
  dd8216b

  Copy full SHA for dd8216b

• basic CSS layout

  johnanmorris

  committed
  1127346

  Copy full SHA for 1127346

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

  mjohnson3038

  committed
  ad47fe0

  Copy full SHA for ad47fe0

Commits on Dec 19, 2016

• Fixed compiling errors - small syntax error fixed

  mjohnson3038

  committed
  1cb8534

  Copy full SHA for 1cb8534

• application model stubbed

  johnanmorris

  committed
  b071c9f

  Copy full SHA for b071c9f

• resolved merge conflict in board_view

  johnanmorris

  committed
  044177e

  Copy full SHA for 044177e

• console.log for clicking the board

  johnanmorris

  committed
  3d18200

  Copy full SHA for 3d18200

• Console log the square id, but printing twice

  mjohnson3038

  committed
  1efd377

  Copy full SHA for 1efd377

• Console log printing once, rendering once

  mjohnson3038

  committed
  378b0c4

  Copy full SHA for 378b0c4

• New Game logging -is an html tag not id

  mjohnson3038

  committed
  ff1cc15

  Copy full SHA for ff1cc15

• console.log for clearBoard functionality

  johnanmorris

  committed
  87ff12c

  Copy full SHA for 87ff12c

• modified styling

  johnanmorris

  committed
  9610744

  Copy full SHA for 9610744

• added fonts

  mjohnson3038

  committed
  28b2c6f

  Copy full SHA for 28b2c6f

• Foundation working, large - button right, small - button below

  mjohnson3038

  committed
  b39eac0

  Copy full SHA for b39eac0

• Not sure what went wrong or why it is working, but functionally as it should have been

  mjohnson3038

  committed
  0f75e89

  Copy full SHA for 0f75e89

• adjusted foundation columns

  johnanmorris

  committed
  341ec8f

  Copy full SHA for 341ec8f

• Player turned to Backbone

  mjohnson3038

  committed
  4d7658e

  Copy full SHA for 4d7658e

• Board logic and specs to Backbone

  mjohnson3038

  committed
  6adc9cd

  Copy full SHA for 6adc9cd

• Change name of model to game to match logic

  mjohnson3038

  committed
  ecc7e9a

  Copy full SHA for ecc7e9a

• WIP game logic and specs to model

  mjohnson3038

  committed
  9c7e356

  Copy full SHA for 9c7e356

Commits on Dec 20, 2016

• figured out my first partial set of the grid

  mjohnson3038

  committed
  997a4d3

  Copy full SHA for 997a4d3

• WIP play

  mjohnson3038

  committed
  34a3d58

  Copy full SHA for 34a3d58

• No longer error with winner, still not passing though

  mjohnson3038

  committed
  07dccf3

  Copy full SHA for 07dccf3

• Work in progress, currentPlayer note being properly called

  mjohnson3038

  committed
  26b9089

  Copy full SHA for 26b9089

• Brute force and avoid built methods

  mjohnson3038

  committed
  fd08180

  Copy full SHA for fd08180

• Change to initialize grid over defualt, same tests failing

  mjohnson3038

  committed
  6985fb8

  Copy full SHA for 6985fb8

• undo hard code and use custom method

  mjohnson3038

  committed
  aca8653

  Copy full SHA for aca8653

• SOLVVVED THE ISSUE, was resetting the baord to all nulls with each play

  mjohnson3038

  committed
  d6c4cb6

  Copy full SHA for d6c4cb6

• FINALLY converted over to a Backbone Model

  mjohnson3038

  committed
  f1e323b

  Copy full SHA for f1e323b

Commits on Dec 21, 2016

• holy cow, stuff is printing in the board

  mjohnson3038

  committed
  1a1a9d7

  Copy full SHA for 1a1a9d7

• Marking board and updates to model

  mjohnson3038

  committed
  37a3b60

  Copy full SHA for 37a3b60

• new game button clears board successfully, new game isn't started yet

  mjohnson3038

  committed
  ce6da32

  Copy full SHA for ce6da32

• board view and model working separately

  mjohnson3038

  committed
  44c270c

  Copy full SHA for 44c270c

Commits on Dec 22, 2016

• Game plays until winner & no rewritting squares, yay

  mjohnson3038

  committed
  26b6ab5

  Copy full SHA for 26b6ab5

• template to display winner

  mjohnson3038

  committed
  9c12cb1

  Copy full SHA for 9c12cb1

• Winner only displays once and disapears with new game

  mjohnson3038

  committed
  0b2d94c

  Copy full SHA for 0b2d94c

• add section for current player toggle hide with wins

  mjohnson3038

  committed
  3c6b917

  Copy full SHA for 3c6b917

• Toggle between player turns, not displayed with initial load

  mjohnson3038

  committed
  71c6822

  Copy full SHA for 71c6822

• Add html current player to initialize and working

  mjohnson3038

  committed
  a543072

  Copy full SHA for a543072

• Current player displayed for full game play

  mjohnson3038

  committed
  c390834

  Copy full SHA for c390834