Code

Dev1#75

Code

Open

laurentsmohr wants to merge 54 commits intoIronMan-HR:masterIronMan-HR/Save-Gudetama:masterfrom TeamGroot:dev1TeamGroot/Save-Gudetama:dev1Copy head branch name to clipboard

+782-160

Commits

Commits on Jun 11, 2018

• Merge pull request IronMan-HR#73 from IronMan-HR/master

  Show description for 18785c8
  scottmccreary

  authored
  18785c8

Commits on Jun 12, 2018

• First Steps towards single Game & Multi Game seperated

  laurentsmohr

  committed
  6cdf6a1

• refactored out overlay

  hackreactor-students

  committed
  dc536c4

• Merge branch 'modes' into GameSettings

  laurentsmohr

  committed
  0425230

• refactored out timer and state from overlay

  hackreactor-students

  committed
  2f8d824

• fixed bugs

  hackreactor-students

  committed
  a7f9987

• changed package.json

  hackreactor-students

  committed
  10a2b57

• clean code

  hackreactor-students

  committed
  2e93467

• merge

  hackreactor-students

  committed
  5a850e5

• added easy medium hard to schema

  mchlcrtz

  committed
  182787d

• modified schema

  mchlcrtz

  committed
  db6d79c

• Implemented powerups for players.

  DeanHinNet

  committed
  9d2213e

• Single or Multi Player Promt

  laurentsmohr

  committed
  8bc9e76

Commits on Jun 13, 2018

• Added formatting for power bank.

  DeanHinNet

  committed
  f05aa45

• end of day commit

  mchlcrtz

  committed
  5a37525

• end of day commit

  mchlcrtz

  committed
  3f929ca

• Merge pull request #1 from TeamGroot/powerups

  Show description for bef2786
  DeanHinNet

  authored
  bef2786

• Database settings.

  DeanHinNet

  committed
  04df718

• added query to update mode

  mchlcrtz

  committed
  fdcef17

• Variable change.

  DeanHinNet

  committed
  dbe212b

• Removed line for reset.

  DeanHinNet

  committed
  ebfb2b6

• Updated powerup drop rate.

  DeanHinNet

  committed
  799cc4d

• Merge pull request #2 from TeamGroot/powerups

  Show description for eea65f9
  DeanHinNet

  authored
  eea65f9

• updated addUserorUpdateScore

  hackreactor-students

  committed
  6389334

• Seperate Multi & Single Player Mode ready

  laurentsmohr

  committed
  b84a468

• handleMode in index.jsx

  hackreactor-students

  committed
  da91487

• pull handleModes

  mchlcrtz

  committed
  d57fc96

• Merge branch 'modes' of https://github.com/TeamGroot/Save-Gudetama into modes

  mchlcrtz

  committed
  410da03

• fixed bug

  mchlcrtz

  committed
  5ca9a6c

• merging modes to dev

  mchlcrtz

  committed
  6871692

• merge modes to dev

  mchlcrtz

  committed
  1f3e509

• save

  mchlcrtz

  committed
  f68727e

• migrated score functionality to index.jsx

  hackreactor-students

  committed
  8ee1cd0

• scoreboard changes upon difficulty mode selection

  hackreactor-students

  committed
  4bef13d

• merging to dev

  hackreactor-students

  committed
  094df9d

• words lengths reflect difficulty level

  mchlcrtz

  committed
  f585cb2

• database finally works

  mchlcrtz

  committed
  0b0d88e

• clean code

  mchlcrtz

  committed
  0fa0db7

• commit

  mchlcrtz

  committed
  23c757c

Commits on Jun 14, 2018

• Multi Multiplayer is working

  laurentsmohr

  committed
  7345e18

• Solved double connection issue

  laurentsmohr

  committed
  8937695

• added functionality to view user scores if saved in the database

  mchlcrtz

  committed
  63ef4f6

• scores for users now show on the page if they have scores in the database

  mchlcrtz

  committed
  3db708a

Commits on Jun 15, 2018

• MultiPlayer Lobby UI exists

  laurentsmohr

  committed
  e7329fb

• Good Progress on challenging users directly

  laurentsmohr

  committed
  6cc3e89

• Merging without Game

  laurentsmohr

  committed
  0243811

• merging to dev

  mchlcrtz

  committed
  21161c7

• Merge branch 'modes' into dev1

  laurentsmohr

  committed
  a06f2d0

• Merged Michael and Laurents Work

  laurentsmohr

  committed
  df322fa

• Nicely integrated difficulty modes

  laurentsmohr

  committed
  b238c62

Commits on Jun 16, 2018

• Improved UX for starting singlePlayer game

  laurentsmohr

  committed
  6c49724

• Presentation ready UI/UX

  laurentsmohr

  committed
  7137958

Commits on Jun 18, 2018

• commit changes for responsiveness

  mchlcrtz

  committed
  1b1d8a8

• Merge branch 'dev1' of https://github.com/TeamGroot/Save-Gudetama into dev1

  mchlcrtz

  committed
  afc5538