Code

Octos Maja Brenda Scrabble#16

Code

Open

mgraonic wants to merge 35 commits intoAda-C9:masterAda-C9/Scrabble:masterfrom mgraonic:masterCopy head branch name to clipboard

+384-13

Commits

Commits on Feb 20, 2018

• created a letter hash

  mgraonic

  committed
  aeefd96

  Copy full SHA for aeefd96

• can score simple words and add points for long words

  mgraonic

  committed
  ef1ecab

  Copy full SHA for ef1ecab

Commits on Feb 21, 2018

• stopped using regex and used conditionals instead

  mgraonic

  committed
  bc295de

  Copy full SHA for bc295de

• for the first push

  mgraonic

  committed
  8cf6963

  Copy full SHA for 8cf6963

• passed tests for score method

  mgraonic

  committed
  88d2095

  Copy full SHA for 88d2095

• started on highest score method

  mgraonic

  committed
  1397cf7

  Copy full SHA for 1397cf7

• tests wave 2

  brendarios

  committed
  755f852

  Copy full SHA for 755f852

• working on the finding the word with highest score

  brendarios

  committed
  db8aa9d

  Copy full SHA for db8aa9d

Commits on Feb 22, 2018

• test without tie passes

  brendarios

  committed
  8bea3e1

  Copy full SHA for 8bea3e1

• maja's files

  mgraonic

  committed
  19cc533

  Copy full SHA for 19cc533

• merging

  mgraonic

  committed
  fe81b64

  Copy full SHA for fe81b64

• implementation of self.highest_score from method and tests done

  brendarios

  committed
  fa0d271

  Copy full SHA for fa0d271

• working out logic for winning

  mgraonic

  committed
  6c22ae3

  Copy full SHA for 6c22ae3

• resolving merge confilcts

  mgraonic

  committed
  af1b9e4

  Copy full SHA for af1b9e4

• wave 2 implementation of initialize method and tests done

  brendarios

  committed
  06bd428

  Copy full SHA for 06bd428

• play method implementation and tests done

  brendarios

  committed
  83c95b6

  Copy full SHA for 83c95b6

• revising game play to track a score as player attribute

  brendarios

  committed
  ae0fc03

  Copy full SHA for ae0fc03

• added methods for highest scoring words

  brendarios

  committed
  287ab88

  Copy full SHA for 287ab88

Commits on Feb 23, 2018

• wave 2 completed

  brendarios

  committed
  d0c633d

  Copy full SHA for d0c633d

• started TileBag class

  mgraonic

  committed
  5f37066

  Copy full SHA for 5f37066

• wave 2 completed cleaned

  brendarios

  committed
  a7e3afa

  Copy full SHA for a7e3afa

• Merge branch 'master' of https://github.com/mgraonic/Scrabble

  brendarios

  committed
  a49681f

  Copy full SHA for a49681f

• started on tilebag hash problem

  mgraonic

  committed
  e40327d

  Copy full SHA for e40327d

• Tilebag implementation

  brendarios

  committed
  76f91ac

  Copy full SHA for 76f91ac

• Upated

  brendarios

  committed
  22950a7

  Copy full SHA for 22950a7

• conflict resolution

  mgraonic

  committed
  a2d6247

  Copy full SHA for a2d6247

• adding tile methods

  mgraonic

  committed
  5dd28f2

  Copy full SHA for 5dd28f2

• reconciling changes

  mgraonic

  committed
  b286e6e

  Copy full SHA for b286e6e

• added player functionality

  mgraonic

  committed
  982fe52

  Copy full SHA for 982fe52

• wrote tests for tilebag

  mgraonic

  committed
  7c93690

  Copy full SHA for 7c93690

• passing all tests

  mgraonic

  committed
  00fcd9f

  Copy full SHA for 00fcd9f

• fixed indentation

  mgraonic

  committed
  64800b2

  Copy full SHA for 64800b2

• trying to merge

  brendarios

  committed
  a2d06ca

  Copy full SHA for a2d06ca

Commits on Feb 24, 2018

• trying to merge

  brendarios

  committed
  f4d0c1e

  Copy full SHA for f4d0c1e

• merging

  mgraonic

  committed
  92ed4c6

  Copy full SHA for 92ed4c6