Code

Hwjn/master#6

Code

Open

yourFriendWes wants to merge 44 commits intoAda-C4:hwjn/masterAda-C4/2048-rails:hwjn/masterfrom yourFriendWes:hwjn/masteryourFriendWes/2048-rails:hwjn/masterCopy head branch name to clipboard

+780-31

Commits

Commits on Feb 8, 2016

• Goes to Twitter for authentication

  noglows

  committed
  87a59cf

• add users model and controller, now saving logged in users to DB

  yourFriendWes

  committed
  e107a5b

• add game model and user game relationship

  yourFriendWes

  committed
  93c9ee4

Commits on Feb 9, 2016

• Displays username from Twitter

  noglows

  committed
  46d7ec7

• Trying to figure out how to use Ajax in Rails

  noglows

  committed
  9f464a0

• We might be on the right track

  noglows

  committed
  26f6c11

• Users show view

  noglows

  committed
  4312103

• Neverending troubleshooting

  noglows

  committed
  64549f0

• A thing is working

  noglows

  committed
  5638e4b

• Moved API code to the games controller

  noglows

  committed
  5281814

• game state data saving as string, no user info

  yourFriendWes

  committed
  88e10d3

• add omniauth dev for multiple users

  yourFriendWes

  committed
  39f04cf

• change user controller to retrieve games by user

  yourFriendWes

  committed
  aafc8d7

• Still working on routes

  noglows

  committed
  dee1dc0

• Broken. Everything.

  noglows

  committed
  b7fa2f2

• user id saves to game

  yourFriendWes

  committed
  24282f0

• Working save game button

  noglows

  committed
  87ff717

Commits on Feb 10, 2016

• Styled the button

  noglows

  committed
  b33dcf3

• Working on loading games

  noglows

  committed
  01c7deb

• fixed the button

  noglows

  committed
  c2f3273

• Added list of other games

  noglows

  committed
  3ccb42e

• Changes to game manager

  noglows

  committed
  5b82cbe

• previous games are links now

  yourFriendWes

  committed
  efa828e

• working on click function of load game

  yourFriendWes

  committed
  b20ce97

• Have the game links partially working

  noglows

  committed
  ef6417c

• Sort of working load game

  noglows

  committed
  bc1a5fb

• Working load game

  noglows

  committed
  75769fb

Commits on Feb 11, 2016

• Can load the last game saved

  noglows

  committed
  fd43c19

• change log in path to root path

  yourFriendWes

  committed
  e56a581

• working on user conditional

  yourFriendWes

  committed
  191e8c6

• add code to return user or null

  yourFriendWes

  committed
  b1eb112

• Fixed the get user logic for saving games

  noglows

  committed
  eab4471

• Initial work on best score

  noglows

  committed
  7d4e3a5

• trying to debug get user

  yourFriendWes

  committed
  d13f4f8

• Fixed the bug with saving

  noglows

  committed
  c9c4ea6

• Merge branch 'testbranch' into hwjn/master

  yourFriendWes

  committed
  dac4ee5

• Working on best score logic

  noglows

  committed
  434b07c

• Best score is kind of working - still one turn behind

  noglows

  committed
  ac45b36

• Fixed the one step behind best score issue

  noglows

  committed
  1fdc1fa

• Fixed initial game board logic

  noglows

  committed
  9dff5ca

• Best Score updating from database

  noglows

  committed
  e91ee37

Commits on Feb 12, 2016

• Created a leaderboard

  noglows

  committed
  91017cf

• Reorganized HTML

  noglows

  committed
  f40ba8c

• Made the buttons pretty

  noglows

  committed
  92fe023