viktorljung 8ca01ae9c7 Merge remote-tracking branch 'origin/master' into Physics ...

Conflicts:
	include/Core/Engine.h
	src/game/Game/PadSystem.cpp
	src/game/Physics/PhysicsSystem.cpp

2015-09-17 17:11:37 +02:00

..

BallSystem.h

Collisions kind of working

2015-09-17 14:11:09 +01:00

CBall.h

StyleGuide Fix

2015-09-15 18:48:26 +02:00

CBrick.h

Added ScoreEvent, added score to bricks. Stage resets after all bricks are destroyed.

2015-09-15 17:31:22 +02:00

CLife.h

StyleGuide Fix

2015-09-15 18:48:26 +02:00

CPad.h

StyleGuide Fix

2015-09-15 18:48:26 +02:00

ELifeLost.h

Added ScoreEvent, added score to bricks. Stage resets after all bricks are destroyed.

2015-09-15 17:31:22 +02:00

EResetBall.h

Added ScoreEvent, added score to bricks. Stage resets after all bricks are destroyed.

2015-09-15 17:31:22 +02:00

EScoreEvent.h

StyleGuide Fix

2015-09-15 18:48:26 +02:00

EStageCleared.h

I developed a LevelSystem class, along with a CBrick component for use in it and an EStageCleared event that is triggered upon all the bricks being removed.

2015-09-09 21:10:10 +02:00

LevelSystem.h

Merge remote-tracking branch 'origin/master' into LevelSystemAndSuch

2015-09-16 16:29:57 +02:00

PadSystem.h

Merge remote-tracking branch 'origin/master' into LevelSystemAndSuch

2015-09-16 16:29:57 +02:00