Code

Fixed everything#217

Code

Open

sabsbremer wants to merge 55 commits intoOsnaCS:devOsnaCS/space-game:devfrom sabsbremer:devsabsbremer/space-game:devCopy head branch name to clipboard

+155,914-165

Commits

Commits on Jul 27, 2016

• Added Turret

  sabsbremer

  committed
  c7c7315

  Copy full SHA for c7c7315

• Merge branch 'dev' of github.com:OsnaCS/space-game into dev

  sabsbremer

  committed
  1b9f764

  Copy full SHA for 1b9f764

• Shooring Turret

  sabsbremer

  committed
  a9dbf43

  Copy full SHA for a9dbf43

• Merge branch 'dev' of github.com:OsnaCS/space-game into dev

  sabsbremer

  committed
  9718602

  Copy full SHA for 9718602

Commits on Jul 28, 2016

• Merge branch 'dev' of github.com:OsnaCS/space-game into dev

  sabsbremer

  committed
  b24a66a

  Copy full SHA for b24a66a

• 2. movement prepared

  Show description for ae6f159
  sabsbremer

  committed
  ae6f159

  Copy full SHA for ae6f159

• Merge branch 'dev' of github.com:OsnaCS/space-game into dev

  sabsbremer

  committed
  5c01aea

  Copy full SHA for 5c01aea

• FIxed Meshes

  Show description for d893309
  sabsbremer

  committed
  d893309

  Copy full SHA for d893309

• Merge branch 'dev' of github.com:OsnaCS/space-game into dev

  sabsbremer

  committed
  51acfae

  Copy full SHA for 51acfae

• Fixed Console Errors

  sabsbremer

  committed
  3ab5a23

  Copy full SHA for 3ab5a23

• Merge branch 'dev' of github.com:OsnaCS/space-game into dev

  sabsbremer

  committed
  62e4c8f

  Copy full SHA for 62e4c8f

• Fixed Ratio

  sabsbremer

  committed
  b9b9013

  Copy full SHA for b9b9013

• Merge branch 'dev' of github.com:OsnaCS/space-game into dev

  sabsbremer

  committed
  cd3902d

  Copy full SHA for cd3902d

Commits on Jul 29, 2016

• hanged Rocket Symbol

  sabsbremer

  committed
  a2ca9a9

  Copy full SHA for a2ca9a9

• Merge branch 'dev' of github.com:OsnaCS/space-game into dev

  sabsbremer

  committed
  5e39d96

  Copy full SHA for 5e39d96

• Fixed TurretLaser

  sabsbremer

  committed
  2fca093

  Copy full SHA for 2fca093

• Merge branch 'dev' of github.com:OsnaCS/space-game into dev

  sabsbremer

  committed
  d577d58

  Copy full SHA for d577d58

• Merge pull request OsnaCS#136 from cebremer/dev

  Show description for dab12b1
  Varaion

  authored
  dab12b1

  Copy full SHA for dab12b1

Commits on Aug 1, 2016

• Merge branch 'dev' of github.com:OsnaCS/space-game into dev

  sabsbremer

  committed
  c9c0160

  Copy full SHA for c9c0160

Commits on Aug 3, 2016

• Kein Plan

  sabsbremer

  committed
  da67261

  Copy full SHA for da67261

• Merge branch 'dev' of github.com:OsnaCS/space-game into dev

  sabsbremer

  committed
  69aa654

  Copy full SHA for 69aa654

• Added Server structure

  sabsbremer

  committed
  d71ed98

  Copy full SHA for d71ed98

• Merge branch 'dev' of github.com:OsnaCS/space-game into dev

  sabsbremer

  committed
  3ddd787

  Copy full SHA for 3ddd787

• Changed the minorest bug...

  sabsbremer

  committed
  382ba3c

  Copy full SHA for 382ba3c

• Merge branch 'dev' of github.com:OsnaCS/space-game into dev

  sabsbremer

  committed
  97c36e7

  Copy full SHA for 97c36e7

• Wenn du jetzt nochmal mergest bevor ich den Pull request raus habe kannst

  Show description for 8450149
  sabsbremer

  committed
  8450149

  Copy full SHA for 8450149

• Merge pull request OsnaCS#186 from cebremer/dev

  Show description for c93c882
  Varaion

  authored
  c93c882

  Copy full SHA for c93c882

• Merge branch 'dev' of https://github.com/OsnaCS/space-game into dev

  Show description for 9fd4147
  

  cbremer

  committed
  9fd4147

  Copy full SHA for 9fd4147

Commits on Aug 4, 2016

• Added Chat

  sabsbremer

  committed
  5936ce3

  Copy full SHA for 5936ce3

• Merge branch 'dev' of https://github.com/cebremer/space-game into dev

  sabsbremer

  committed
  a5273f6

  Copy full SHA for a5273f6

• Merge branch 'dev' of github.com:OsnaCS/space-game into dev

  sabsbremer

  committed
  30d1868

  Copy full SHA for 30d1868

• MySQL Connection and REST Api under /api/1/highscore

  

  Jan Philipp Vogtherr

  committed
  8f1d9ef

  Copy full SHA for 8f1d9ef

• server config file added

  

  Jan Philipp Vogtherr

  committed
  79b0792

  Copy full SHA for 79b0792

• Fixed Chat

  sabsbremer

  committed
  45cb8d3

  Copy full SHA for 45cb8d3

• Merge branch 'dev' of github.com:OsnaCS/space-game into dev

  sabsbremer

  committed
  fc33a76

  Copy full SHA for fc33a76

• Merge branch 'Multiplayer' of github.com:OsnaCS/space-game into dev

  sabsbremer

  committed
  eb4f23a

  Copy full SHA for eb4f23a

• Changed Names

  sabsbremer

  committed
  e46534b

  Copy full SHA for e46534b

• Merge pull request OsnaCS#199 from jvogtherr/Multiplayer

  Show description for a8c9b50
  Varaion

  authored
  a8c9b50

  Copy full SHA for a8c9b50

• fixing conflicts

  VaraionPrivate

  committed
  c62323e

  Copy full SHA for c62323e

• API hotfix

  

  Jan Philipp Vogtherr

  committed
  2232eb1

  Copy full SHA for 2232eb1

• Merge branch 'Multiplayer' of github.com:OsnaCS/space-game into Multiplayer

  Show description for c8ac1c7
  

  Jan Philipp Vogtherr

  committed
  c8ac1c7

  Copy full SHA for c8ac1c7

• Merge pull request OsnaCS#205 from jvogtherr/Multiplayer

  Show description for 99495e9
  Varaion

  authored
  99495e9

  Copy full SHA for 99495e9

• Changed Multiplayer for Servers

  sabsbremer

  committed
  580c870

  Copy full SHA for 580c870

• Merge branch 'Multiplayer' of github.com:OsnaCS/space-game into dev

  sabsbremer

  committed
  cf9860c

  Copy full SHA for cf9860c

• You can actually use P in Chat

  sabsbremer

  committed
  e432c95

  Copy full SHA for e432c95

• Merge branch 'dev' of github.com:OsnaCS/space-game into dev

  sabsbremer

  committed
  6fc616a

  Copy full SHA for 6fc616a

• Removed Turret

  sabsbremer

  committed
  c17a34c

  Copy full SHA for c17a34c

• Merge branch 'dev' of github.com:OsnaCS/space-game into dev

  sabsbremer

  committed
  f0bd049

  Copy full SHA for f0bd049

• Merge branch 'dev' of github.com:OsnaCS/space-game into dev

  sabsbremer

  committed
  9c93b1c

  Copy full SHA for 9c93b1c

• Merge branch 'dev' of github.com:OsnaCS/space-game into dev

  sabsbremer

  committed
  483276f

  Copy full SHA for 483276f

• ...

  sabsbremer

  committed
  dea85a3

  Copy full SHA for dea85a3

• Merge branch 'dev' of github.com:OsnaCS/space-game into dev

  sabsbremer

  committed
  523cd36

  Copy full SHA for 523cd36

• Update serverconfig.json

  sabsbremer

  authored
  36aa4ce

  Copy full SHA for 36aa4ce

Commits on Aug 5, 2016

• Changed Cross Position

  sabsbremer

  committed
  24aecf0

  Copy full SHA for 24aecf0

• Merge branch 'dev' of https://github.com/cebremer/space-game into dev

  sabsbremer

  committed
  7f08b19

  Copy full SHA for 7f08b19