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

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

2015-10-22 14:40:09 +02:00

..

Brick

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

2015-10-22 14:40:09 +02:00

Core

Fixed unit quad with texture coordinates

2015-09-10 22:38:44 +02:00

Kraken

Animations and stuff

2015-10-21 15:40:19 +02:00

LifeBuoy

Lifebuoy updated, now dies after 4 hits

2015-10-08 21:51:43 +02:00

Ship

Water can now collide with the bricks, added new ship model

2015-10-08 11:27:17 +02:00

Sid

Kraken brick and ink brick done

2015-10-22 11:49:08 +02:00

Test

Changed SquidModel

2015-10-01 14:04:21 +02:00

Brunn_Diffuse.png

Background fixes

2015-10-22 14:13:38 +02:00

Brunn_Normals.png

Background fixes

2015-10-22 14:13:38 +02:00

Brunn_Specular.png

Background fixes

2015-10-22 14:13:38 +02:00

Halfpipe.mtl

Background fixes

2015-10-22 14:13:38 +02:00

Halfpipe.obj

Background fixes

2015-10-22 14:13:38 +02:00