Stiffly b0c19c74f2 Merge remote-tracking branch 'origin/master' into EGameStart ...

Conflicts:
	include/Core/Engine.h

2015-09-25 02:49:50 +02:00

..

Bricks

Adjusted for merge. 10:16 works. Physics works. Game works. Safety copy made before this merge.

2015-09-23 20:46:57 +02:00

BallSystem.h

Adjusted for merge. 10:16 works. Physics works. Game works. Safety copy made before this merge.

2015-09-23 20:46:57 +02:00

CBall.h

Pad modifies ball path and ball facing its direction

2015-09-23 15:12:18 +02:00

CBrick.h

Remove Components upon removing entities, a lot of strange experimenting to remove frozen squid bug.

2015-09-24 18:14:39 +02:00

CLife.h

StyleGuide Fix

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

CPad.h

Adjusted for merge. 10:16 works. Physics works. Game works. Safety copy made before this merge.

2015-09-23 20:46:57 +02:00

CPowerUp.h

Adjusted for merge. 10:16 works. Physics works. Game works. Safety copy made before this merge.

2015-09-23 20:46:57 +02:00

ECreatePowerUp.h

Adjusted for merge. 10:16 works. Physics works. Game works. Safety copy made before this merge.

2015-09-23 20:46:57 +02:00

EGameOver.h

Adjusted for merge. 10:16 works. Physics works. Game works. Safety copy made before this merge.

2015-09-23 20:46:57 +02:00

EGameStart.h

EStartGame up and running. Moved BGM-play from soundsystem init to EGameStart.

2015-09-25 02:43:34 +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

EMultiBall.h

MultiBalls appear depending on pad's position

2015-09-21 13:25:20 +02:00

EPowerUpTaken.h

Adjusted for merge. 10:16 works. Physics works. Game works. Safety copy made before this merge.

2015-09-23 20:46:57 +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 master

2015-09-25 00:03:28 +02:00

LevelSystem.h.orig

Merge master

2015-09-25 00:03:28 +02:00

PadSystem.h

Merge master

2015-09-25 00:03:28 +02:00