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

Conflicts:
	include/Game/BallSystem.h
	include/Game/ProjectileSystem.h
	src/game/Game/BallSystem.cpp
	src/game/Game/ProjectileSystem.cpp
	src/game/Rendering/AnimationSystem.cpp

2015-10-23 14:47:04 +02:00

..

Core

Screen shake working

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

Game

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

2015-10-23 14:47:04 +02:00

GUI

Merge branch 'master' into directx

2015-10-20 15:13:20 +02:00

Input

Initial structure

2015-09-04 10:02:06 +02:00

Physics

Fixed scale issue for power up textures. Added a defaultscale flag. Also removed ugly particleeffect for projectiles.

2015-10-22 16:27:23 +02:00

Rendering

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

2015-10-23 14:47:04 +02:00

Sound

Boss fight sounds. bgm, boss-hit, init roar

2015-10-21 15:42:11 +02:00

Transform

TravellingSystem uses EMove. EMove and ERotate copied from Returngeance into TransportSystem.

2015-10-15 13:44:16 +02:00

PrecompiledHeader.h

fixup! CMAKE Conditional compilation against DirectX and OpenGL targets

2015-10-20 15:39:12 +02:00