 Jace
|
6ab144520a
|
Merge branch 'master' of github.com:teamfisk/AgileBreakOut
|
2015-10-09 00:29:26 +02:00 |
|
|
Jace
|
c17501547b
|
Removed level indicator and centered score
|
2015-10-09 00:28:55 +02:00 |
|
 viktorljung
|
d4c79e338c
|
Merge remote-tracking branch 'origin/master' into Physics
Conflicts:
src/game/Game/LevelSystem.cpp
|
2015-10-09 00:22:32 +02:00 |
|
|
Jace
|
7f344263da
|
Merge branch 'master' into gui
Conflicts:
include/Game/GUI/HUD.h
src/game/Core/Renderer.cpp
|
2015-10-08 23:47:25 +02:00 |
|
|
Jace
|
856053e3f2
|
Forgot this when moving game GUI to a subfolder... I guess.
|
2015-10-08 21:51:13 +02:00 |
|
|
Jace
|
7bf1d7cf24
|
Moved game GUI to its own subfolder
|
2015-10-08 10:46:28 +02:00 |
|