viktorljung 87fd73f249 Merge remote-tracking branch 'origin/master' into Physics ...

Conflicts:
	src/game/Game/BallSystem.cpp
	src/game/Game/LevelSystem.cpp
	src/game/Physics/PhysicsSystem.cpp

2015-10-08 17:28:28 +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

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

2015-10-08 17:28:28 +02:00

CBall.h

Sticky works except graphics. Temporarily colored odd bricks.

2015-10-08 15:42:13 +02:00

CBrick.h

Fixed all bugs I know of. MultiBall appear upon ice falling in water.

2015-10-06 19:41:24 +02:00

CLife.h

StyleGuide Fix

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

CLifebuoy.h

Lifebuoy added. Incomplete, but it appears.

2015-10-08 14:00:26 +02:00

CPad.h

Fixed invisible item bug, maybe. Put 0.1 sec hitlag on impact with pad. Stable level loading?

2015-10-06 15:31:48 +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

EActionButton.h

Squid does not move until space is pressed. Experimenting with scroll. This shouldn't really be committed, but Visual Studio.

2015-10-07 17:09:55 +02:00

EComboEvent.h

Implemented Combos which multiply score. Adjusted pad a bit.

2015-09-29 14:42:01 +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

EHitLag.h

P-button pauses, H-button does 0.3 second HitLag.

2015-09-30 15:19:45 +02:00

EHitPad.h

Implemented GetNextLevel function with hard-coded levels.

2015-10-05 16:35:37 +02:00

ELifebuoy.h

Prepared for Lifebuoy PowerUp.

2015-10-08 11:51:13 +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

EMultiBallLost.h

Transferred Ball-stuff into BallSystem.

2015-09-28 17:24:58 +02:00

EPause.h

HitLag has types in strings to send along to affect what systems lag.

2015-10-01 14:14:07 +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

Scroll to next stage works!

2015-10-07 19:19:55 +02:00

EStickyPad.h

Sticky works except graphics. Temporarily colored odd bricks.

2015-10-08 15:42:13 +02:00

FPSCounter.h

MSVC12 compiler compability fixes

2015-10-06 15:27:11 +02:00

HitLagSystem.h

HitLag has types in strings to send along to affect what systems lag.

2015-10-01 14:14:07 +02:00

HUD.h

MSVC12 compiler compability fixes

2015-10-06 15:27:11 +02:00

LevelSystem.h

Sticky works except graphics. Temporarily colored odd bricks.

2015-10-08 15:42:13 +02:00

LifebuoySystem.h

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

2015-10-08 17:28:28 +02:00

MainMenu.h

Working NumberFrame and score indicator

2015-09-25 05:30:59 +02:00

MainMenuMain.h

Removed the HUD from the menu screen

2015-09-25 05:47:20 +02:00

MainMenuOptions.h

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

2015-09-28 18:14:06 +02:00

PadSystem.h

Squid does not move until space is pressed. Experimenting with scroll. This shouldn't really be committed, but Visual Studio.

2015-10-07 17:09:55 +02:00