Commits

Branch selector

 master

User selector

All users

Datepicker

All time

Commit History

Commits on Sep 17, 2015

• Merge pull request #252 from ChristianReinhard/master

  ChristianReinhard

  committed
  e98f90c
  More actions

• updated diagrams

  ChristianReinhard

  committed
  49b98e9
  More actions

• added documentation to repository

  ChristianReinhard

  committed
  a2035ea
  More actions

• Merge pull request #250 from krueter-uos/style-fixes

  krueter-uos

  committed
  3c56296
  More actions

• solved merge conflict

  krueter-uos

  committed
  fd28f7b
  More actions

• fixed headers

  krueter-uos

  committed
  deef2ff
  More actions

• Merge pull request #249 from AlexanderAltemoeller/master

  ChristianReinhard

  committed
  421567a
  More actions

• Remove cheat buttons

  AlexanderAltemoeller

  committed
  63e332a
  More actions

• Merge pull request #248 from ChristianReinhard/master

  ChristianReinhard

  committed
  b51f688
  More actions

• removed remember me from login

  ChristianReinhard

  committed
  8d2e263
  More actions

• Merge pull request #247 from AndreasSchroeder/fightsystem

  ChristianReinhard

  committed
  2bc9e22
  More actions

• Delete build_army

  

  andschroeder

  committed
  c87732d
  More actions

• Merge pull request #246 from P-Pfeiffer/expedition

  ChristianReinhard

  committed
  b6d9d36
  More actions

• Merge pull request #238 from AndreasSchroeder/fightsystem

  krueter-uos

  committed
  57da24b
  More actions

• Delete 7

  

  andschroeder

  committed
  6461208
  More actions

• Last changes

  

  andschroeder

  committed
  a131402
  More actions

• Merge branch 'master' of github.com:OsnaCS/dbp-game into fightsystem

  

  andschroeder

  committed
  ca24500
  More actions

• Debug

  

  andschroeder

  committed
  865e389
  More actions

• Fixed last bugs

  

  andschroeder

  committed
  2e99547
  More actions

• Merge branch 'master' of https://github.com/OsnaCS/dbp-game into expedition

  

  Patrick Pfeiffer

  committed
  b2af5cc
  More actions

• renamed dummy user

  

  Patrick Pfeiffer

  committed
  6263753
  More actions

• Merge pull request #239 from P-Pfeiffer/expedition

  ChristianReinhard

  committed
  d69c512
  More actions

• Debugging

  

  andschroeder

  committed
  546d2e7
  More actions

• Debugging

  

  andschroeder

  committed
  9afe51e
  More actions

• Delete unused Methods and blanks

  

  andschroeder

  committed
  8577d6a
  More actions

• added small game guide

  

  Patrick Pfeiffer

  committed
  2ad600f
  More actions

• Fix for fight event in expedition

  

  Patrick Pfeiffer

  committed
  dc49e68
  More actions

• Merge branch 'master' of github.com:OsnaCS/dbp-game into fightsystem

  

  andschroeder

  committed
  4acd635
  More actions

• Debugging. Now only one Fight ist createt, instead of two. (one had only nil-attributes)

  

  andschroeder

  committed
  337c132
  More actions

• Merge pull request #235 from AlexanderAltemoeller/master

  ChristianReinhard

  committed
  bc68b88
  More actions

• Merge branch 'master' of github.com:OsnaCS/dbp-game

  AlexanderAltemoeller

  committed
  fd3e0e9
  More actions

• Merge branch 'master' of github.com:OsnaCS/dbp-game

  AlexanderAltemoeller

  committed
  4be2dce
  More actions

• Merge pull request #237 from MarenSteinkamp/master

  ChristianReinhard

  committed
  f716bf0
  More actions

• Hotfix SofortButtonHotfix SofortButton

  

  msteinkamp

  committed
  83ce74b
  More actions

• Merge pull request #236 from krueter-uos/style-fixes

  krueter-uos

  committed
  ef2fcac
  More actions

Pagination

PreviousNext